Bladeren bron

'202206161542'

fanghuisheng 3 jaren geleden
bovenliggende
commit
fcca3cfc1a
53 gewijzigde bestanden met toevoegingen van 634 en 705 verwijderingen
  1. 2 0
      README.md
  2. 12 6
      babel.config.js
  3. 1 0
      package.json
  4. 0 2
      src/App.vue
  5. 3 3
      src/api/index/index.js
  6. 6 1
      src/layout/vab-logo/index.vue
  7. 4 1
      src/layout/vab-tabs/index.vue
  8. 0 14
      src/main.js
  9. 1 0
      src/router/index.js
  10. 2 0
      src/store/index.js
  11. 5 103
      src/store/modules/routes.js
  12. 20 19
      src/store/modules/user.js
  13. 4 3
      src/utils/routes.js
  14. 154 154
      src/views/401.vue
  15. 154 154
      src/views/403.vue
  16. 154 153
      src/views/404.vue
  17. 3 3
      src/views/dataManage/chainAnalysis/ehcarts/index.vue
  18. 3 3
      src/views/dataManage/demandAnalysis/ehcarts/index.vue
  19. 3 3
      src/views/dataManage/energyReport/ehcarts/index.vue
  20. 3 3
      src/views/dataManage/sameAnalysis/ehcarts/index.vue
  21. 9 4
      src/views/index/components/VersionInformation.vue
  22. 1 1
      src/views/login/index.vue
  23. 3 3
      src/views/operManage/operStatistics/components/pieChart.vue
  24. 3 3
      src/views/perCenter/index.vue
  25. 2 1
      src/views/platManage/index.vue
  26. 3 3
      src/views/powerQuality/asseReport/scoreReportComponent/innerLineChart.vue
  27. 3 3
      src/views/powerQuality/asseReport/scoreReportComponent/innerLineChart2.vue
  28. 3 3
      src/views/powerQuality/asseReport/scoreReportComponent/pieChart.vue
  29. 3 3
      src/views/powerQuality/asseReport/scoreReportComponent/radarChart.vue
  30. 3 3
      src/views/powerQuality/harmonicReport/curveCom.vue
  31. 3 3
      src/views/powerQuality/harmonicReport/curveComA.vue
  32. 3 3
      src/views/powerQuality/harmonicReport/curveComB.vue
  33. 3 3
      src/views/powerQuality/harmonicReport/curveComC.vue
  34. 3 3
      src/views/powerQuality/realTimeMonitoring/loopMonitorComponent/loopRadarChart.vue
  35. 3 3
      src/views/powerQuality/realTimeMonitoring/loopMonitorComponent/loopRadarChart2.vue
  36. 3 3
      src/views/powerQuality/realTimeMonitoring/realScoreComponent/innerLineChart.vue
  37. 3 3
      src/views/powerQuality/realTimeMonitoring/realScoreComponent/innerLineChart2.vue
  38. 3 3
      src/views/powerQuality/realTimeMonitoring/realScoreComponent/pieChart.vue
  39. 3 3
      src/views/powerQuality/realTimeMonitoring/realScoreComponent/radarChart.vue
  40. 3 3
      src/views/powerQuality/unbalanceAnalysis/electricChart.vue
  41. 3 3
      src/views/powerQuality/unbalanceAnalysis/electricChart2.vue
  42. 3 3
      src/views/powerQuality/unbalanceAnalysis/voltageChart.vue
  43. 3 3
      src/views/powerQuality/unbalanceAnalysis/voltageChart2.vue
  44. 1 1
      src/views/statisManage/loginLog/index.vue
  45. 1 1
      src/views/statisManage/operLog/index.vue
  46. 1 1
      src/views/tenantManage/adminConfig/component/checkAdminList.vue
  47. 2 2
      src/views/tenantManage/adminConfig/index.vue
  48. 1 1
      src/views/tenantManage/authConfig/dialogComponent.vue
  49. 1 1
      src/views/tenantManage/authConfig/index.vue
  50. 3 3
      src/views/tenantManage/systemConfig/dialogComponent.vue
  51. 1 1
      src/views/tenantManage/systemConfig/index.vue
  52. 1 1
      src/views/tenantManage/tenantUnit/index.vue
  53. 16 2
      vue.config.js

+ 2 - 0
README.md

@@ -2,4 +2,6 @@
 
 imagemin-gifsicle 图片压缩包
 
+@vue/compiler-sfc 源码阅读 安装命令 npm install @vue/compiler-sfc@^3.0.5 --save-dev
+
 安装依赖 

+ 12 - 6
babel.config.js

@@ -1,13 +1,19 @@
 module.exports = {
   presets: ['@vue/cli-plugin-babel/preset'],
+  // plugins: ['dynamic-import-node']
 }
 // module.exports = {
 //   presets: [
-//     '@vue/app'
+//     '@vue/cli-plugin-babel/preset',
+//     ["@babel/preset-env", { "modules": false }]
 //   ],
-//   env: {
-//     development: {
-//       plugins: ['dynamic-import-node']
-//     }
-//   }
+//   "plugins": [
+//     [
+//       "component",
+//       {
+//         "libraryName": "element-ui",
+//         "styleLibraryName": "theme-chalk"
+//       }
+//     ]
+//   ]
 // }

+ 1 - 0
package.json

@@ -59,6 +59,7 @@
     "stylelint-config-prettier": "^8.0.2",
     "stylelint-config-recess-order": "^2.3.0",
     "svg-sprite-loader": "^5.2.1",
+    "uglifyjs-webpack-plugin": "^2.2.0",
     "vab-config": "0.0.8",
     "webpackbar": "^5.0.0-3"
   },

+ 0 - 2
src/App.vue

@@ -16,8 +16,6 @@ export default defineComponent({
         // router.push({
         //   path: '/login',
         // })
-      } else {
-        // console.log(2)
       }
     })
     return {

+ 3 - 3
src/api/index/index.js

@@ -14,7 +14,7 @@ export function editBulletinCruxConfig(params) {
     return request({
         url: '/bulletinCruxConfig/editBulletinCruxConfig',
         method: 'POST',
-        data:params,
+        data: params,
     })
 }
 
@@ -23,7 +23,7 @@ export function editBulletinHistoricalConfig(params) {
     return request({
         url: '/bulletinCruxConfig/editBulletinHistoricalConfig',
         method: 'POST',
-        data:params,
+        data: params,
     })
 }
 
@@ -32,7 +32,7 @@ export function editBulletinAlarmConfig(params) {
     return request({
         url: '/bulletinCruxConfig/editBulletinAlarmConfig',
         method: 'POST',
-        data:params,
+        data: params,
     })
 }
 

+ 6 - 1
src/layout/vab-logo/index.vue

@@ -10,7 +10,11 @@
 
   <div class="vab-logo">
     <router-link
-      to="/"
+      :to="
+        store.state.middleList[0].path === '/'
+          ? '/index'
+          : store.state.middleList[0].path
+      "
       class="logo-url"
       style="margin-right: 20px"
       v-if="store.state.homeLogo"
@@ -44,6 +48,7 @@ export default {
   },
   setup() {
     const store = useStore()
+
     return {
       store,
       collapsed: false,

+ 4 - 1
src/layout/vab-tabs/index.vue

@@ -46,7 +46,7 @@
           {{ item.title }}
         </el-breadcrumb-item>
       </el-breadcrumb> -->
-      
+
       <!-- {{visitedRoutes}} -->
 
       <a-tabs
@@ -73,6 +73,9 @@
           placeholder="Select"
           size="large"
           style="width: 280px; margin-top: 7.5px"
+          clearable
+          filterable
+          :disabled="this.$store.state.authorities.indexOf('查询') == -1"
         >
           <el-option
             v-for="item in this.$store.state.siteList"

+ 0 - 14
src/main.js

@@ -64,19 +64,6 @@ app
     .use(VueGridLayout)
     .mount('#app')
 
-
-if (process.env.NODE_ENV === 'production') {
-    // console.log("process.env.NODE_ENV111" + process.env.NODE_ENV)
-
-    // const { mockXHR } = require('@/utils/static')
-    // mockXHR()
-
-    // console.log("process.env.NODE_ENV111 正式环境域名" + process.env.VUE_APP_BASE_URL)
-} else {
-    // console.log("process.env.NODE_ENV111 测试环境域名" + process.env.VUE_APP_BASE_URL)
-}
-
-
 /**
  * @需添加路由拦截 --登录后执行
  */
@@ -109,5 +96,4 @@ router.beforeEach((to) => {
 
 router.afterEach((to) => {
     to
-
 })

+ 1 - 0
src/router/index.js

@@ -64,6 +64,7 @@ export const constantRoutes = [{
             },
             path: '/perCenter/index',
             component: () =>
+            
                 import ('@/views/perCenter/index'),
         }, ]
     },

+ 2 - 0
src/store/index.js

@@ -95,6 +95,7 @@ export default createStore({
                 .then((requset) => {
                     if (requset.status === 'SUCCESS') {
                         state.siteList = requset.data
+                        state.siteId = requset.data[0].id
                     } else {
                         ElMessage.error(requset.msg)
                     }
@@ -207,6 +208,7 @@ export default createStore({
         increment(state, val) {
             state.siteId = val
         },
+
         /**
          * @公共处理时区方法
          */

+ 5 - 103
src/store/modules/routes.js

@@ -6,8 +6,8 @@ import { asyncRoutes, constantRoutes } from '@/router'
 import { getRouterList } from '@/api/router'
 import { convertRouter, filterRoutes } from '@/utils/routes'
 import { ElMessage } from 'element-plus'
-import { notification } from 'ant-design-vue'
-import store from '..'
+import store from '../index'
+
 // import { Layout } from 'ant-design-vue'
 
 const state = () => ({
@@ -49,26 +49,9 @@ const actions = {
 
         if (data.length == 0) {
             ElMessage.warning('此角色暂无分配权限,请先联系超级管理员分配权限 ! ')
-        } else {
-            const hour = new Date().getHours()
-            const thisTime =
-                hour < 8 ?
-                    '早上好' :
-                    hour <= 11 ?
-                        '上午好' :
-                        hour <= 13 ?
-                            '中午好' :
-                            hour < 18 ?
-                                '下午好' :
-                                '晚上好'
-
-            notification.open({
-                // message: `欢迎登录${title}`,
-                message: `登录成功`,
-                description: `${thisTime}!`,
-            })
-            store.state.firstMiddleState = true
+            return false
         }
+
         data[0].meta.affix = false
 
 
@@ -84,87 +67,8 @@ const actions = {
 
         } else {
             data[0].children[0].meta.affix = true
-
         }
 
-        // data.unshift({
-        //     path: "/",
-        //     hidden: false,
-        //     redirect: "/index",
-        //     component: "Layout",
-        //     meta: {
-        //         title: "数据看板",
-        //         icon: "home",
-
-        //     },
-        //     children: [{
-        //         path: "index",
-        //         hidden: false,
-        //         component: "@/views/index",
-        //         meta: {
-        //             title: "数据看板1",
-        //             icon: "home",
-        //             affix: true
-
-        //         }
-        //     }]
-        // })
-
-
-        // data.push({
-        //     path: "/platManage",
-        //     hidden: false,
-        //     redirect: "/platManage/index",
-        //     component: "Layout",
-        //     meta: {
-        //         title: "模板管理",
-        //         icon: "platManage",
-
-        //     },
-        //     children: [{
-        //         meta: {
-        //             title: "模板管理",
-        //             icon: "platManage",
-
-        //         },
-        //         path: "/platManage",
-        //         hidden: false,
-        //         component: "@/views/platManage/index",
-
-        //     }, ]
-        // }, {
-        //     path: "/statisManage",
-        //     hidden: false,
-        //     redirect: "/statisManage/loginLog",
-        //     component: "Layout",
-        //     meta: {
-        //         title: "统计管理",
-        //         icon: "statisManage",
-
-        //     },
-        //     children: [{
-        //         meta: {
-        //             title: "登录日志",
-        //             icon: "statisManage",
-
-        //         },
-        //         path: "loginLog",
-        //         hidden: false,
-        //         component: "@/views/statisManage/loginLog/index",
-
-        //     }, {
-        //         meta: {
-        //             title: "操作日志",
-        //             icon: "statisManage",
-
-        //         },
-        //         path: "operLog",
-        //         hidden: false,
-        //         component: "@/views/statisManage/operLog/index",
-
-        //     }]
-        // })
-
 
 
         data.forEach(function (item) {
@@ -174,11 +78,9 @@ const actions = {
                 })
             }
         })
-        // console.log('data')
-        // console.log(data)
 
         store.state.middleList = data
-
+        store.state.auth = 1
 
         // if (data[data.length - 1].path !== '*')
         //     data.push({ path: '/*', redirect: '/404', hidden: true })

+ 20 - 19
src/store/modules/user.js

@@ -73,27 +73,27 @@ const actions = {
         const { data } = await login(userInfo)
         const accessToken = data
         if (accessToken) {
-
             commit('setAccessToken', accessToken)
+            if (store.state.auth == 0) {
+                const hour = new Date().getHours()
+                const thisTime =
+                    hour < 8 ?
+                        '早上好' :
+                        hour <= 11 ?
+                            '上午好' :
+                            hour <= 13 ?
+                                '中午好' :
+                                hour < 18 ?
+                                    '下午好' :
+                                    '晚上好'
 
-            // const hour = new Date().getHours()
-            // const thisTime =
-            //     hour < 8 ?
-            //         '早上好' :
-            //         hour <= 11 ?
-            //             '上午好' :
-            //             hour <= 13 ?
-            //                 '中午好' :
-            //                 hour < 18 ?
-            //                     '下午好' :
-            //                     '晚上好'
-
-            // notification.open({
-            //     // message: `欢迎登录${title}`,
-            //     message: `登录成功`,
-            //     description: `${thisTime}!`,
-            // })
-            // store.state.firstMiddleState = true
+                notification.open({
+                    // message: `欢迎登录${title}`,
+                    message: `登录成功`,
+                    description: `${thisTime}!`,
+                })
+                store.state.firstMiddleState = true
+            }
 
         } else {
             message.error(`登录接口异常,未正确返回${tokenName}...`)
@@ -134,6 +134,7 @@ const actions = {
      * @param {*} { dispatch }
      */
     async logout({ dispatch }) {
+        store.state.auth = 0
         await logout(state.accessToken)
         await dispatch('resetAll')
     },

+ 4 - 3
src/utils/routes.js

@@ -36,9 +36,10 @@ export function convertRouter(constantRoutes) {
 
                 // route.component = (resolve) => require([`@/views/alarmManage/index`], resolve)
                 route.component = () =>
-                    import (`@/views/${path}`)
-                    // route.component = () => import(`@/views/alarmManage/index`)
-                    // console.log(route)
+                    import(`@/views/${path}`)
+                // Promise.resolve(require(`@/views/${path}`).default)
+                // route.component = () => import(`@/views/alarmManage/index`)
+                // console.log(route)
             }
         }
         if (route.children && route.children.length)

+ 154 - 154
src/views/401.vue

@@ -28,185 +28,185 @@
 </template>
 
 <script>
-  import { mapActions } from 'vuex'
-
-  export default {
-    name: 'Page403',
-    data() {
-      return {
-        jumpTime: 5,
-        oops: '抱歉!',
-        headline: '请刷新页面或重新登录...',
-        info: '认证失败,无法访问系统资源。',
-        btn: '返回首页',
-        timer: 0,
-      }
-    },
-    mounted() {
-      this.timeChange()
-    },
-    beforeUnmount() {
-      clearInterval(this.timer)
-    },
-    methods: {
-      ...mapActions({
-        delVisitedRoute: 'tagsBar/delVisitedRoute',
-        delOthersVisitedRoutes: 'tagsBar/delOthersVisitedRoutes',
-      }),
-      timeChange() {
-        this.timer = setInterval(() => {
-          if (this.jumpTime) {
-            this.jumpTime--
-          } else {
-            this.$router.push({ path: '/' })
-            this.delOthersVisitedRoutes({ path: '/' })
-            clearInterval(this.timer)
-          }
-        }, 1000)
-      },
+import { mapActions } from 'vuex'
+
+export default {
+  name: 'Page403',
+  data() {
+    return {
+      jumpTime: 5,
+      oops: '抱歉!',
+      headline: '请刷新页面或重新登录...',
+      info: '认证失败,无法访问系统资源。',
+      btn: '返回首页',
+      timer: 0,
+    }
+  },
+  mounted() {
+    this.timeChange()
+  },
+  beforeUnmount() {
+    clearInterval(this.timer)
+  },
+  methods: {
+    ...mapActions({
+      delVisitedRoute: 'tagsBar/delVisitedRoute',
+      delOthersVisitedRoutes: 'tagsBar/delOthersVisitedRoutes',
+    }),
+    timeChange() {
+      this.timer = setInterval(() => {
+        if (this.jumpTime) {
+          this.jumpTime--
+        } else {
+          this.$router.push({ path: store.state.middleListp[0].path })
+          this.delOthersVisitedRoutes({ path: store.state.middleListp[0].path })
+          clearInterval(this.timer)
+        }
+      }, 1000)
     },
-  }
+  },
+}
 </script>
 
 <style lang="less" scoped>
-  .error-container {
-    position: relative;
-    height: 100vh;
-
-    .error-content {
-      position: absolute;
-      top: 55%;
-      left: 50%;
-      width: 40vw;
-      height: 400px;
-      transform: translate(-50%, -50%);
-
-      .pic-error {
-        position: relative;
-        float: left;
+.error-container {
+  position: relative;
+  height: 100vh;
+
+  .error-content {
+    position: absolute;
+    top: 55%;
+    left: 50%;
+    width: 40vw;
+    height: 400px;
+    transform: translate(-50%, -50%);
+
+    .pic-error {
+      position: relative;
+      float: left;
+      width: 100%;
+      overflow: hidden;
+
+      &-parent {
         width: 100%;
-        overflow: hidden;
+      }
 
-        &-parent {
-          width: 100%;
-        }
+      &-child {
+        position: absolute;
 
-        &-child {
-          position: absolute;
+        &.left {
+          top: 17px;
+          left: 220px;
+          width: 80px;
+          opacity: 0;
+          animation-name: cloudLeft;
+          animation-duration: 2s;
+          animation-timing-function: linear;
+          animation-delay: 1s;
+          animation-fill-mode: forwards;
+        }
 
-          &.left {
+        @keyframes cloudLeft {
+          0% {
             top: 17px;
             left: 220px;
-            width: 80px;
             opacity: 0;
-            animation-name: cloudLeft;
-            animation-duration: 2s;
-            animation-timing-function: linear;
-            animation-delay: 1s;
-            animation-fill-mode: forwards;
           }
 
-          @keyframes cloudLeft {
-            0% {
-              top: 17px;
-              left: 220px;
-              opacity: 0;
-            }
-
-            20% {
-              top: 33px;
-              left: 188px;
-              opacity: 1;
-            }
-
-            80% {
-              top: 81px;
-              left: 92px;
-              opacity: 1;
-            }
-
-            100% {
-              top: 97px;
-              left: 60px;
-              opacity: 0;
-            }
+          20% {
+            top: 33px;
+            left: 188px;
+            opacity: 1;
+          }
+
+          80% {
+            top: 81px;
+            left: 92px;
+            opacity: 1;
+          }
+
+          100% {
+            top: 97px;
+            left: 60px;
+            opacity: 0;
           }
         }
       }
+    }
+
+    .bullshit {
+      position: relative;
+      float: left;
+      width: 300px;
+      padding: 30px 0;
+      overflow: hidden;
+
+      &-oops {
+        margin-bottom: @vab-margin;
+        font-size: 32px;
+        font-weight: bold;
+        line-height: 40px;
+        opacity: 0;
+        animation-name: slideUp;
+        animation-duration: 0.5s;
+        animation-fill-mode: forwards;
+      }
 
-      .bullshit {
-        position: relative;
-        float: left;
-        width: 300px;
-        padding: 30px 0;
-        overflow: hidden;
-
-        &-oops {
-          margin-bottom: @vab-margin;
-          font-size: 32px;
-          font-weight: bold;
-          line-height: 40px;
-          opacity: 0;
-          animation-name: slideUp;
-          animation-duration: 0.5s;
-          animation-fill-mode: forwards;
-        }
+      &-headline {
+        margin-bottom: 10px;
+        font-size: 20px;
+        font-weight: bold;
+        line-height: 24px;
+        color: #222;
+        opacity: 0;
+        animation-name: slideUp;
+        animation-duration: 0.5s;
+        animation-delay: 0.1s;
+        animation-fill-mode: forwards;
+      }
 
-        &-headline {
-          margin-bottom: 10px;
-          font-size: 20px;
-          font-weight: bold;
-          line-height: 24px;
-          color: #222;
-          opacity: 0;
-          animation-name: slideUp;
-          animation-duration: 0.5s;
-          animation-delay: 0.1s;
-          animation-fill-mode: forwards;
-        }
+      &-info {
+        margin-bottom: 30px;
+        font-size: 13px;
+        line-height: 21px;
+        opacity: 0;
+        animation-name: slideUp;
+        animation-duration: 0.5s;
+        animation-delay: 0.2s;
+        animation-fill-mode: forwards;
+      }
 
-        &-info {
-          margin-bottom: 30px;
-          font-size: 13px;
-          line-height: 21px;
-          opacity: 0;
-          animation-name: slideUp;
-          animation-duration: 0.5s;
-          animation-delay: 0.2s;
-          animation-fill-mode: forwards;
-        }
+      &-return-home {
+        display: block;
+        float: left;
+        width: 110px;
+        height: 36px;
+        font-size: 14px;
+        line-height: 36px;
+        color: #fff;
+        text-align: center;
+        cursor: pointer;
+        background: @vab-color-blue;
+        border-radius: 100px;
+        opacity: 0;
+        animation-name: slideUp;
+        animation-duration: 0.5s;
+        animation-delay: 0.3s;
+        animation-fill-mode: forwards;
+      }
 
-        &-return-home {
-          display: block;
-          float: left;
-          width: 110px;
-          height: 36px;
-          font-size: 14px;
-          line-height: 36px;
-          color: #fff;
-          text-align: center;
-          cursor: pointer;
-          background: @vab-color-blue;
-          border-radius: 100px;
+      @keyframes slideUp {
+        0% {
           opacity: 0;
-          animation-name: slideUp;
-          animation-duration: 0.5s;
-          animation-delay: 0.3s;
-          animation-fill-mode: forwards;
+          transform: translateY(60px);
         }
 
-        @keyframes slideUp {
-          0% {
-            opacity: 0;
-            transform: translateY(60px);
-          }
-
-          100% {
-            opacity: 1;
-            transform: translateY(0);
-          }
+        100% {
+          opacity: 1;
+          transform: translateY(0);
         }
       }
     }
   }
+}
 </style>

+ 154 - 154
src/views/403.vue

@@ -28,185 +28,185 @@
 </template>
 
 <script>
-  import { mapActions } from 'vuex'
-
-  export default {
-    name: 'Page403',
-    data() {
-      return {
-        jumpTime: 5,
-        oops: '抱歉!',
-        headline: '您没有操作角色...',
-        info: '当前帐号没有操作角色,请联系管理员。',
-        btn: '返回首页',
-        timer: 0,
-      }
-    },
-    mounted() {
-      this.timeChange()
-    },
-    beforeUnmount() {
-      clearInterval(this.timer)
-    },
-    methods: {
-      ...mapActions({
-        delVisitedRoute: 'tagsBar/delVisitedRoute',
-        delOthersVisitedRoutes: 'tagsBar/delOthersVisitedRoutes',
-      }),
-      timeChange() {
-        this.timer = setInterval(() => {
-          if (this.jumpTime) {
-            this.jumpTime--
-          } else {
-            this.$router.push({ path: '/' })
-            this.delOthersVisitedRoutes({ path: '/' })
-            clearInterval(this.timer)
-          }
-        }, 1000)
-      },
+import { mapActions } from 'vuex'
+
+export default {
+  name: 'Page403',
+  data() {
+    return {
+      jumpTime: 5,
+      oops: '抱歉!',
+      headline: '您没有操作角色...',
+      info: '当前帐号没有操作角色,请联系管理员。',
+      btn: '返回首页',
+      timer: 0,
+    }
+  },
+  mounted() {
+    this.timeChange()
+  },
+  beforeUnmount() {
+    clearInterval(this.timer)
+  },
+  methods: {
+    ...mapActions({
+      delVisitedRoute: 'tagsBar/delVisitedRoute',
+      delOthersVisitedRoutes: 'tagsBar/delOthersVisitedRoutes',
+    }),
+    timeChange() {
+      this.timer = setInterval(() => {
+        if (this.jumpTime) {
+          this.jumpTime--
+        } else {
+          this.$router.push({ path: store.state.middleListp[0].path })
+          this.delOthersVisitedRoutes({ path: store.state.middleListp[0].path })
+          clearInterval(this.timer)
+        }
+      }, 1000)
     },
-  }
+  },
+}
 </script>
 
 <style lang="less" scoped>
-  .error-container {
-    position: relative;
-    height: 100vh;
-
-    .error-content {
-      position: absolute;
-      top: 55%;
-      left: 50%;
-      width: 40vw;
-      height: 400px;
-      transform: translate(-50%, -50%);
-
-      .pic-error {
-        position: relative;
-        float: left;
+.error-container {
+  position: relative;
+  height: 100vh;
+
+  .error-content {
+    position: absolute;
+    top: 55%;
+    left: 50%;
+    width: 40vw;
+    height: 400px;
+    transform: translate(-50%, -50%);
+
+    .pic-error {
+      position: relative;
+      float: left;
+      width: 100%;
+      overflow: hidden;
+
+      &-parent {
         width: 100%;
-        overflow: hidden;
+      }
 
-        &-parent {
-          width: 100%;
-        }
+      &-child {
+        position: absolute;
 
-        &-child {
-          position: absolute;
+        &.left {
+          top: 17px;
+          left: 220px;
+          width: 80px;
+          opacity: 0;
+          animation-name: cloudLeft;
+          animation-duration: 2s;
+          animation-timing-function: linear;
+          animation-delay: 1s;
+          animation-fill-mode: forwards;
+        }
 
-          &.left {
+        @keyframes cloudLeft {
+          0% {
             top: 17px;
             left: 220px;
-            width: 80px;
             opacity: 0;
-            animation-name: cloudLeft;
-            animation-duration: 2s;
-            animation-timing-function: linear;
-            animation-delay: 1s;
-            animation-fill-mode: forwards;
           }
 
-          @keyframes cloudLeft {
-            0% {
-              top: 17px;
-              left: 220px;
-              opacity: 0;
-            }
-
-            20% {
-              top: 33px;
-              left: 188px;
-              opacity: 1;
-            }
-
-            80% {
-              top: 81px;
-              left: 92px;
-              opacity: 1;
-            }
-
-            100% {
-              top: 97px;
-              left: 60px;
-              opacity: 0;
-            }
+          20% {
+            top: 33px;
+            left: 188px;
+            opacity: 1;
+          }
+
+          80% {
+            top: 81px;
+            left: 92px;
+            opacity: 1;
+          }
+
+          100% {
+            top: 97px;
+            left: 60px;
+            opacity: 0;
           }
         }
       }
+    }
+
+    .bullshit {
+      position: relative;
+      float: left;
+      width: 300px;
+      padding: 30px 0;
+      overflow: hidden;
+
+      &-oops {
+        margin-bottom: @vab-margin;
+        font-size: 32px;
+        font-weight: bold;
+        line-height: 40px;
+        opacity: 0;
+        animation-name: slideUp;
+        animation-duration: 0.5s;
+        animation-fill-mode: forwards;
+      }
 
-      .bullshit {
-        position: relative;
-        float: left;
-        width: 300px;
-        padding: 30px 0;
-        overflow: hidden;
-
-        &-oops {
-          margin-bottom: @vab-margin;
-          font-size: 32px;
-          font-weight: bold;
-          line-height: 40px;
-          opacity: 0;
-          animation-name: slideUp;
-          animation-duration: 0.5s;
-          animation-fill-mode: forwards;
-        }
+      &-headline {
+        margin-bottom: 10px;
+        font-size: 20px;
+        font-weight: bold;
+        line-height: 24px;
+        color: #222;
+        opacity: 0;
+        animation-name: slideUp;
+        animation-duration: 0.5s;
+        animation-delay: 0.1s;
+        animation-fill-mode: forwards;
+      }
 
-        &-headline {
-          margin-bottom: 10px;
-          font-size: 20px;
-          font-weight: bold;
-          line-height: 24px;
-          color: #222;
-          opacity: 0;
-          animation-name: slideUp;
-          animation-duration: 0.5s;
-          animation-delay: 0.1s;
-          animation-fill-mode: forwards;
-        }
+      &-info {
+        margin-bottom: 30px;
+        font-size: 13px;
+        line-height: 21px;
+        opacity: 0;
+        animation-name: slideUp;
+        animation-duration: 0.5s;
+        animation-delay: 0.2s;
+        animation-fill-mode: forwards;
+      }
 
-        &-info {
-          margin-bottom: 30px;
-          font-size: 13px;
-          line-height: 21px;
-          opacity: 0;
-          animation-name: slideUp;
-          animation-duration: 0.5s;
-          animation-delay: 0.2s;
-          animation-fill-mode: forwards;
-        }
+      &-return-home {
+        display: block;
+        float: left;
+        width: 110px;
+        height: 36px;
+        font-size: 14px;
+        line-height: 36px;
+        color: #fff;
+        text-align: center;
+        cursor: pointer;
+        background: @vab-color-blue;
+        border-radius: 100px;
+        opacity: 0;
+        animation-name: slideUp;
+        animation-duration: 0.5s;
+        animation-delay: 0.3s;
+        animation-fill-mode: forwards;
+      }
 
-        &-return-home {
-          display: block;
-          float: left;
-          width: 110px;
-          height: 36px;
-          font-size: 14px;
-          line-height: 36px;
-          color: #fff;
-          text-align: center;
-          cursor: pointer;
-          background: @vab-color-blue;
-          border-radius: 100px;
+      @keyframes slideUp {
+        0% {
           opacity: 0;
-          animation-name: slideUp;
-          animation-duration: 0.5s;
-          animation-delay: 0.3s;
-          animation-fill-mode: forwards;
+          transform: translateY(60px);
         }
 
-        @keyframes slideUp {
-          0% {
-            opacity: 0;
-            transform: translateY(60px);
-          }
-
-          100% {
-            opacity: 1;
-            transform: translateY(0);
-          }
+        100% {
+          opacity: 1;
+          transform: translateY(0);
         }
       }
     }
   }
+}
 </style>

+ 154 - 153
src/views/404.vue

@@ -28,184 +28,185 @@
 </template>
 
 <script>
-  import { mapActions } from 'vuex'
-
-  export default {
-    name: 'Page404',
-    data() {
-      return {
-        jumpTime: 5,
-        oops: '抱歉!',
-        headline: '当前页面不存在...',
-        info: '请检查您输入的网址是否正确,或点击下面的按钮返回首页。',
-        btn: '返回首页',
-        timer: 0,
-      }
-    },
-    mounted() {
-      this.timeChange()
-    },
-    beforeUnmount() {
-      clearInterval(this.timer)
-    },
-    methods: {
-      ...mapActions({
-        delOthersVisitedRoutes: 'tagsBar/delOthersVisitedRoutes',
-      }),
-      timeChange() {
-        this.timer = setInterval(() => {
-          if (this.jumpTime) {
-            this.jumpTime--
-          } else {
-            this.$router.push({ path: '/' })
-            this.delOthersVisitedRoutes({ path: '/' })
-            clearInterval(this.timer)
-          }
-        }, 1000)
-      },
+import { mapActions, createStore } from 'vuex'
+
+export default {
+  name: 'Page404',
+  data() {
+    return {
+      jumpTime: 5,
+      oops: '抱歉!',
+      headline: '当前页面不存在...',
+      info: '请检查您输入的网址是否正确,或点击下面的按钮返回首页。',
+      btn: '返回首页',
+      timer: 0,
+    }
+  },
+  mounted() {
+    this.timeChange()
+  },
+  beforeUnmount() {
+    clearInterval(this.timer)
+  },
+  methods: {
+    ...mapActions({
+      delOthersVisitedRoutes: 'tagsBar/delOthersVisitedRoutes',
+    }),
+    timeChange() {
+      const store = createStore()
+      this.timer = setInterval(() => {
+        if (this.jumpTime) {
+          this.jumpTime--
+        } else {
+          this.$router.push({ path: store.state.middleListp[0].path })
+          this.delOthersVisitedRoutes({ path: store.state.middleListp[0].path })
+          clearInterval(this.timer)
+        }
+      }, 1000)
     },
-  }
+  },
+}
 </script>
 
 <style lang="less" scoped>
-  .error-container {
-    position: relative;
-    height: 100vh;
-
-    .error-content {
-      position: absolute;
-      top: 55%;
-      left: 50%;
-      width: 40vw;
-      height: 400px;
-      transform: translate(-50%, -50%);
-
-      .pic-error {
-        position: relative;
-        float: left;
+.error-container {
+  position: relative;
+  height: 100vh;
+
+  .error-content {
+    position: absolute;
+    top: 55%;
+    left: 50%;
+    width: 40vw;
+    height: 400px;
+    transform: translate(-50%, -50%);
+
+    .pic-error {
+      position: relative;
+      float: left;
+      width: 100%;
+      overflow: hidden;
+
+      &-parent {
         width: 100%;
-        overflow: hidden;
+      }
 
-        &-parent {
-          width: 100%;
-        }
+      &-child {
+        position: absolute;
 
-        &-child {
-          position: absolute;
+        &.left {
+          top: 17px;
+          left: 220px;
+          width: 80px;
+          opacity: 0;
+          animation-name: cloudLeft;
+          animation-duration: 2s;
+          animation-timing-function: linear;
+          animation-delay: 1s;
+          animation-fill-mode: forwards;
+        }
 
-          &.left {
+        @keyframes cloudLeft {
+          0% {
             top: 17px;
             left: 220px;
-            width: 80px;
             opacity: 0;
-            animation-name: cloudLeft;
-            animation-duration: 2s;
-            animation-timing-function: linear;
-            animation-delay: 1s;
-            animation-fill-mode: forwards;
           }
 
-          @keyframes cloudLeft {
-            0% {
-              top: 17px;
-              left: 220px;
-              opacity: 0;
-            }
-
-            20% {
-              top: 33px;
-              left: 188px;
-              opacity: 1;
-            }
-
-            80% {
-              top: 81px;
-              left: 92px;
-              opacity: 1;
-            }
-
-            100% {
-              top: 97px;
-              left: 60px;
-              opacity: 0;
-            }
+          20% {
+            top: 33px;
+            left: 188px;
+            opacity: 1;
+          }
+
+          80% {
+            top: 81px;
+            left: 92px;
+            opacity: 1;
+          }
+
+          100% {
+            top: 97px;
+            left: 60px;
+            opacity: 0;
           }
         }
       }
+    }
+
+    .bullshit {
+      position: relative;
+      float: left;
+      width: 300px;
+      padding: 30px 0;
+      overflow: hidden;
+
+      &-oops {
+        margin-bottom: @vab-margin;
+        font-size: 32px;
+        font-weight: bold;
+        line-height: 40px;
+        opacity: 0;
+        animation-name: slideUp;
+        animation-duration: 0.5s;
+        animation-fill-mode: forwards;
+      }
 
-      .bullshit {
-        position: relative;
-        float: left;
-        width: 300px;
-        padding: 30px 0;
-        overflow: hidden;
-
-        &-oops {
-          margin-bottom: @vab-margin;
-          font-size: 32px;
-          font-weight: bold;
-          line-height: 40px;
-          opacity: 0;
-          animation-name: slideUp;
-          animation-duration: 0.5s;
-          animation-fill-mode: forwards;
-        }
+      &-headline {
+        margin-bottom: 10px;
+        font-size: 20px;
+        font-weight: bold;
+        line-height: 24px;
+        color: #222;
+        opacity: 0;
+        animation-name: slideUp;
+        animation-duration: 0.5s;
+        animation-delay: 0.1s;
+        animation-fill-mode: forwards;
+      }
 
-        &-headline {
-          margin-bottom: 10px;
-          font-size: 20px;
-          font-weight: bold;
-          line-height: 24px;
-          color: #222;
-          opacity: 0;
-          animation-name: slideUp;
-          animation-duration: 0.5s;
-          animation-delay: 0.1s;
-          animation-fill-mode: forwards;
-        }
+      &-info {
+        margin-bottom: 30px;
+        font-size: 13px;
+        line-height: 21px;
+        opacity: 0;
+        animation-name: slideUp;
+        animation-duration: 0.5s;
+        animation-delay: 0.2s;
+        animation-fill-mode: forwards;
+      }
 
-        &-info {
-          margin-bottom: 30px;
-          font-size: 13px;
-          line-height: 21px;
-          opacity: 0;
-          animation-name: slideUp;
-          animation-duration: 0.5s;
-          animation-delay: 0.2s;
-          animation-fill-mode: forwards;
-        }
+      &-return-home {
+        display: block;
+        float: left;
+        width: 110px;
+        height: 36px;
+        font-size: 14px;
+        line-height: 36px;
+        color: #fff;
+        text-align: center;
+        cursor: pointer;
+        background: @vab-color-blue;
+        border-radius: 100px;
+        opacity: 0;
+        animation-name: slideUp;
+        animation-duration: 0.5s;
+        animation-delay: 0.3s;
+        animation-fill-mode: forwards;
+      }
 
-        &-return-home {
-          display: block;
-          float: left;
-          width: 110px;
-          height: 36px;
-          font-size: 14px;
-          line-height: 36px;
-          color: #fff;
-          text-align: center;
-          cursor: pointer;
-          background: @vab-color-blue;
-          border-radius: 100px;
+      @keyframes slideUp {
+        0% {
           opacity: 0;
-          animation-name: slideUp;
-          animation-duration: 0.5s;
-          animation-delay: 0.3s;
-          animation-fill-mode: forwards;
+          transform: translateY(60px);
         }
 
-        @keyframes slideUp {
-          0% {
-            opacity: 0;
-            transform: translateY(60px);
-          }
-
-          100% {
-            opacity: 1;
-            transform: translateY(0);
-          }
+        100% {
+          opacity: 1;
+          transform: translateY(0);
         }
       }
     }
   }
+}
 </style>

+ 3 - 3
src/views/dataManage/chainAnalysis/ehcarts/index.vue

@@ -220,16 +220,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   // margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/dataManage/demandAnalysis/ehcarts/index.vue

@@ -161,16 +161,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   // margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/dataManage/energyReport/ehcarts/index.vue

@@ -172,16 +172,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   // margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/dataManage/sameAnalysis/ehcarts/index.vue

@@ -294,16 +294,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   // margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 9 - 4
src/views/index/components/VersionInformation.vue

@@ -164,7 +164,7 @@ import Atabls from './componentModel/Atabls.vue'
 import * as api from '@/api/index/index.js'
 
 import { useStore } from 'vuex'
-import { defineComponent, ref, onMounted } from 'vue'
+import { defineComponent, ref, onMounted, watchEffect } from 'vue'
 import { onBeforeRouteLeave } from 'vue-router'
 
 export default defineComponent({
@@ -319,7 +319,7 @@ export default defineComponent({
     }
 
     onBeforeRouteLeave((to, from, next) => {
-      //离开当前的组件,触发 
+      //离开当前的组件,触发
       console.log(to, from)
       if (updateModelBool.value == true) {
         var bool = confirm('系统不会保存您所做的更改,确定离开吗?')
@@ -334,8 +334,13 @@ export default defineComponent({
       }
     })
 
-    onMounted(() => {
-      modelSelect()
+    onMounted(() => {})
+
+    watchEffect((fn, options) => {
+      fn, options
+      if (store.state.siteId) {
+        modelSelect()
+      }
     })
 
     return {

+ 1 - 1
src/views/login/index.vue

@@ -189,7 +189,7 @@ export default {
     }),
     handleRoute() {
       return this.redirect === '/404' || this.redirect === '/403'
-        ? '/'
+        ? '/index'
         : this.redirect
     },
     onSuccess() {

+ 3 - 3
src/views/operManage/operStatistics/components/pieChart.vue

@@ -134,16 +134,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/perCenter/index.vue

@@ -372,13 +372,13 @@ export default defineComponent({
   // width: 480px;
 }
 
-::v-deep .el-card__body {
+:deep .el-card__body {
   padding: 15px;
 }
-::v-deep .el-card__header {
+:deep .el-card__header {
   padding: 14px 15px 7px !important;
 }
-::v-deep .item {
+:deep .item {
   padding: 11px 0;
   border-bottom: 1px solid #e7eaec;
   margin: 0;

+ 2 - 1
src/views/platManage/index.vue

@@ -83,8 +83,9 @@
 
     <!-- 分页start -->
     <div class="paginationBlock">
+      <!--         -->
       <el-pagination
-        v-model:currentPage="page"
+        v-model:currentPage="currentPage"
         :page-sizes="[15, 20, 25, 30]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"

+ 3 - 3
src/views/powerQuality/asseReport/scoreReportComponent/innerLineChart.vue

@@ -173,16 +173,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/powerQuality/asseReport/scoreReportComponent/innerLineChart2.vue

@@ -173,16 +173,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/powerQuality/asseReport/scoreReportComponent/pieChart.vue

@@ -155,16 +155,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/powerQuality/asseReport/scoreReportComponent/radarChart.vue

@@ -153,16 +153,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/powerQuality/harmonicReport/curveCom.vue

@@ -164,16 +164,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/powerQuality/harmonicReport/curveComA.vue

@@ -172,16 +172,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/powerQuality/harmonicReport/curveComB.vue

@@ -172,16 +172,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/powerQuality/harmonicReport/curveComC.vue

@@ -172,16 +172,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/powerQuality/realTimeMonitoring/loopMonitorComponent/loopRadarChart.vue

@@ -161,16 +161,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/powerQuality/realTimeMonitoring/loopMonitorComponent/loopRadarChart2.vue

@@ -162,16 +162,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/powerQuality/realTimeMonitoring/realScoreComponent/innerLineChart.vue

@@ -173,16 +173,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/powerQuality/realTimeMonitoring/realScoreComponent/innerLineChart2.vue

@@ -173,16 +173,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/powerQuality/realTimeMonitoring/realScoreComponent/pieChart.vue

@@ -152,16 +152,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/powerQuality/realTimeMonitoring/realScoreComponent/radarChart.vue

@@ -149,16 +149,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/powerQuality/unbalanceAnalysis/electricChart.vue

@@ -177,16 +177,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/powerQuality/unbalanceAnalysis/electricChart2.vue

@@ -183,16 +183,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/powerQuality/unbalanceAnalysis/voltageChart.vue

@@ -171,16 +171,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 3 - 3
src/views/powerQuality/unbalanceAnalysis/voltageChart2.vue

@@ -183,16 +183,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 .homeBoxCard {
   margin-bottom: 24px;
-  ::v-deep(.el-card__header) {
+  :deep(.el-card__header) {
     padding-left: 12px;
     padding-right: 12px;
   }
-  ::v-deep(.el-card__body) {
+  :deep(.el-card__body) {
     padding: 12px;
     font-size: 14px;
     line-height: 1.5715;
   }
-  ::v-deep(.el-divider) {
+  :deep(.el-divider) {
     margin: 8px 0;
   }
   .num {

+ 1 - 1
src/views/statisManage/loginLog/index.vue

@@ -163,7 +163,7 @@
     <!-- 分页start -->
     <div class="paginationBlock">
       <el-pagination
-        v-model:currentPage="page"
+        v-model:currentPage="currentPage"
         :page-sizes="[15, 20, 25, 30]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"

+ 1 - 1
src/views/statisManage/operLog/index.vue

@@ -213,7 +213,7 @@
     <!-- 分页start -->
     <div class="paginationBlock">
       <el-pagination
-        v-model:currentPage="page"
+        v-model:currentPage="currentPage"
         :page-sizes="[15, 20, 25, 30]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"

+ 1 - 1
src/views/tenantManage/adminConfig/component/checkAdminList.vue

@@ -67,7 +67,7 @@
     <!-- 分页start -->
     <div class="paginationBlock1" style="margin-top:30px">
       <el-pagination
-        v-model:currentPage="page"
+        v-model:currentPage="currentPage"
         :page-sizes="[5,10,15, 20]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"

+ 2 - 2
src/views/tenantManage/adminConfig/index.vue

@@ -101,7 +101,7 @@
     <!-- 分页start -->
     <div class="paginationBlock">
       <el-pagination
-        v-model:currentPage="page"
+        v-model:currentPage="currentPage"
         :page-sizes="[15, 20, 25, 30]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
@@ -215,7 +215,7 @@ export default defineComponent({
     const adminConfig = (row) => {
       tableItem.value = {
         tenantId: row.id,
-        status:0
+        status: 0,
       }
       DialogArray.value = row
       dialogTitle.value = '配置管理员'

+ 1 - 1
src/views/tenantManage/authConfig/dialogComponent.vue

@@ -601,7 +601,7 @@ export default defineComponent({
 }
 
 // .aa {
-//   ::v-deep .el-form-item--small .el-form-item__label {
+//   :deep .el-form-item--small .el-form-item__label {
 //     line-height: 15px !important;
 //   }
 // }

+ 1 - 1
src/views/tenantManage/authConfig/index.vue

@@ -185,7 +185,7 @@
     <!-- 分页start -->
     <div class="paginationBlock">
       <el-pagination
-        v-model:currentPage="page"
+        v-model:currentPage="currentPage"
         :page-sizes="[15, 20, 25, 30]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"

+ 3 - 3
src/views/tenantManage/systemConfig/dialogComponent.vue

@@ -747,11 +747,11 @@ export default defineComponent({
 .el-card.is-always-shadow {
   box-shadow: none;
 }
-::v-deep .el-card__body {
+:deep .el-card__body {
   padding: 0 !important;
 }
 
-::v-deep .el-tabs__header {
+:deep .el-tabs__header {
   margin-bottom: 30px;
 }
 .el-input,
@@ -779,7 +779,7 @@ export default defineComponent({
   margin-left: 10px;
   display: inline-block;
 }
-::v-deep .el-upload-list__item {
+:deep .el-upload-list__item {
   width: 100px !important;
 }
 

+ 1 - 1
src/views/tenantManage/systemConfig/index.vue

@@ -108,7 +108,7 @@
     <!-- 分页start -->
     <div class="paginationBlock">
       <el-pagination
-        v-model:currentPage="page"
+        v-model:currentPage="currentPage"
         :page-sizes="[15, 20, 25, 30]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"

+ 1 - 1
src/views/tenantManage/tenantUnit/index.vue

@@ -195,7 +195,7 @@
     <!-- 分页start -->
     <div class="paginationBlock">
       <el-pagination
-        v-model:currentPage="page"
+        v-model:currentPage="currentPage"
         :page-sizes="[15, 20, 25, 30]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"

+ 16 - 2
vue.config.js

@@ -44,6 +44,9 @@ const resolve = (dir) => {
 //     }
 // }
 
+
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
+
 module.exports = {
     publicPath,
     assetsDir,
@@ -84,9 +87,7 @@ module.exports = {
         // after: mockServer(),
     },
     configureWebpack() {
-
         return {
-
             externals: {
                 AMap: "AMap"
             },
@@ -108,6 +109,19 @@ module.exports = {
                 new WebpackBar({
                     name: webpackBarName,
                 }),
+                // new UglifyJsPlugin({
+                //     uglifyOptions: {
+                //         output: {
+                //             comments: false, // 去掉注释
+                //         },
+                //         warnings: false,
+                //         compress: {
+                //             drop_console: true,
+                //             drop_debugger: false,
+                //             pure_funcs: ['console.log']//移除console
+                //         }
+                //     }
+                // })
             ],
         }
     },