diff --git a/ruoyi-ui/src/common/menuData.js b/ruoyi-ui/src/common/menuData.js index d1af6aca..7c08946f 100644 --- a/ruoyi-ui/src/common/menuData.js +++ b/ruoyi-ui/src/common/menuData.js @@ -88,6 +88,12 @@ export default [ name: "commandDispatch", component: "control/event/commandDispatch/index.vue", }, + { + title: "管控事件分析", + path: "/control/event/governanceAnalysis", + name: "governanceAnalysis", + component: "control/event/governanceAnalysis/index.vue", + }, ], }, ], diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue index a55e0448..1063bc54 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue @@ -248,7 +248,8 @@ border-radius: 50%; border: 2px solid; border: rgba(23, 162, 255, 0.2); - + border: 2px solid; +// border-image: linear-gradient(33deg, rgba(23, 162, 255, 0.71), rgba(23, 162, 255, 0)) 2 2; > .round-num { width:100%; diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 41b8e14f..093607d5 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -250,7 +250,7 @@ export default { position: relative; height: 100%; background-image: url("../assets/images/login-background.png"); - background-size: cover; + background-size: 100% auto; } .login::after { @@ -259,7 +259,8 @@ export default { width: 100%; height: 120px; background-image: url('../assets/images/login-head.png'); - background-size: auto 100%; + background-repeat: no-repeat; + background-size: 100% auto ; background-position: center center; } diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 431fc799..7a16ca3c 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -1,8 +1,5 @@ "use strict"; const path = require("path"); -const webpack = require("webpack"); - -const packageJSON = require("./package.json"); function resolve(dir) { return path.join(__dirname, dir); @@ -46,8 +43,8 @@ module.exports = { // target: `http://10.168.73.36:8080`, // 周乐 // target: `http://10.168.77.209:8080`, // 刘朋 // target: `http://10.168.66.196:8080`, //刘文阁 - // target: `http://10.168.56.206:8087`, //孟 - target: `http://10.0.81.202:8087`, //现场后台 + target: `http://10.168.65.156:8087`,//孟 + // target: `http://10.0.81.202:8087`, //现场后台 changeOrigin: true, pathRewrite: { ["^" + process.env.VUE_APP_BASE_API]: "", @@ -82,14 +79,6 @@ module.exports = { chainWebpack(config) { config.plugins.delete("preload"); // TODO: need test config.plugins.delete("prefetch"); // TODO: need test - config.plugin("DefinePlugin").use(webpack.DefinePlugin, [ - { - "process.env.Version": (() => - JSON.stringify( - `${new Date().toLocaleString()}-V${packageJSON.version}` - ))(), - }, - ]); const rootModulesPath = path.resolve("node_modules"); if (config.resolve.modules.store.has(rootModulesPath)) {