diff --git a/dist.zip b/dist.zip index 4acad6d..e5f0436 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/public/config/config.js b/public/config/config.js index b091c44..93b5166 100644 --- a/public/config/config.js +++ b/public/config/config.js @@ -306,10 +306,16 @@ window.config = { 39: { taskList: [], }, - 40: { + // 40: { + // taskList: [ + // { id: '1', name: '开' }, + // { id: '0', name: '关' }, + // ], + // }, + 40: { taskList: [ - { id: '1', name: '开' }, - { id: '0', name: '关' }, + { id: '1', name: '启动' }, + { id: '0', name: '停止' }, ], }, 41: { diff --git a/src/router/index.js b/src/router/index.js index 09c850a..26d9c3a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,7 +7,13 @@ Vue.use(VueRouter) const routes = [ + { + path: '/', + //name: 'layout', + component: Layout, + children: [ + { path: '/login', name: 'login', meta: { @@ -15,12 +21,7 @@ const routes = [ showMenu: false, }, component: () => import('@/views/login/index.vue') - }, - { - path: '/', - //name: 'layout', - component: Layout, - children: [{ + },{ path: '/home', // name: 'home', meta: { diff --git a/src/views/device/deviceView.vue b/src/views/device/deviceView.vue index 202550e..05c84fa 100644 --- a/src/views/device/deviceView.vue +++ b/src/views/device/deviceView.vue @@ -500,23 +500,28 @@ export default { }, pileNumMap: { 1: { - left: 'K30+600', - right: 'K34+800', + // left: 'K30+600', + // right: 'K34+800', + left: 'K33+327', + right: 'K37+527', // length1: '4000', // length2: '2616', - length1: '2616', + length1: '2616', length2: '2606', - width: 3436, - pileNumData: ['K31+294', 'K33+916'], + width: 5000, + pileNumData: ['K33+747', 'K37+107'], + n: 10, }, 2: { - left: 'K58+176', - right: 'K60+976', - // length1: '2800', - length1: '2200', + // left: 'K58+176', + // right: 'K60+976', + left: 'K60+903', + right: 'K63+703', + length1: '2200', length2: '2200', - width: 3436, - pileNumData: ['K58+476', 'K60+676'], + width: 5000, + pileNumData: ['K61+203', 'K63+403'], + n: 10, }, // 1: { // left: 'K9+720', diff --git a/src/views/view/index.vue b/src/views/view/index.vue index dfc769b..13b0625 100644 --- a/src/views/view/index.vue +++ b/src/views/view/index.vue @@ -1,5776 +1,5257 @@ - - - - - - + + + + + + diff --git a/vue.config.js b/vue.config.js index 47f749e..40f7a03 100644 --- a/vue.config.js +++ b/vue.config.js @@ -15,10 +15,12 @@ module.exports = { // target: 'http://link.ser99.vip:8080/zhongkai', // target: 'http://65.73.11.246:7774', // target: 'http://172.16.1.155:8009', - target: 'http://172.16.1.103:8084', + // target: 'http://172.16.1.103:8009', // target: 'http://172.16.1.162:8233', // target: 'http://192.168.13.138:8233', // target: 'http://172.16.1.113:8012', + // target: 'http://172.16.1.131:8009', + target: 'http://172.16.1.148:8009', ws: true, https: true, pathRewrite: { @@ -29,7 +31,9 @@ module.exports = { //集采 // target: 'http://65.73.11.246:8083', // target: 'http://172.16.1.155:8080', - target: 'http://172.16.1.103:8084', + // target: 'http://172.16.1.103:8083', + // target: 'http://172.16.1.131:8084', + target: 'http://172.16.1.148:8084', ws: true, https: true, pathRewrite: { @@ -39,8 +43,9 @@ module.exports = { '/iotApi': { //平台 // target: 'http://65.73.11.246:8090', - // target: 'http://172.16.1.155:8080', - target: 'http://172.16.1.103:8080', + target: 'http://172.16.1.148:8080', + // target: 'http://172.16.1.103:8080', + // target: 'http://172.16.1.131:8080', ws: true, https: true, pathRewrite: {