diff --git a/README.md b/README.md index f98bf37..d676e51 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ - :boom: [IOT DC3](https://gitee.com/pnoker/iot-dc3) Web UI, 项目已正式迁移到 Gitee 上，gitee clone url ： https://gitee.com/pnoker/dc3-web.git + :boom: 你的 `Star` 是我开发的动力！ - :seedling: 你的点赞是我们开发的动力！ + :rocket: 非常欢迎广大兴趣爱好者的加入，第一时间 [联系作者]([https://gitee.com/pnoker/iot-dc3/tree/dev/#5-%E8%81%94%E7%B3%BB%E4%BD%9C%E8%80%85](https://gitee.com/pnoker/iot-dc3/tree/dev/#5-联系作者))，`show me you code`，让我们肩并肩 :alien:！ + + :seedling: 该 `Demo Web UI` ，需要借助 `DC3` 平台服务，https://gitee.com/pnoker/iot-dc3


@@ -36,3 +38,21 @@ docker-compose build # docker run docker-compose up -d ``` + + + +### Demo UI + +![](./dc3/images/demo/1.png) +![](./dc3/images/demo/2.png) +![](./dc3/images/demo/3.png) +![](./dc3/images/demo/4.png) +![](./dc3/images/demo/5.png) +![](./dc3/images/demo/6.png) +![](./dc3/images/demo/7.png) +![](./dc3/images/demo/8.png) +![](./dc3/images/demo/9.png) +![](./dc3/images/demo/10.png) +![](./dc3/images/demo/11.png) +![](./dc3/images/demo/12.png) +![](./dc3/images/demo/13.png) \ No newline at end of file diff --git a/dc3/images/demo/1.png b/dc3/images/demo/1.png new file mode 100644 index 0000000..2ffb078 Binary files /dev/null and b/dc3/images/demo/1.png differ diff --git a/dc3/images/demo/10.png b/dc3/images/demo/10.png new file mode 100644 index 0000000..761801c Binary files /dev/null and b/dc3/images/demo/10.png differ diff --git a/dc3/images/demo/11.png b/dc3/images/demo/11.png new file mode 100644 index 0000000..4793502 Binary files /dev/null and b/dc3/images/demo/11.png differ diff --git a/dc3/images/demo/12.png b/dc3/images/demo/12.png new file mode 100644 index 0000000..6e834d6 Binary files /dev/null and b/dc3/images/demo/12.png differ diff --git a/dc3/images/demo/13.png b/dc3/images/demo/13.png new file mode 100644 index 0000000..35f0912 Binary files /dev/null and b/dc3/images/demo/13.png differ diff --git a/dc3/images/demo/2.png b/dc3/images/demo/2.png new file mode 100644 index 0000000..43027cb Binary files /dev/null and b/dc3/images/demo/2.png differ diff --git a/dc3/images/demo/3.png b/dc3/images/demo/3.png new file mode 100644 index 0000000..37f3a1d Binary files /dev/null and b/dc3/images/demo/3.png differ diff --git a/dc3/images/demo/4.png b/dc3/images/demo/4.png new file mode 100644 index 0000000..fb28b86 Binary files /dev/null and b/dc3/images/demo/4.png differ diff --git a/dc3/images/demo/5.png b/dc3/images/demo/5.png new file mode 100644 index 0000000..6237464 Binary files /dev/null and b/dc3/images/demo/5.png differ diff --git a/dc3/images/demo/6.png b/dc3/images/demo/6.png new file mode 100644 index 0000000..1523b60 Binary files /dev/null and b/dc3/images/demo/6.png differ diff --git a/dc3/images/demo/7.png b/dc3/images/demo/7.png new file mode 100644 index 0000000..551a098 Binary files /dev/null and b/dc3/images/demo/7.png differ diff --git a/dc3/images/demo/8.png b/dc3/images/demo/8.png new file mode 100644 index 0000000..23fbed8 Binary files /dev/null and b/dc3/images/demo/8.png differ diff --git a/dc3/images/demo/9.png b/dc3/images/demo/9.png new file mode 100644 index 0000000..7858436 Binary files /dev/null and b/dc3/images/demo/9.png differ diff --git a/package.json b/package.json index 63f7abd..4f5b085 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/plugins/element/element.js b/src/plugins/element/element.js index b4b5d74..1c2c3b5 100644 --- a/src/plugins/element/element.js +++ b/src/plugins/element/element.js @@ -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' diff --git a/src/views/device/Device.vue b/src/views/device/Device.vue index 56420cc..716fd23 100644 --- a/src/views/device/Device.vue +++ b/src/views/device/Device.vue @@ -43,7 +43,6 @@ index: true, stripe: true, border: true, - viewBtn: true, height: 664, align: 'center', column: [ diff --git a/src/views/driver/Driver.vue b/src/views/driver/Driver.vue index f8905c8..a0ad3c6 100644 --- a/src/views/driver/Driver.vue +++ b/src/views/driver/Driver.vue @@ -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, diff --git a/src/views/driver/DriverAttribute.vue b/src/views/driver/DriverAttribute.vue index 103c4da..7d60cc4 100644 --- a/src/views/driver/DriverAttribute.vue +++ b/src/views/driver/DriverAttribute.vue @@ -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, diff --git a/src/views/driver/DriverInfo.vue b/src/views/driver/DriverInfo.vue index 283fef9..308b884 100644 --- a/src/views/driver/DriverInfo.vue +++ b/src/views/driver/DriverInfo.vue @@ -37,7 +37,6 @@ index: true, stripe: true, border: true, - viewBtn: true, height: 664, align: 'center', column: [ diff --git a/src/views/group/Group.vue b/src/views/group/Group.vue index 942ee2d..ca50355 100644 --- a/src/views/group/Group.vue +++ b/src/views/group/Group.vue @@ -37,7 +37,6 @@ index: true, stripe: true, border: true, - viewBtn: true, height: 664, align: 'center', column: [ diff --git a/src/views/point/Point.vue b/src/views/point/Point.vue index 85b6a4c..a89586e 100644 --- a/src/views/point/Point.vue +++ b/src/views/point/Point.vue @@ -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 }, { diff --git a/src/views/point/PointAttribute.vue b/src/views/point/PointAttribute.vue index 8ca4217..9130f2d 100644 --- a/src/views/point/PointAttribute.vue +++ b/src/views/point/PointAttribute.vue @@ -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, diff --git a/src/views/point/PointInfo.vue b/src/views/point/PointInfo.vue index 1f48a12..26da5f4 100644 --- a/src/views/point/PointInfo.vue +++ b/src/views/point/PointInfo.vue @@ -37,7 +37,6 @@ index: true, stripe: true, border: true, - viewBtn: true, height: 664, align: 'center', column: [ diff --git a/src/views/point/PointValue.vue b/src/views/point/PointValue.vue index f5b4d16..c487a24 100644 --- a/src/views/point/PointValue.vue +++ b/src/views/point/PointValue.vue @@ -15,6 +15,9 @@ @size-change="sizeChange" @current-change="currentChange" > + @@ -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(() => { }); }, diff --git a/src/views/profile/Profile.vue b/src/views/profile/Profile.vue index 2180ab5..67c214a 100644 --- a/src/views/profile/Profile.vue +++ b/src/views/profile/Profile.vue @@ -37,7 +37,6 @@ index: true, stripe: true, border: true, - viewBtn: true, height: 664, align: 'center', column: [