diff --git a/xiuosiot-frontend/src/permission.js b/xiuosiot-frontend/src/permission.js index 3821411..6d5d3ce 100644 --- a/xiuosiot-frontend/src/permission.js +++ b/xiuosiot-frontend/src/permission.js @@ -2,7 +2,7 @@ * @Author: 龚祖望 573413756@qq.com * @Date: 2022-05-16 09:16:41 * @LastEditors: 龚祖望 573413756@qq.com - * @LastEditTime: 2022-10-19 14:37:55 + * @LastEditTime: 2022-11-17 11:13:35 * @FilePath: \dashengda\src\permission.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ diff --git a/xiuosiot-frontend/src/router/index.js b/xiuosiot-frontend/src/router/index.js index fe95ef1..af63e7a 100644 --- a/xiuosiot-frontend/src/router/index.js +++ b/xiuosiot-frontend/src/router/index.js @@ -137,12 +137,6 @@ export const asyncRouter = [ name: 'Terminal', meta: { title: '设备管理', icon: 'terminal', permission: ['dashengda', 'hangxiao', 'qianjiangdianqi', 'jiangxishida'] }, children: [ - // { - // path: 'product', - // name: 'Product', - // // component: () => import(''), - // meta: { title: '产品分类', disabled: true } - // }, { path: 'add', name: 'Add', @@ -305,7 +299,7 @@ const createRouter = () => new Router({ }) const router = createRouter() -router.addRoutes(asyncRouter) +// router.addRoutes(asyncRouter) // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465 export function resetRouter() { diff --git a/xiuosiot-frontend/src/store/modules/user.js b/xiuosiot-frontend/src/store/modules/user.js index 701f421..e5f4ce5 100644 --- a/xiuosiot-frontend/src/store/modules/user.js +++ b/xiuosiot-frontend/src/store/modules/user.js @@ -2,11 +2,12 @@ * @Author: 龚祖望 573413756@qq.com * @Date: 2022-05-16 09:16:41 * @LastEditors: 龚祖望 573413756@qq.com - * @LastEditTime: 2022-11-07 15:47:20 + * @LastEditTime: 2022-11-17 11:15:19 * @FilePath: \dashengda\src\store\modules\user.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ import { login, logout, getInfo } from '@/api/user' +import _ from 'lodash' import { getToken, setToken, removeToken } from '@/utils/auth' import { resetRouter, constantRoutes, asyncRouter } from '@/router' @@ -148,8 +149,8 @@ const actions = { }, generateRoutes({ commit }, roles) { return new Promise(resolve => { - const accessedRouters = filterAsyncRouter(asyncRouter, roles) - console.log('accessedRouters', accessedRouters) + const dynamicRouter = _.cloneDeep(asyncRouter) + const accessedRouters = filterAsyncRouter(dynamicRouter, roles) commit('SET_ROUTERS', accessedRouters) resolve() }) diff --git a/xiuosiot-frontend/src/views/configuration/development/index.vue b/xiuosiot-frontend/src/views/configuration/development/index.vue index 2951671..f819510 100644 --- a/xiuosiot-frontend/src/views/configuration/development/index.vue +++ b/xiuosiot-frontend/src/views/configuration/development/index.vue @@ -44,7 +44,6 @@ export default { signupUrl: 'https://account.le5le.com', userMenus: defalutUserMenus, dataOptionsFn: (pen, key, value) => { - console.log(pen, key, value) const keys = ['aaa', 'bbb'] const values = [ { @@ -111,7 +110,6 @@ export default { case 'openMaterialGroup': // 展开/折叠图标工具栏分组 - console.log('openMaterialGroup', e.params) // Do sth. break diff --git a/xiuosiot-frontend/src/views/data/history/qianjiang.vue b/xiuosiot-frontend/src/views/data/history/qianjiang.vue index 7f7eade..de70204 100644 --- a/xiuosiot-frontend/src/views/data/history/qianjiang.vue +++ b/xiuosiot-frontend/src/views/data/history/qianjiang.vue @@ -250,7 +250,6 @@ export default { // let scale = 0.7; const timeEnergyData = [] for (j = 0; j < showCount1 - 1; j++) { - console.log(timeEnergyTotalData) timeEnergyData.push({ value: sortTimeEnergy[j], name: timeDataAxis[timeEnergyTotalData.indexOf(sortTimeEnergy[j])], ranking: j }) } // timeEnergyData[0].selected = true; @@ -750,7 +749,6 @@ export default { label: { normal: { formatter: function(params) { - console.log(params) const labelWidth = 3 const labelWidth2 = 5 if (params.name.length > labelWidth && params.data.ranking === 0 || diff --git a/xiuosiot-frontend/src/views/overview/index.vue b/xiuosiot-frontend/src/views/overview/index.vue index 2d015ad..82f810f 100644 --- a/xiuosiot-frontend/src/views/overview/index.vue +++ b/xiuosiot-frontend/src/views/overview/index.vue @@ -2,7 +2,7 @@ * @Author: 龚祖望 573413756@qq.com * @Date: 2022-05-16 09:16:41 * @LastEditors: 龚祖望 573413756@qq.com - * @LastEditTime: 2022-11-15 11:10:07 + * @LastEditTime: 2022-11-17 11:17:55 * @FilePath: \dashengda\src\views\dashboard\index.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -69,7 +69,6 @@ export default { mounted() { const imgs = document.getElementsByClassName('slide-img') imgs.forEach(item => { - console.log('style', item.style) item.style.height = (window.innerHeight - 115) + 'px' }) } diff --git a/xiuosiot-frontend/src/views/rule/ruleManage/index.vue b/xiuosiot-frontend/src/views/rule/ruleManage/index.vue index 8997b0a..7352e36 100644 --- a/xiuosiot-frontend/src/views/rule/ruleManage/index.vue +++ b/xiuosiot-frontend/src/views/rule/ruleManage/index.vue @@ -415,7 +415,6 @@ export default { async save() { this.form.alarmSql = JSON.stringify(this.form.triggerList) const data = { ...this.form, ruleStatus: 0, org: this.org } - console.log('data', data) let res if (this.type === 0) { res = await add(data) diff --git a/xiuosiot-frontend/src/views/terminal/add/index.vue b/xiuosiot-frontend/src/views/terminal/add/index.vue index f859380..f2d9963 100644 --- a/xiuosiot-frontend/src/views/terminal/add/index.vue +++ b/xiuosiot-frontend/src/views/terminal/add/index.vue @@ -269,6 +269,14 @@ export default { val: 0 }] } + if (this.abbrCorpName === '钱江电气') { + res = [{ + name: '低压配电房', + src: require('@/assets/images/device3.png'), + color: '#46D5A0', + val: 0 + }] + } if (this.abbrCorpName === '大胜达') { res = [ { @@ -462,33 +470,33 @@ export default { privateserverusername: this.form.privateserverusername || 'admin' } await add({ productname, type, no, devicedesc, activestatus: this.form.activestatus, ...dataTemplate }) - await axios.post('/cgi-bin/tcpip_save', { - local_ipaddr: this.form.ipaddr, - netmask_addr: this.form.netmask, - gateway_addr: this.form.gateway, - dns_server0: this.form.dnsserver0, - dns_server1: this.form.dnsserver1 - }, { headers: { - Authorization: 'Basic YWRtaW46YWRtaW4=' - }}) - await axios.post('/cgi-bin/mqtt_save', { - pub_topic: this.form.topic, - server_addr: this.form.serveraddr, - server_port: this.form.serverport, - username: this.form.username, - password: this.form.password, - clientID: this.form.clientid - }, { headers: { - Authorization: 'Basic YWRtaW46YWRtaW4=' - }}) - await axios.post('/cgi-bin/private_prt_save', { - server_addr: this.form.privateserveraddr, - server_port: this.form.privateserverport, - username: this.form.privateserverusername, - passward: this.form.privateserverpassword - }, { headers: { - Authorization: 'Basic YWRtaW46YWRtaW4=' - }}) + // await axios.post('/cgi-bin/tcpip_save', { + // local_ipaddr: this.form.ipaddr, + // netmask_addr: this.form.netmask, + // gateway_addr: this.form.gateway, + // dns_server0: this.form.dnsserver0, + // dns_server1: this.form.dnsserver1 + // }, { headers: { + // Authorization: 'Basic YWRtaW46YWRtaW4=' + // }}) + // await axios.post('/cgi-bin/mqtt_save', { + // pub_topic: this.form.topic, + // server_addr: this.form.serveraddr, + // server_port: this.form.serverport, + // username: this.form.username, + // password: this.form.password, + // clientID: this.form.clientid + // }, { headers: { + // Authorization: 'Basic YWRtaW46YWRtaW4=' + // }}) + // await axios.post('/cgi-bin/private_prt_save', { + // server_addr: this.form.privateserveraddr, + // server_port: this.form.privateserverport, + // username: this.form.privateserverusername, + // passward: this.form.privateserverpassword + // }, { headers: { + // Authorization: 'Basic YWRtaW46YWRtaW4=' + // }}) if (this.form.activestatus === 0) { this.disactiveList.push(temp) } else { diff --git a/xiuosiot-frontend/src/views/terminal/center/index.vue b/xiuosiot-frontend/src/views/terminal/center/index.vue index a903212..5f1d7cf 100644 --- a/xiuosiot-frontend/src/views/terminal/center/index.vue +++ b/xiuosiot-frontend/src/views/terminal/center/index.vue @@ -225,7 +225,6 @@ export default { } }, mounted() { - this.current = this.deviceList[0] this.getList() }, methods: { @@ -236,6 +235,7 @@ export default { res.data.forEach(item => { this.deviceList.push({ ...item, status: item.runstatus }) }) + this.current = this.deviceList[0] } }) },