diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue index fe8f9720..8a009c49 100644 --- a/ruoyi-ui/src/layout/index.vue +++ b/ruoyi-ui/src/layout/index.vue @@ -274,8 +274,6 @@ export default { }, }, created() { - console.log(this.titleHeader, "this.titleHeader"); - console.log(this.$route.path, "路由"); if (this.$route.path == "/tunnel") { if ( this.sideTheme == "theme-blue" || diff --git a/ruoyi-ui/src/router/routerCreater.js b/ruoyi-ui/src/router/routerCreater.js index 75122681..c912b31d 100644 --- a/ruoyi-ui/src/router/routerCreater.js +++ b/ruoyi-ui/src/router/routerCreater.js @@ -34,7 +34,7 @@ function processNode(node) { path: item.path || "", title: item.title, name: item.name, - meta: { menuId : prev + "_" + ids.join("-") } + meta: { menuId : prev + "_" + ids.join("-"), title : item.title} }; if (item.redirect) { diff --git a/ruoyi-ui/src/store/index.js b/ruoyi-ui/src/store/index.js index f6f93335..72a61d40 100644 --- a/ruoyi-ui/src/store/index.js +++ b/ruoyi-ui/src/store/index.js @@ -9,6 +9,7 @@ import settings from './modules/settings' import wsData from './modules/wsData' import getters from './getters' import manage from './modules/manage' +import menu from './modules/menu' Vue.use(Vuex) @@ -21,7 +22,8 @@ const store = new Vuex.Store({ permission, settings, wsData, - manage + manage, + menu, }, getters }) diff --git a/ruoyi-ui/src/store/modules/menu.js b/ruoyi-ui/src/store/modules/menu.js new file mode 100644 index 00000000..7e6c0b2b --- /dev/null +++ b/ruoyi-ui/src/store/modules/menu.js @@ -0,0 +1,22 @@ +const state = { + recentPages: [] + } + + const mutations = { + + addRecent(state, item) { + if (state.recentPages.find(unit => unit.path == item.path)) return; + state.recentPages.push(item); + }, + removeRecent(state, item) { + let i = state.recentPages.findIndex(unit => unit.path == item.path); + state.recentPages.splice(i, 1); + } + + } + + export default { + namespaced: true, + state, + mutations, + } \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js index 0b94fd25..2db40659 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js +++ b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js @@ -132,11 +132,12 @@ export const startStation = { }, }, key: "startStakeMark[0]", + default:55, rules: [ { message: "请补全桩号", callback(value, data) { - if (!value?.trim() && data.startStakeMark[1]?.trim()) return false + if (!((value+'')?.trim() && data.startStakeMark[1]?.trim())) return false else return true } } @@ -149,6 +150,7 @@ export const startStation = { color: "#3DE8FF", }, }, + default: 378, key: "startStakeMark[1]" }, ], @@ -170,11 +172,12 @@ export const endStation = { }, }, key: "endStakeMark[0]", + default: 208, rules: [ { message: "请补全桩号", callback(value, data) { - if (!value?.trim() && data.endStakeMark[1]?.trim()) return false + if (!((value + '')?.trim() && data.endStakeMark[1]?.trim())) return false else return true } } @@ -187,6 +190,7 @@ export const endStation = { color: "#3DE8FF", }, }, + default: 153, key: "endStakeMark[1]", }, ], diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue index 6d19fb8c..705e244a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue @@ -228,7 +228,6 @@ export default { * @type {{ callback?: (value: any) => boolean; type?: "phone"; message: string; }[]} */ const rules = item.rules || []; - for (let index = 0; index < rules.length; index++) { const rule = rules[index]; // 返回值 true 通过 false 异常 diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue index cd711a52..40b01d2d 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue @@ -79,6 +79,7 @@ export default { } } this.$emit("onChange", node, key); + console.log(node , "菜单点击++========"); } } }; diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue index 0282c440..6cc6e7ed 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue @@ -1,28 +1,29 @@ diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RecentPages/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/RecentPages/index.vue new file mode 100644 index 00000000..ddc259a1 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/components/RecentPages/index.vue @@ -0,0 +1,89 @@ + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/empty.vue b/ruoyi-ui/src/views/JiHeExpressway/components/empty.vue index 2fab079e..7a490f86 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/empty.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/empty.vue @@ -19,7 +19,6 @@ export default { } }, mounted() { - console.log(this.$route) } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/index.vue b/ruoyi-ui/src/views/JiHeExpressway/index.vue index ddf08c79..24d8e652 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/index.vue @@ -12,24 +12,23 @@ diff --git a/ruoyi-ui/src/views/event/event/dispatchYuan.vue b/ruoyi-ui/src/views/event/event/dispatchYuan.vue index 4facaa08..4f4d1e07 100644 --- a/ruoyi-ui/src/views/event/event/dispatchYuan.vue +++ b/ruoyi-ui/src/views/event/event/dispatchYuan.vue @@ -711,8 +711,6 @@ export default { }, deviceStatusChangeLog(event) { // console.log(event, "websockt工作台接收感知事件数据"); - console.log(event, "已执行"); - console.log(this.$route.query.id, "this.$route.query.id"); for (let item of event) { if (this.$route.query.id == item.eventId) { this.zxList.unshift(item); @@ -721,7 +719,6 @@ export default { }, }, async created() { - console.log(this.$route.query.id, "this.$route.query.id"); await this.getEqTypeStateIcon(); // await this.getTunnelData(); diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 930c4c40..1a83dbf6 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -53,7 +53,7 @@ module.exports = { // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁 // target: `http://10.168.78.135:8087`, //王钦 // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2 - target: `http://10.168.68.42:8087`, //王思祥 + target: `http://10.168.68.42:8087`, //王思祥 changeOrigin: true, pathRewrite: { ["^" + process.env.VUE_APP_BASE_API]: "",