Skip to content

Commit

Permalink
feat: profile
Browse files Browse the repository at this point in the history
  • Loading branch information
@dawnwinterLiu
dawnwinterLiu committed Feb 17, 2023
1 parent e041ccd commit 9475af3
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 81 deletions.
8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@dgiot/dgiot-dashboard",
"version": "4.7.5",
"version": "4.7.6",
"author": "xxb",
"license": "MPL-2.0",
"private": false,
"homepage": "https://github.com/dgiot/dgiot-dashboard.git",
"homepage": "https://github.com/dgiot/iotStudio.git",
"scripts": {
"dev": "vue-cli-service serve",
"start": "vue-cli-service serve",
Expand Down Expand Up @@ -56,7 +56,7 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/dgiot/dgiot-dashboard.git"
"url": "git+https://github.com/dgiot/iotStudio.git"
},
"dependencies": {
"@dgiot/dgiot-component": "0.0.3",
Expand Down Expand Up @@ -177,7 +177,7 @@
},
"description": "<p align=\"center\"> <img src=\"https://img.shields.io/github/commit-activity/m/dgiot/dgiot-dashboard\" alt=\"ommit-activity\"> \t<img src=\"https://badgen.net/badge/package/%40dgiot%2Fdgiot-dashboard/blue\" \talt=\"package\" maxretrytimes=\"3\" class=\"m-1 transition-all duration-1000\"> \t<img src=\"https://badgen.net/npm/v/@dgiot/dgiot-dashboard\" alt=\"Npm Version\" \tmaxretrytimes=\"3\" class=\"m-1 transition-all duration-1000\"> \t<img src=\"https://badgen.net/npm/node/@dgiot/dgiot-mqtt-dashboard\" alt=\"Node Version\" \tmaxretrytimes=\"3\" class=\"m-1 transition-all duration-1000\"> \t<br> \t<img src=\"https://badgen.net/jsdelivr/hits/npm/@dgiot/dgiot-dashboard\" \talt=\"Jsdeliver Month Downloads\" maxretrytimes=\"3\" class=\"m-1 transition-all duration-1000\"> \t<img src=\"https://badgen.net/npm/types/@dgiot/dgiot-dashboard\" alt=\"Type Support\" \tmaxretrytimes=\"3\" class=\"m-1 transition-all duration-1000\"> <img src=\"https://img.shields.io/badge/Community-DGIOT-yellow\" alt=\"Community\"> <img src=\"https://img.shields.io/docker/pulls/dgiot/dgiot-dashboard\" alt=\"docker\"> \t<br> \t<img src=\"https://img.shields.io/librariesio/release/npm/@dgiot/dgiot-dashboard\" \talt=\"Outdated Dep\" maxretrytimes=\"3\" class=\"m-1 transition-all duration-1000\"> \t<img src=\"https://img.shields.io/snyk/vulnerabilities/npm/@dgiot/dgiot-dashboard\" \talt=\"Vulnerablities\" maxretrytimes=\"3\" class=\"m-1 transition-all duration-1000\"> <img src=\"https://img.shields.io/github/release/dgiot/dgiot-dashboard?color=brightgreen\" alt=\"release\"> <img src=\"https://img.shields.io/github/license/dgiot/dgiot-dashboard\" alt=\"license\"> <img src=\"https://img.shields.io/travis/dgiot/dgiot-dashboard/master\" alt=\"travis\"> <p>",
"bugs": {
"url": "https://github.com/dgiot/dgiot-dashboard/issues"
"url": "https://github.com/dgiot/iotStudio/issues"
},
"main": ".eslintrc.js",
"keywords": []
Expand Down
6 changes: 3 additions & 3 deletions src/config/developer.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ module.exports = {
*/
{
path: 'iotapi',
target: 'http://1.117.219.8',
target: 'http://127.0.0.1:5080',
},
/**
* @description 静态资源目录。开发使用
*/
{
path: 'dgiot_dashboard',
target: 'http://1.117.219.8',
target: 'https://prod.dgiotcloud.cn',
},
/**
* @description dgiot_file文件资源目录。开发使用
*/
{
path: 'dgiot_file',
target: 'http://1.117.219.8',
target: 'https://prod.dgiotcloud.cn',
},
/**
* @description amis server 开发使用
Expand Down
10 changes: 4 additions & 6 deletions src/views/DeviceCloud/manage/component/wmxdetail.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,6 @@
v-model="sizeForm.truevalue"
:placeholder="$translateTitle('product.attribute')"
readonly
type="number"
/>
</el-form-item>
</el-col>
Expand All @@ -364,7 +363,6 @@
v-model="sizeForm.falsevalue"
:placeholder="$translateTitle('product.attribute')"
readonly
type="number"
/>
</el-form-item>
</el-col>
Expand Down Expand Up @@ -1310,8 +1308,8 @@
},
async created() {
if (this.sizeForm.type == 'bool') {
this.$set(this.sizeForm, 'truevalue', 1)
this.$set(this.sizeForm, 'falsevalue', 0)
this.$set(this.sizeForm, 'truevalue', true)
this.$set(this.sizeForm, 'falsevalue', false)
}
await this.queryProtocol()
/**
Expand Down Expand Up @@ -2120,8 +2118,8 @@
dataType: {
type: sizeForm.type.toLowerCase(),
specs: {
0: sizeForm.false,
1: sizeForm.true,
false: sizeForm.false,
true: sizeForm.true,
},
das: das,
},
Expand Down
2 changes: 1 addition & 1 deletion src/views/DeviceCloud/manage/home_index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,7 @@
all: true,
status: this.$route.query.status ? this.$route.query.status : '',
skip: 0,
limit: 10,
limit: 20,
state: '',
},
}
Expand Down
12 changes: 6 additions & 6 deletions src/views/DeviceCloud/manage/js/proddetail.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -648,9 +648,9 @@ export default {
endnumber: '',
step: '',
true: '',
truevalue: 1,
truevalue: true,
false: '',
falsevalue: 0,
falsevalue: false,
isread: 'r',
unit: '',
date: 'String类型的UTC时间戳 (毫秒)',
Expand Down Expand Up @@ -1388,9 +1388,9 @@ export default {
endnumber: '',
step: '',
true: '',
truevalue: 1,
truevalue: true,
false: '',
falsevalue: 0,
falsevalue: false,
isread: 'r',
isshow: true,
isstorage: true,
Expand Down Expand Up @@ -2988,9 +2988,9 @@ export default {
endnumber: '',
step: '',
true: '',
truevalue: 1,
truevalue: true,
false: '',
falsevalue: 0,
falsevalue: false,
isread: 'r',
unit: '',
specs: [],
Expand Down
99 changes: 38 additions & 61 deletions src/views/DeviceCloud/manage/profile.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,71 +180,54 @@
</el-input>
</el-form-item>
</el-form>
<!--
<el-button
v-show="!$lodash.isEmpty(productDetail)"
size="mini"
icon="el-icon-plus"
type="primary"
@click="isFullscreen = !isFullscreen"
@click="addproducttemp()"
>
<dgiot-icon
:icon="isFullscreen ? 'fullscreen-exit-fill' : 'fullscreen-fill'"
/>
{{
isFullscreen
? $translateTitle('alert.Exit Full Screen')
: $translateTitle('alert.full screen')
}}
</el-button> -->
添加
</el-button>

</dgiot-query-form-top-panel>
</dgiot-query-form>
<el-row :gutter="24">
<el-col :lg="4" :md="5" :sm="6" :xl="3" :xs="4">
<ul
class="infinite-list"
style="overflow: auto"
:style="{ height: tableHeight + 'px' }"
>
<li
v-for="(item, index) in categorysonList"
:key="index"
class="infinite-list-item"
:class="linkType == item.name ? 'select_category_product' : ''"
disabled
@click.stop="categorysonChange(item)"
>
<div>{{ item.name }}</div>
<i
class="el-icon-plus"
style="color: #fff"
@click.stop="addproducttemp(item)"
></i>
<!-- <el-button
class="el-icon-plus"
plain
size="mini"
style="color: #fff"
type="text"
/> -->
<!-- <div>+</div> -->
<!-- <el-link :type="linkType == item.name ? 'success' : ''">
{{ item.name }}&nbsp;&nbsp;&nbsp;
</el-link>
-->
</li>
</ul>
<div>
<el-tree
:data="categorytree"
:props="defaultProps"
@node-click="categorysonChange"
/>
</div>
<!-- <ul-->
<!-- class="infinite-list"-->
<!-- style="overflow: auto"-->
<!-- :style="{ height: tableHeight + 'px' }"-->
<!-- >-->
<!-- <li-->
<!-- v-for="(item, index) in categorysonList"-->
<!-- :key="index"-->
<!-- class="infinite-list-item"-->
<!-- :class="linkType == item.name ? 'select_category_product' : ''"-->
<!-- disabled-->
<!-- @click.stop="categorysonChange(item)"-->
<!-- >-->
<!-- <div>{{ item.name }}</div>-->
<!-- <i-->
<!-- class="el-icon-plus"-->
<!-- style="color: #fff"-->
<!-- @click.stop="addproducttemp(item)"-->
<!-- ></i>-->
<!-- </li>-->
<!-- </ul>-->
</el-col>
<el-col :lg="5" :md="6" :sm="6" :xl="3" :xs="4">
<el-table
ref="multipleTable"
v-loading="listLoading"
:cell-style="{ 'text-align': 'center' }"
:data="proTableData"
:header-cell-style="{
'text-align': 'center',
background: '#1970c4',
}"
:header-cell-style="{ 'text-align': 'center' }"
:height="tableHeight"
highlight-current-row
size="medium"
Expand Down Expand Up @@ -347,11 +330,9 @@
<el-form-item :label="$translateTitle('product.classification')">
<el-input
v-model="form.categoryname"
:disabled="addflag"
:placeholder="$translateTitle('product.pleaseselectyourcate')"
@focus="showTree = !showTree"
/>
<div v-if="showTree">
<div>
<el-tree
:data="categorytree"
:props="defaultProps"
Expand Down Expand Up @@ -759,6 +740,7 @@
this.querycategorylist()
this.featchTable()
this.queryProduttemp({})
this.fetchData()
},
methods: {
async createdNotification(row, flag) {
Expand Down Expand Up @@ -894,25 +876,20 @@
this.linkType = data.name
this.queryProduttemp({ category: data.objectId })
},
addproducttemp(data) {
this.fetchData()
addproducttemp() {
this.addflag = true
this.form = {
name: '',
decoder: {},
thing: {},
config: {},
nodeType: 0,
netType: '',
categoryname: data.name,
categoryid: data.objectId,
netType: ''
}
this.dialogFormVisible = true
this.producttempId = moment(new Date()).valueOf().toString()
},
editproducttemp(row) {
dgiotlog.log('row', row)
this.fetchData()
this.addflag = false
this.form = row
this.producttempId = row.objectId
Expand Down

0 comments on commit 9475af3

Please sign in to comment.