diff --git a/package-lock.json b/package-lock.json index d2a51c2..4b9482d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,10 +12,12 @@ "element-ui": "^2.15.14", "less": "^4.2.0", "less-loader": "^11.1.3", + "prismjs": "^1.29.0", "sass-loader": "^13.3.2", "scss-loader": "^0.0.1", "vue": "^2.6.14", - "vue-contextmenu": "^1.5.11" + "vue-contextmenu": "^1.5.11", + "vue-prism-editor": "^1.3.0" }, "devDependencies": { "@babel/core": "^7.12.16", @@ -8876,6 +8878,14 @@ "renderkid": "^3.0.0" } }, + "node_modules/prismjs": { + "version": "1.29.0", + "resolved": "https://registry.npmmirror.com/prismjs/-/prismjs-1.29.0.tgz", + "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==", + "engines": { + "node": ">=6" + } + }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -10584,6 +10594,17 @@ "node": ">=8" } }, + "node_modules/vue-prism-editor": { + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/vue-prism-editor/-/vue-prism-editor-1.3.0.tgz", + "integrity": "sha512-54RfgtMGRMNr9484zKMOZs1wyLDR6EfFylzE2QrMCD9alCvXyYYcS0vX8oUHh+6pMUu6ts59uSN9cHglpU2NRQ==", + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "vue": "^2.6.11" + } + }, "node_modules/vue-style-loader": { "version": "4.1.3", "resolved": "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz", @@ -18093,6 +18114,11 @@ "renderkid": "^3.0.0" } }, + "prismjs": { + "version": "1.29.0", + "resolved": "https://registry.npmmirror.com/prismjs/-/prismjs-1.29.0.tgz", + "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==" + }, "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -19453,6 +19479,12 @@ } } }, + "vue-prism-editor": { + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/vue-prism-editor/-/vue-prism-editor-1.3.0.tgz", + "integrity": "sha512-54RfgtMGRMNr9484zKMOZs1wyLDR6EfFylzE2QrMCD9alCvXyYYcS0vX8oUHh+6pMUu6ts59uSN9cHglpU2NRQ==", + "requires": {} + }, "vue-style-loader": { "version": "4.1.3", "resolved": "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz", diff --git a/package.json b/package.json index f2b1b3b..7a6c2ce 100644 --- a/package.json +++ b/package.json @@ -12,10 +12,12 @@ "element-ui": "^2.15.14", "less": "^4.2.0", "less-loader": "^11.1.3", + "prismjs": "^1.29.0", "sass-loader": "^13.3.2", "scss-loader": "^0.0.1", "vue": "^2.6.14", - "vue-contextmenu": "^1.5.11" + "vue-contextmenu": "^1.5.11", + "vue-prism-editor": "^1.3.0" }, "devDependencies": { "@babel/core": "^7.12.16", diff --git a/src/App.vue b/src/App.vue index 6cac192..e22cab5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -16,6 +16,9 @@ + + + @@ -36,6 +39,9 @@ import ChiWireld from "./components/ChiWireld.vue"; import ChiGateway from "./components/ChiGateway.vue"; import IpConfiguration from "./components/IpConfiguration.vue"; import PortConfiguration from "./components/PortConfiguration.vue"; +import ChiDevice from "./components/ChiDevice.vue"; +import ChiCollection from "./components/ChiCollection.vue"; +import ChiClone from "./components/ChiClone.vue"; export default { name: "App", data() { @@ -54,6 +60,9 @@ export default { ChiGate, ChiWireld, ChiGateway, + ChiDevice, + ChiCollection, + ChiClone, IpConfiguration, PortConfiguration, }, diff --git a/src/components/ChiClone.vue b/src/components/ChiClone.vue new file mode 100644 index 0000000..623fcf3 --- /dev/null +++ b/src/components/ChiClone.vue @@ -0,0 +1,622 @@ + + + + + + diff --git a/src/components/ChiCollection.vue b/src/components/ChiCollection.vue new file mode 100644 index 0000000..4b52aa6 --- /dev/null +++ b/src/components/ChiCollection.vue @@ -0,0 +1,271 @@ + + + + + + \ No newline at end of file diff --git a/src/components/ChiDevice.vue b/src/components/ChiDevice.vue new file mode 100644 index 0000000..cfbf248 --- /dev/null +++ b/src/components/ChiDevice.vue @@ -0,0 +1,459 @@ + + + + + + \ No newline at end of file diff --git a/src/components/ChiGate.vue b/src/components/ChiGate.vue index 89f5dbe..e9ea613 100644 --- a/src/components/ChiGate.vue +++ b/src/components/ChiGate.vue @@ -75,6 +75,88 @@ +
+ 斥候无线网关 +
+
+

IP配置

+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
@@ -147,47 +229,58 @@ export default { background-color: rgba(255, 255, 255, 1); text-align: center; border: 1px solid rgba(187, 187, 187, 1); + .gateway { + position: absolute; + left: 648px; + top: 226px; + width: 470px; + height: 384px; + line-height: 20px; + background-color: rgba(255, 255, 255, 1); + text-align: center; + border: 1px solid rgba(187, 187, 187, 1); - .el-divider--horizontal { - margin: 10px 0; - } - - .title { - margin: 13px 6px 0px 25px; - display: flex; - justify-content: space-between; - - .title_l { - width: 53px; - height: 26px; - color: rgba(16, 16, 16, 1); - font-size: 18px; - text-align: left; + .el-divider--horizontal { + margin: 10px 0; } - .title_r { - width: 24px; - height: 24px; - cursor: pointer; - color: rgba(111, 103, 103, 1); + .title { + margin: 13px 6px 0px 25px; + display: flex; + justify-content: space-between; + + .title_l { + width: 53px; + height: 26px; + color: rgba(16, 16, 16, 1); + font-size: 18px; + text-align: left; + } + + .title_r { + width: 24px; + height: 24px; + cursor: pointer; + color: rgba(111, 103, 103, 1); + } } - } - /deep/ .content { - margin-left: 62px; - margin-right: 114px; + /deep/ .content { + margin-left: 62px; + margin-right: 114px; - .el-input__inner { - width: 200px; - height: 30px; + .el-input__inner { + width: 200px; + height: 30px; + } } - } - /deep/ .footer { - .el-button { - width: 80px; - height: 30px; - line-height: 0.5; + /deep/ .footer { + .el-button { + width: 80px; + height: 30px; + line-height: 0.5; + } } } } diff --git a/src/components/ChiWireld.vue b/src/components/ChiWireld.vue index 6c507ee..2d447a7 100644 --- a/src/components/ChiWireld.vue +++ b/src/components/ChiWireld.vue @@ -170,7 +170,7 @@ diff --git a/src/components/DataAcquisition.vue b/src/components/DataAcquisition.vue index 36a683b..8d18a83 100644 --- a/src/components/DataAcquisition.vue +++ b/src/components/DataAcquisition.vue @@ -4,7 +4,7 @@ 数据采集设备
- + @@ -100,6 +100,4 @@ export default { text-align: left; font-family: SourceHanSansSC-regular; } -.dialog-footer-outer{ -} \ No newline at end of file diff --git a/src/components/TreeView.vue b/src/components/TreeView.vue index 0960f6c..b4c4d62 100644 --- a/src/components/TreeView.vue +++ b/src/components/TreeView.vue @@ -352,6 +352,26 @@ export default { } } } + }, + directives:{ + clickoutside:{ + bind:function(el,binding,vnode){ + function documentHandler(e){ + if(el.contains(e.target)){ + return false; + } + if(binding.expression){ + binding.value(e) + } + } + el._vueClickOutside_ = documentHandler; + document.addEventListener('click',documentHandler); + }, + unbind:function(el,binding){ + document.removeEventListener('click',el._vueClickOutside_); + delete el._vueClickOutside_; + } + } } };