Ver Fonte

配置文件修改

fanghuisheng há 2 semanas atrás
pai
commit
199c803fa3
51 ficheiros alterados com 28 adições e 56 exclusões
  1. 0 3
      .browserslistrc
  2. 4 3
      .gitignore
  3. 0 11
      sh.exe.stackdump
  4. 0 0
      src/assets/icons/index.js
  5. 0 0
      src/assets/icons/svgIcon/alarmManage.svg
  6. 0 0
      src/assets/icons/svgIcon/anticon-dingwei.svg
  7. 0 0
      src/assets/icons/svgIcon/anticon_user.svg
  8. 0 0
      src/assets/icons/svgIcon/arrow-down.svg
  9. 0 0
      src/assets/icons/svgIcon/arrow-left.svg
  10. 0 0
      src/assets/icons/svgIcon/arrow-left2.svg
  11. 0 0
      src/assets/icons/svgIcon/arrow-right.svg
  12. 0 0
      src/assets/icons/svgIcon/arrow-right2.svg
  13. 0 0
      src/assets/icons/svgIcon/chart.svg
  14. 0 0
      src/assets/icons/svgIcon/close.svg
  15. 0 0
      src/assets/icons/svgIcon/close2.svg
  16. 0 0
      src/assets/icons/svgIcon/components.svg
  17. 0 0
      src/assets/icons/svgIcon/control.svg
  18. 0 0
      src/assets/icons/svgIcon/dataManage.svg
  19. 0 0
      src/assets/icons/svgIcon/detail.svg
  20. 0 0
      src/assets/icons/svgIcon/detailBtn1.svg
  21. 0 0
      src/assets/icons/svgIcon/detailBtn2.svg
  22. 0 0
      src/assets/icons/svgIcon/deviceManage.svg
  23. 0 0
      src/assets/icons/svgIcon/edit.svg
  24. 0 0
      src/assets/icons/svgIcon/editor.svg
  25. 0 0
      src/assets/icons/svgIcon/home.svg
  26. 0 0
      src/assets/icons/svgIcon/icon.svg
  27. 0 0
      src/assets/icons/svgIcon/language-outline.svg
  28. 0 0
      src/assets/icons/svgIcon/line.svg
  29. 0 0
      src/assets/icons/svgIcon/list.svg
  30. 0 0
      src/assets/icons/svgIcon/modification.svg
  31. 0 0
      src/assets/icons/svgIcon/monthReport.svg
  32. 0 0
      src/assets/icons/svgIcon/more.svg
  33. 0 0
      src/assets/icons/svgIcon/operManage.svg
  34. 0 0
      src/assets/icons/svgIcon/page.svg
  35. 0 0
      src/assets/icons/svgIcon/patrolManage.svg
  36. 0 0
      src/assets/icons/svgIcon/permissions.svg
  37. 0 0
      src/assets/icons/svgIcon/planOutage.svg
  38. 0 0
      src/assets/icons/svgIcon/powerQuality.svg
  39. 0 0
      src/assets/icons/svgIcon/refresh.svg
  40. 0 0
      src/assets/icons/svgIcon/set.svg
  41. 0 0
      src/assets/icons/svgIcon/siteManage.svg
  42. 0 0
      src/assets/icons/svgIcon/stationManage.svg
  43. 0 0
      src/assets/icons/svgIcon/stationName.svg
  44. 0 0
      src/assets/icons/svgIcon/systemManage.svg
  45. 0 0
      src/assets/icons/svgIcon/transformer.svg
  46. BIN
      src/assets/logo1.png
  47. BIN
      src/assets/logo_admin1.png
  48. 1 1
      src/config/default/setting.config.js
  49. 4 4
      src/main.js
  50. 9 19
      src/utils/request.js
  51. 10 15
      vue.config.js

+ 0 - 3
.browserslistrc

@@ -1,3 +0,0 @@
-> 1%
-last 2 versions
-not dead

+ 4 - 3
.gitignore

@@ -3,7 +3,8 @@ node_modules
 dist
 .history
 package-lock.json
-*.zip
+sh.exe.stackdump
+.browserslistrc
 
 # local env files
 .env.local
@@ -23,5 +24,5 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
-
-
+*.zip
+*.sh

+ 0 - 11
sh.exe.stackdump

@@ -1,11 +0,0 @@
-Stack trace:
-Frame        Function    Args
-000FFFFB540  00180064365 (00180275F10, 00180266FD1, 000FFFFCA60, 000FFFFBA20)
-000FFFFBA70  001800499D2 (00100002000, 0018034EB80, 00000000001, 00000000128)
-000FFFFCA80  00180049A11 (00000000001, 0018034EE90, 000FFFFCA60, 00000000008)
-000FFFFCB10  0018005CFCD (00000000000, 000FFFFCC40, 001800DC3EF, 00000000000)
-000FFFFCBF0  0018005D12B (000FFFFCDF0, 00000000000, FFFFFFFFFFFFFFD7, 00000000000)
-000FFFFCCE0  0018004A1A8 (00000000000, 00000000000, 00000000000, 00000000000)
-000FFFFCDA0  00180048A2A (00000000000, 00000000000, 00000000000, 00000000000)
-000FFFFCE50  00180048AEC (00000000000, 00000000000, 00000000000, 00000000000)
-End of stack trace

+ 0 - 0
src/icons/index.js → src/assets/icons/index.js


+ 0 - 0
src/icons/svgIcon/alarmManage.svg → src/assets/icons/svgIcon/alarmManage.svg


+ 0 - 0
src/icons/svgIcon/anticon-dingwei.svg → src/assets/icons/svgIcon/anticon-dingwei.svg


+ 0 - 0
src/icons/svgIcon/anticon_user.svg → src/assets/icons/svgIcon/anticon_user.svg


+ 0 - 0
src/icons/svgIcon/arrow-down.svg → src/assets/icons/svgIcon/arrow-down.svg


+ 0 - 0
src/icons/svgIcon/arrow-left.svg → src/assets/icons/svgIcon/arrow-left.svg


+ 0 - 0
src/icons/svgIcon/arrow-left2.svg → src/assets/icons/svgIcon/arrow-left2.svg


+ 0 - 0
src/icons/svgIcon/arrow-right.svg → src/assets/icons/svgIcon/arrow-right.svg


+ 0 - 0
src/icons/svgIcon/arrow-right2.svg → src/assets/icons/svgIcon/arrow-right2.svg


+ 0 - 0
src/icons/svgIcon/chart.svg → src/assets/icons/svgIcon/chart.svg


+ 0 - 0
src/icons/svgIcon/close.svg → src/assets/icons/svgIcon/close.svg


+ 0 - 0
src/icons/svgIcon/close2.svg → src/assets/icons/svgIcon/close2.svg


+ 0 - 0
src/icons/svgIcon/components.svg → src/assets/icons/svgIcon/components.svg


+ 0 - 0
src/icons/svgIcon/control.svg → src/assets/icons/svgIcon/control.svg


+ 0 - 0
src/icons/svgIcon/dataManage.svg → src/assets/icons/svgIcon/dataManage.svg


+ 0 - 0
src/icons/svgIcon/detail.svg → src/assets/icons/svgIcon/detail.svg


+ 0 - 0
src/icons/svgIcon/detailBtn1.svg → src/assets/icons/svgIcon/detailBtn1.svg


+ 0 - 0
src/icons/svgIcon/detailBtn2.svg → src/assets/icons/svgIcon/detailBtn2.svg


+ 0 - 0
src/icons/svgIcon/deviceManage.svg → src/assets/icons/svgIcon/deviceManage.svg


+ 0 - 0
src/icons/svgIcon/edit.svg → src/assets/icons/svgIcon/edit.svg


+ 0 - 0
src/icons/svgIcon/editor.svg → src/assets/icons/svgIcon/editor.svg


+ 0 - 0
src/icons/svgIcon/home.svg → src/assets/icons/svgIcon/home.svg


+ 0 - 0
src/icons/svgIcon/icon.svg → src/assets/icons/svgIcon/icon.svg


+ 0 - 0
src/icons/svgIcon/language-outline.svg → src/assets/icons/svgIcon/language-outline.svg


+ 0 - 0
src/icons/svgIcon/line.svg → src/assets/icons/svgIcon/line.svg


+ 0 - 0
src/icons/svgIcon/list.svg → src/assets/icons/svgIcon/list.svg


+ 0 - 0
src/icons/svgIcon/modification.svg → src/assets/icons/svgIcon/modification.svg


+ 0 - 0
src/icons/svgIcon/monthReport.svg → src/assets/icons/svgIcon/monthReport.svg


+ 0 - 0
src/icons/svgIcon/more.svg → src/assets/icons/svgIcon/more.svg


+ 0 - 0
src/icons/svgIcon/operManage.svg → src/assets/icons/svgIcon/operManage.svg


+ 0 - 0
src/icons/svgIcon/page.svg → src/assets/icons/svgIcon/page.svg


+ 0 - 0
src/icons/svgIcon/patrolManage.svg → src/assets/icons/svgIcon/patrolManage.svg


+ 0 - 0
src/icons/svgIcon/permissions.svg → src/assets/icons/svgIcon/permissions.svg


+ 0 - 0
src/icons/svgIcon/planOutage.svg → src/assets/icons/svgIcon/planOutage.svg


+ 0 - 0
src/icons/svgIcon/powerQuality.svg → src/assets/icons/svgIcon/powerQuality.svg


+ 0 - 0
src/icons/svgIcon/refresh.svg → src/assets/icons/svgIcon/refresh.svg


+ 0 - 0
src/icons/svgIcon/set.svg → src/assets/icons/svgIcon/set.svg


+ 0 - 0
src/icons/svgIcon/siteManage.svg → src/assets/icons/svgIcon/siteManage.svg


+ 0 - 0
src/icons/svgIcon/stationManage.svg → src/assets/icons/svgIcon/stationManage.svg


+ 0 - 0
src/icons/svgIcon/stationName.svg → src/assets/icons/svgIcon/stationName.svg


+ 0 - 0
src/icons/svgIcon/systemManage.svg → src/assets/icons/svgIcon/systemManage.svg


+ 0 - 0
src/icons/svgIcon/transformer.svg → src/assets/icons/svgIcon/transformer.svg


BIN
src/assets/logo1.png


BIN
src/assets/logo_admin1.png


+ 1 - 1
src/config/default/setting.config.js

@@ -28,7 +28,7 @@ const setting = {
     //版本号
     version: process.env.VUE_APP_VERSION,
     //pro版本copyright可随意修改
-    copyright: '1813914505@qq.com',
+    copyright: '',
     //缓存路由的最大数量
     keepAliveMaxNum: 99,
     //路由模式,可选值为 history 或 hash

+ 4 - 4
src/main.js

@@ -16,7 +16,7 @@ import '@/assets/css/index.scss'
 import '@/assets/css/global.scss'
 import * as echarts from 'echarts';
 
-import '@/icons'
+import '@/assets/icons'
 import SvgIcon from "@/components/SvgIcon"
 
 import 'video.js/dist/video-js.css'
@@ -49,10 +49,10 @@ app
 
 
 router.beforeEach((to) => {
-    console.log(to.meta.title)
+    // console.log(to.meta.title)
     store.commit('getAuthorities', to.meta.title)
-    console.log('store.state.authorities')
-    console.log(store.state.authorities)
+    // console.log('store.state.authorities')
+    // console.log(store.state.authorities)
 
     if (to.path != '/login') {
         store.commit("publicSiteList");

+ 9 - 19
src/utils/request.js

@@ -1,15 +1,8 @@
 import axios from 'axios'
-import {
-    // baseURL,
-    contentType,
-    debounce,
-    requestTimeout,
-    successCode,
-    tokenName,
-} from '@/config'
 import store from '@/store'
 import qs from 'qs'
 import router from '@/router'
+import { contentType, debounce, requestTimeout, successCode, tokenName, } from '@/config'
 import { isArray } from '@/utils/validate'
 import { message } from 'ant-design-vue'
 
@@ -17,10 +10,12 @@ import { message } from 'ant-design-vue'
 
 let loadingInstance
 
+console.log(loadingInstance)
+console.log(loadingInstance.close())
+
 var tag = true
 
 /**
- * @author chuzhixin 1204505056@qq.com
  * @description 处理code异常
  * @param {*} code
  * @param {*} msg
@@ -33,14 +28,12 @@ const handleCode = (code, msg) => {
                 message.error('登录状态已过期,请重新登陆!')
                 tag = false
             }
-            store.dispatch('user/resetAll').catch(() => {})
-            store.dispatch('user/logout').catch(() => {})
+            store.dispatch('user/resetAll').catch(() => { })
+            store.dispatch('user/logout').catch(() => { })
             router.replace({ path: "/login" });
-
-
             break
         case '403':
-            router.push({ path: '/401' }).catch(() => {})
+            router.push({ path: '/401' }).catch(() => { })
             break
         default:
             message.error(msg || `后端接口${code}异常`)
@@ -49,11 +42,10 @@ const handleCode = (code, msg) => {
 }
 
 /**
- * @author chuzhixin 1204505056@qq.com
  * @description axios初始化
  */
 const baseURL = window.PLATFROM_CONFIG.baseUrl
-    // console.log(baseURL)
+// console.log(baseURL)
 const instance = axios.create({
     baseURL,
     timeout: requestTimeout,
@@ -63,7 +55,6 @@ const instance = axios.create({
 })
 
 /**
- * @author chuzhixin 1204505056@qq.com
  * @description axios请求拦截器
  */
 instance.interceptors.request.use(
@@ -87,7 +78,6 @@ instance.interceptors.request.use(
 )
 
 /**
- * @author chuzhixin 1204505056@qq.com
  * @description axios响应拦截器
  */
 instance.interceptors.response.use(
@@ -97,7 +87,7 @@ instance.interceptors.response.use(
         const { code, msg } = data
         // 操作正常Code数组
         const codeVerificationArray = isArray(successCode) ? [...successCode] : [...[successCode]]
-            // 是否操作正常
+        // 是否操作正常
         if (codeVerificationArray.includes(parseInt(code))) {
             return data
         } else {

+ 10 - 15
vue.config.js

@@ -1,5 +1,4 @@
 /**
- * @author chuzhixin 1204505056@qq.com
  * @description vue.config.js全局配置
  */
 const path = require('path')
@@ -50,16 +49,6 @@ module.exports = {
     outputDir,
     lintOnSave,
     transpileDependencies,
-    css: {
-        loaderOptions: {
-            sass: {
-                data: `
-        @import "@/assets/css/index.scss";
-        @import "@/assets/css/global.scss";
-        `
-            }
-        }
-    },
     devServer: {
         hot: true,
         port: devPort,
@@ -118,12 +107,12 @@ module.exports = {
         config.resolve.symlinks(true)
         config.module
             .rule('svg')
-            .exclude.add(resolve('src/icons'))
+            .exclude.add(resolve('src/assets/icons'))
             .end()
         config.module
             .rule('icons')
             .test(/\.svg$/)
-            .include.add(resolve('src/icons'))
+            .include.add(resolve('src/assets/icons'))
             .end()
             .use('svg-sprite-loader')
             .loader('svg-sprite-loader')
@@ -174,9 +163,9 @@ module.exports = {
                             archive: [{
                                 source: `./${outputDir}`,
                                 destination: `./${outputDir}/${abbreviation}_${outputDir}_${date}.7z`,
-                            }, ],
+                            },],
                         },
-                    }, ])
+                    },])
                     .end()
             })
         }
@@ -200,6 +189,12 @@ module.exports = {
                     },
                 },
             },
+            sass: {
+                data: `
+                    @import "@/assets/css/index.scss";
+                    @import "@/assets/css/global.scss";
+                    `
+            }
         },
     },
 }