diff --git a/package-lock.json b/package-lock.json index 7c69719..bc90a4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -93,6 +93,166 @@ } } }, + "@interactjs/actions": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/actions/-/actions-1.10.2.tgz", + "integrity": "sha512-BHJcW84WCMf/LsKmha/1Yog7aH3+QBXbLvowvZvwYvgjdUIb3xCa1a7FUYXuWAeKNMyKPVjFun+WPce75B+1tA==", + "requires": { + "@interactjs/interact": "1.10.2" + } + }, + "@interactjs/arrange": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/arrange/-/arrange-1.10.2.tgz", + "integrity": "sha512-pPLA9o4RWMFN0VfalklOFSRLL4WqqXcD9no4XEuqV00goZPCxLBbMTztaWwnutlRy7evtOhUjUH+pZVsS+dZ4Q==" + }, + "@interactjs/auto-scroll": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/auto-scroll/-/auto-scroll-1.10.2.tgz", + "integrity": "sha512-yYqzOawwvWd1NNnlqZdzrXoOMFafQ2/ws85erpJqdaNMQE221z2uP+QYhFRLQRgYUlTbHFfmjDpzhuJgq4uA8Q==", + "requires": { + "@interactjs/interact": "1.10.2" + } + }, + "@interactjs/auto-start": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/auto-start/-/auto-start-1.10.2.tgz", + "integrity": "sha512-nZudj8VzJzz+uEyDHqXwtKpvUYr+Oj1+xBrJEu21CywroHQWM2J4fCIiCgeCo3d5/p/TrzFk5b+YfAWePKiLxA==", + "requires": { + "@interactjs/interact": "1.10.2" + } + }, + "@interactjs/clone": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/clone/-/clone-1.10.2.tgz", + "integrity": "sha512-XzA8BRHSCwvysOegZ1kopg+IJF3erh4qzY6DRoZsIJovKAXawoa176E58IAzDbgYPJ2yoaSGT+XyzT2C0wa3pQ==" + }, + "@interactjs/core": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/core/-/core-1.10.2.tgz", + "integrity": "sha512-SA5KRGo+gFJOhBj1Z2dLHhAf0/2nyHNd4SQ460aIQ3jj/QhqbJW6kGzmh7hBa2FzVGgxLhcQu7NZaP4rnDfUNw==" + }, + "@interactjs/dev-tools": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/dev-tools/-/dev-tools-1.10.2.tgz", + "integrity": "sha512-aAd9NgTAGA3yVdFCYcAAYrM4TYQFuVqEvsF+xj+g5SlGyrJ7+GTjPZ2rScOyAsABY4Tz64L2pXvWmXMG87dncA==", + "requires": { + "@interactjs/interact": "1.10.2", + "@interactjs/utils": "1.10.2" + } + }, + "@interactjs/feedback": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/feedback/-/feedback-1.10.2.tgz", + "integrity": "sha512-XlcoICGrFeUwwRtDgOpstOOvlU42WZoEg7gJHK3LwF7j0IctPd1+3blXofFlBeVvodle8MvUMepm5CRXz741fA==" + }, + "@interactjs/inertia": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/inertia/-/inertia-1.10.2.tgz", + "integrity": "sha512-ZmN1joN6J36Q6SOp3V0iZOisXZOBMSAUj0STo8wbwCKy7K8IrC9vjUBbO2JM52cT6o7hg5ebHsp5c8FrebSHlg==", + "requires": { + "@interactjs/interact": "1.10.2", + "@interactjs/offset": "1.10.2" + } + }, + "@interactjs/interact": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/interact/-/interact-1.10.2.tgz", + "integrity": "sha512-Ms5uVCY9IobVYpQyBnBdkP6Bk6iDY7TkC7GupsdUPUxzAvYSQCTEAGr/1PwxSrSS6dN/8O8TuyUWPbCaylr/JA==", + "requires": { + "@interactjs/core": "1.10.2", + "@interactjs/types": "1.10.2", + "@interactjs/utils": "1.10.2" + } + }, + "@interactjs/interactjs": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/interactjs/-/interactjs-1.10.2.tgz", + "integrity": "sha512-OwLl70af6lfZOOg/bvWKSNm1DS1nDI72QnzDYljSKfc2D8stqLIGDO1wPY2rhZudUG5q3t50EhmMUQF76yll/g==", + "requires": { + "@interactjs/actions": "1.10.2", + "@interactjs/arrange": "1.10.2", + "@interactjs/auto-scroll": "1.10.2", + "@interactjs/auto-start": "1.10.2", + "@interactjs/clone": "1.10.2", + "@interactjs/core": "1.10.2", + "@interactjs/dev-tools": "1.10.2", + "@interactjs/feedback": "1.10.2", + "@interactjs/inertia": "1.10.2", + "@interactjs/interact": "1.10.2", + "@interactjs/modifiers": "1.10.2", + "@interactjs/multi-target": "1.10.2", + "@interactjs/offset": "1.10.2", + "@interactjs/pointer-events": "1.10.2", + "@interactjs/react": "1.10.2", + "@interactjs/reflow": "1.10.2", + "@interactjs/utils": "1.10.2", + "@interactjs/vue": "1.10.2" + } + }, + "@interactjs/modifiers": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/modifiers/-/modifiers-1.10.2.tgz", + "integrity": "sha512-3wYEucvZF2NTIslnVIKw5MWhkn9LM42cGCQaC19o3LZeWnbps7NnHJCyQp6zylJrCbwt7f+CSt4Oj2/s0f6XEA==", + "requires": { + "@interactjs/interact": "1.10.2", + "@interactjs/snappers": "1.10.2" + } + }, + "@interactjs/multi-target": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/multi-target/-/multi-target-1.10.2.tgz", + "integrity": "sha512-O2GiIqgZBzjAVTOpL8doTnAcM9AtM3+H/Bb+An12wWKtNutVK7JbqUAO2nYueOk55/PP3yDLY9Qdr15RJns3lQ==" + }, + "@interactjs/offset": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/offset/-/offset-1.10.2.tgz", + "integrity": "sha512-xLgQqinFUY7ZqSX9d9on7XRcxvQdHNEAktj2QFwxMsEwrA6zbKROpPVwt8WQ1yBAeJSFjgYGcmCMPW5K41dT0w==", + "requires": { + "@interactjs/interact": "1.10.2" + } + }, + "@interactjs/pointer-events": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/pointer-events/-/pointer-events-1.10.2.tgz", + "integrity": "sha512-O8s3N399hkGIzWGlcJVy0LJyDn5YWDh6XKjyowh/QivtlZSWPY8eglmlN2uZX0lmiqUYghbKI4CpQYP/cE0ZDA==", + "requires": { + "@interactjs/interact": "1.10.2" + } + }, + "@interactjs/react": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/react/-/react-1.10.2.tgz", + "integrity": "sha512-JXzPdANft+W2vq3SCSzprCwom5UuC8TaiAAhVdt8R+/P6xHbOeAX93XLS5YmDwT8e0Zh9J9jYvz55tkTdwjFZQ==" + }, + "@interactjs/reflow": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/reflow/-/reflow-1.10.2.tgz", + "integrity": "sha512-pc6o6RRhSCYQC4auZexRb7z5FQkdSVev5HzlRfUAjfw4C076qgbcs63ESRKy4YXdSBtUTvARQZxpuWUNGquzJw==", + "requires": { + "@interactjs/interact": "1.10.2" + } + }, + "@interactjs/snappers": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/snappers/-/snappers-1.10.2.tgz", + "integrity": "sha512-wQ41Vn5GRn6VavjIEUtTkd9d5QgdKgC4+CPW0fjKkiQclLBmaic7VibNETO8twN0Jx5e73EoPj9K2nAVHIA0hA==" + }, + "@interactjs/types": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/types/-/types-1.10.2.tgz", + "integrity": "sha512-l0T1bU8OHRv716ztQOYwP+K7b/lA76C0T3r/cdabbUv6CKeAFdFRRFlmNxYOM36SxMGWAiq5VWrN3SeXlB7Fow==" + }, + "@interactjs/utils": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/utils/-/utils-1.10.2.tgz", + "integrity": "sha512-sOr+pu7XGAN4qv+ikajMo3RJygbkbMLegmx0Tv5Qf6e80sF42FjkmHeMGuV7fL98nwat0VmDiWerOFBnKctXow==" + }, + "@interactjs/vue": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/@interactjs/vue/-/vue-1.10.2.tgz", + "integrity": "sha512-msLdc42DFsCPQZt6YBGZrw8Ro23kQcNnj+iLz2OUQcOrp/lma7WjorUuAwwfyFna2DevLtiYlMLbT0dpO/cVhg==" + }, "@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmmirror.com/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -1806,6 +1966,11 @@ "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", "dev": true }, + "batch-processor": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/batch-processor/-/batch-processor-1.0.0.tgz", + "integrity": "sha512-xoLQD8gmmR32MeuBHgH0Tzd5PuSZx71ZsbhVxOCRbgktZEPe4SQy7s9Z50uPp0F/f7iw2XmkHN2xkgbMfckMDA==" + }, "bcrypt-pbkdf": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", @@ -4711,6 +4876,14 @@ "integrity": "sha512-d5rZRka9n2Y3MkWRN74IoAsxR0HK3yaAt7T50e3iT9VZmCCQDT3geXUO5ZRMhDToa1pkCeQXuNo+0g+NfDOVPA==", "dev": true }, + "element-resize-detector": { + "version": "1.2.4", + "resolved": "https://registry.npmmirror.com/element-resize-detector/-/element-resize-detector-1.2.4.tgz", + "integrity": "sha512-Fl5Ftk6WwXE0wqCgNoseKWndjzZlDCwuPTcoVZfCP9R3EHQF8qUtr3YUPNETegRBOKqQKPW3n4kiIWngGi8tKg==", + "requires": { + "batch-processor": "1.0.0" + } + }, "element-ui": { "version": "2.15.14", "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.14.tgz", @@ -16058,6 +16231,28 @@ "csstype": "^3.1.0" } }, + "vue-drag-resize": { + "version": "1.5.4", + "resolved": "https://registry.npmmirror.com/vue-drag-resize/-/vue-drag-resize-1.5.4.tgz", + "integrity": "sha512-SR3U7n6TAZEBgP7zw7bR9mjtAlYBjqIoaWTDPz5HXN/nYhOxKSA31aD7p71fmq1jtyt9reAnCx62valNL9ZAcg==", + "requires": { + "vue-drag-resize": "^1.5.0-rc3" + } + }, + "vue-grid-layout": { + "version": "2.4.0", + "resolved": "https://registry.npmmirror.com/vue-grid-layout/-/vue-grid-layout-2.4.0.tgz", + "integrity": "sha512-MRQVt1BdWDaPN4gKGEKOVVwiTyucqJhrGEyjiY9Muor+dzFFq4Hm0geSpYJpLvC1GLlTL8KWUwy0suKrHm+mqg==", + "requires": { + "@interactjs/actions": "1.10.2", + "@interactjs/auto-scroll": "1.10.2", + "@interactjs/auto-start": "1.10.2", + "@interactjs/dev-tools": "1.10.2", + "@interactjs/interactjs": "1.10.2", + "@interactjs/modifiers": "1.10.2", + "element-resize-detector": "^1.2.1" + } + }, "vue-hot-reload-api": { "version": "2.3.4", "resolved": "https://registry.npmmirror.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz", diff --git a/package.json b/package.json index f0d393b..d63c18f 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,8 @@ "swiper": "^3.4.2", "vant": "^2.12.21", "vue": "^2.5.2", + "vue-drag-resize": "^1.5.4", + "vue-grid-layout": "^2.4.0", "vue-router": "^3.0.1", "vuex": "^3.6.2" }, @@ -58,7 +60,7 @@ "html-webpack-plugin": "^2.30.1", "jest": "^22.0.4", "jest-serializer-vue": "^0.3.0", - "less": "3.0.0", + "less": "^3.0.0", "nightwatch": "^0.9.12", "node-notifier": "^5.1.2", "node-sass": "^4.14.1", diff --git a/src/components/globalBar.vue b/src/components/globalBar.vue index 7f359cd..f074568 100644 --- a/src/components/globalBar.vue +++ b/src/components/globalBar.vue @@ -42,7 +42,7 @@ export default { { title: null, id: null }, { title: null, id: null }, { title: '线路', id: 3, path: '/line/index' }, - { title: '工作台', id: 4 }, + { title: '工作台', id: 4, path: '/workbench/index' }, ], currentIndex: this.indexCount } diff --git a/src/components/home/commonDialog.vue b/src/components/home/commonDialog.vue index 0901907..5f44fe2 100644 --- a/src/components/home/commonDialog.vue +++ b/src/components/home/commonDialog.vue @@ -27,23 +27,64 @@ + + + + + + + + + + + diff --git a/src/router/index.js b/src/router/index.js index dcf0edb..c42fdc8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -12,6 +12,7 @@ const Layout = () => import('@/views/layout'); const Home = () => import('@/views/Home/index'); const Substation = () => import('@/views/substation/index'); const Line = () => import('@/views/line/index'); +const Workbench = () => import('@/views/workbench/index'); const Login = () => import('@/views/Login/index'); const routes = [ { @@ -63,6 +64,15 @@ const routes = [ requireLoginAuth: true, }, }, + { + path: '/workbench/index', + component: Workbench, + name: 'Workbench', + meta: { + title: '工作台', + requireLoginAuth: true, + }, + }, { path: '/Login/index', component: Login, diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue index 56a9e01..dd1f040 100644 --- a/src/views/Home/index.vue +++ b/src/views/Home/index.vue @@ -36,7 +36,7 @@
- +
@@ -47,6 +47,7 @@ @@ -75,8 +76,8 @@
- - + + @@ -176,7 +177,7 @@ export default { // 您有一条检修预警提示，请注意查收！ transformList: [], currentIndex: 1, - showDialog: true, + geoData: undefined } }, created() { @@ -209,6 +210,14 @@ export default { this.transformList = res.data })*/ + this.geoData = [ + { name: '北京市', itemStyle: { normal: { areaColor: '#7DDEFF' } }, value: [116.407526, 39.90403] }, + { name: '上海市', itemStyle: { normal: { areaColor: '#7DDEFF' } }, value: [121.473701, 31.230416] }, + { name: '云南省', itemStyle: { normal: { areaColor: '#7DDEFF' } }, value: [102.103365, 24.235567] }, + { name: '陕西省', itemStyle: { normal: { areaColor: '#7DDEFF' } }, value: [108.551244, 34.150234] }, + { name: '新疆维吾尔自治区', itemStyle: { normal: { areaColor: '#7DDEFF' } }, value: [87.627704, 43.793026] }, + ] + }, methods: { handleDialog(val) { diff --git a/src/views/line/index.vue b/src/views/line/index.vue index bb28e16..7089e21 100644 --- a/src/views/line/index.vue +++ b/src/views/line/index.vue @@ -62,6 +62,8 @@ :send-height="'940px'" send-map-color="#e2e2e2" :send-geo="geoData" + :show-line="true" + @closeMap="handleCloseMap" >