msb-public
/
dc3-web
mirror of https://gitee.com/pnoker/dc3-web.git
1
0
Code Issues Projects Releases Wiki Activity

升级依赖包版本

Browse Source
pull/1/head
pnoker 4 years ago
parent 24b462e8d4
commit 68b1df01a9
12 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File

19
package.json
Unescape View File

@ -10,7 +10,7 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"@antv/g2": "^4.0.8",
"@antv/g2": "^4.0.12",
"@antv/l7": "latest",
"@antv/l7-maps": "latest",
"@smallwei/avue": "^2.5.3",
@ -25,18 +25,19 @@
"vue": "^2.6.11",
"vue-axios": "^2.1.5",
"vue-gemini-scrollbar": "^2.0.1",
"vue-router": "^3.2.0",
"vuex": "^3.4.0"
"vue-router": "^3.3.4",
"vuex": "^3.5.1"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.3.1",
"@vue/cli-plugin-eslint": "^4.3.1",
"@vue/cli-plugin-router": "^4.3.1",
"@vue/cli-plugin-vuex": "^4.3.1",
"@vue/cli-service": "^4.3.1",
"@vue/cli-plugin-babel": "^4.4.6",
"@vue/cli-plugin-eslint": "^4.4.6",
"@vue/cli-plugin-router": "^4.4.6",
"@vue/cli-plugin-vuex": "^4.4.6",
"@vue/cli-service": "^4.4.6",
"babel-eslint": "^10.1.0",
"eslint": "^6.8.0",
"eslint-plugin-vue": "^6.0.0",
"eslint-plugin-vue": "^6.2.2",
"webpack": "^4.43.0",
"node-sass": "^4.14.1",
"sass-loader": "^8.0.2",
"vue-cli-plugin-element": "^1.0.1",

1
src/plugins/element/element.js
Unescape View File

@ -25,6 +25,7 @@ console.log(
'| ( <_> ) | / /_/ \\ \\___ / \\\n' +
'|__|\\____/|__| \\____ |\\___ >______ /\n' +
' \\/ \\/ \\/\n' +
' https://dc3.site\n' +
' https://gitee.com/pnoker/iot-dc3\n' +
' https://github.com/pnoker/iot-dc3\n' +
' DC3 IOT Platform V3.0 Pnoker Authors'

1
src/views/device/Device.vue
Unescape View File

@ -43,7 +43,6 @@
index: true,
stripe: true,
border: true,
viewBtn: true,
height: 664,
align: 'center',
column: [

4
src/views/driver/Driver.vue
Unescape View File

@ -40,8 +40,8 @@
index: true,
stripe: true,
border: true,
menu: false,
addBtn: false,
viewBtn: true,
editBtn: false,
delBtn: false,
height: 664,
@ -83,7 +83,7 @@
}, {
label: '备注',
prop: 'description',
width: 300,
width: 400,
span: 24,
type: 'textarea',
overHidden: true,

5
src/views/driver/DriverAttribute.vue
Unescape View File

@ -37,8 +37,9 @@
index: true,
stripe: true,
border: true,
menu: false,
addBtn: false,
viewBtn: true,
viewBtn: false,
editBtn: false,
delBtn: false,
height: 664,
@ -147,7 +148,7 @@
}, {
label: '备注',
prop: 'description',
width: 200,
width: 400,
span: 24,
type: 'textarea',
overHidden: true,

1
src/views/driver/DriverInfo.vue
Unescape View File

@ -37,7 +37,6 @@
index: true,
stripe: true,
border: true,
viewBtn: true,
height: 664,
align: 'center',
column: [

1
src/views/group/Group.vue
Unescape View File

@ -37,7 +37,6 @@
index: true,
stripe: true,
border: true,
viewBtn: true,
height: 664,
align: 'center',
column: [

18
src/views/point/Point.vue
Unescape View File

@ -83,7 +83,7 @@
}, {
label: '类型',
prop: 'type',
width: 120,
width: 100,
span: 8,
search: true,
searchSpan: 4,
@ -121,7 +121,7 @@
}, {
label: '读/写',
prop: 'rw',
width: 100,
width: 60,
span: 8,
search: true,
searchSpan: 4,
@ -150,7 +150,7 @@
}, {
label: '累计标识',
prop: 'accrue',
width: 100,
width: 70,
span: 8,
search: true,
searchSpan: 4,
@ -176,7 +176,7 @@
}, {
label: '基值',
prop: 'base',
width: 80,
width: 60,
span: 8,
searchSpan: 12,
value: 0,
@ -189,7 +189,7 @@
}, {
label: '倍数',
prop: 'multiple',
width: 80,
width: 60,
span: 8,
searchSpan: 12,
value: 1,
@ -206,7 +206,7 @@
}, {
label: '格式',
prop: 'format',
width: 80,
width: 60,
span: 8,
searchSpan: 12,
value: '%.3f',
@ -220,7 +220,7 @@
}, {
label: '最小值',
prop: 'minimum',
width: 100,
width: 70,
span: 8,
searchSpan: 12,
value: -999999,
@ -233,7 +233,7 @@
}, {
label: '最大值',
prop: 'maximum',
width: 100,
width: 70,
span: 8,
searchSpan: 12,
value: 999999,
@ -246,7 +246,7 @@
}, {
label: '单位',
prop: 'unit',
width: 80,
width: 70,
span: 8,
searchSpan: 12
}, {

5
src/views/point/PointAttribute.vue
Unescape View File

@ -37,8 +37,9 @@
index: true,
stripe: true,
border: true,
menu: false,
addBtn: false,
viewBtn: true,
viewBtn: false,
editBtn: false,
delBtn: false,
height: 664,
@ -147,7 +148,7 @@
}, {
label: '备注',
prop: 'description',
width: 200,
width: 400,
span: 24,
type: 'textarea',
overHidden: true,

1
src/views/point/PointInfo.vue
Unescape View File

@ -37,7 +37,6 @@
index: true,
stripe: true,
border: true,
viewBtn: true,
height: 664,
align: 'center',
column: [

12
src/views/point/PointValue.vue
Unescape View File

@ -15,6 +15,9 @@
@size-change="sizeChange"
@current-change="currentChange"
>
<template slot="interval" slot-scope="scope">
{{scope.row.createTime-scope.row.originTime}}
</template>
</avue-crud>
</base-card>
</el-col>
@ -36,8 +39,8 @@
stripe: true,
border: true,
dateBtn: true,
menu: false,
addBtn: false,
viewBtn: true,
editBtn: false,
delBtn: false,
height: 664,
@ -95,7 +98,8 @@
label: '延时(毫秒)',
prop: 'interval',
width: 90,
span: 4
span: 4,
slot: true
}, {
label: '保存日期',
prop: 'createTime',
@ -143,13 +147,13 @@
},
device() {
dictionaryApi.deviceDictionary('group').then(res => {
this.findObject(this.listOption.column,'deviceId').dicData = res.data;
this.findObject(this.listOption.column, 'deviceId').dicData = res.data;
}).catch(() => {
});
},
point() {
dictionaryApi.pointDictionary('profile').then(res => {
this.findObject(this.listOption.column,'pointId').dicData = res.data;
this.findObject(this.listOption.column, 'pointId').dicData = res.data;
}).catch(() => {
});
},

1
src/views/profile/Profile.vue
Unescape View File

@ -37,7 +37,6 @@
index: true,
stripe: true,
border: true,
viewBtn: true,
height: 664,
align: 'center',
column: [

Write Preview
Loading…
Cancel
Save