打包配置优化

config/index.js

@@ -2,9 +2,7 @@
 
 const path = require('path')
 
-var proxyUrl = 
+var proxyUrl = (module.exports = {
-
-module.exports = {
   dev: {
     // Paths
     assetsSubDirectory: 'static',
@@ -21,26 +19,26 @@ module.exports = {
     proxyTable: {
       '/screen': {
         // target: 'http://112.29.103.165:21626',//重庆
-          target: 'http://192.168.0.14:21624',//测试
+        target: 'http://192.168.0.14:21624', //测试
         // target: 'http://10.40.92.74:8080',
         changeOrigin: true,
         // secure: true, //如果是https接口，需要配置这个参数
         pathRewrite: {
-          '^/screen': '/'
+          '^/screen': '/',
-          }
+        },
+      },
     },
-    }
   },
   build: {
     index: path.resolve(__dirname, '../dist/index01.html'),
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static01',
-    assetsPublicPath: '/',
+    assetsPublicPath: '/screen/',
     productionSourceMap: false,
     devtool: '#source-map',
     productionGzip: false,
     productionGzipExtensions: ['js', 'css'],
-    bundleAnalyzerReport: process.env.npm_config_report
+    bundleAnalyzerReport: process.env.npm_config_report,
-  }
+  },
-}
+})

package-lock.json

@@ -119,6 +119,27 @@
           "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
           "dev": true
         },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://repo.huaweicloud.com/repository/npm/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://repo.huaweicloud.com/repository/npm/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://repo.huaweicloud.com/repository/npm/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
         "string-width": {
           "version": "5.1.2",
           "resolved": "https://registry.npmmirror.com/string-width/-/string-width-5.1.2.tgz",
@@ -130,6 +151,40 @@
             "strip-ansi": "^7.0.1"
           }
         },
+        "string-width-cjs": {
+          "version": "npm:string-width@4.2.3",
+          "resolved": "https://repo.huaweicloud.com/repository/npm/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.1"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "5.0.1",
+              "resolved": "https://repo.huaweicloud.com/repository/npm/ansi-regex/-/ansi-regex-5.0.1.tgz",
+              "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+              "dev": true
+            },
+            "emoji-regex": {
+              "version": "8.0.0",
+              "resolved": "https://repo.huaweicloud.com/repository/npm/emoji-regex/-/emoji-regex-8.0.0.tgz",
+              "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "6.0.1",
+              "resolved": "https://repo.huaweicloud.com/repository/npm/strip-ansi/-/strip-ansi-6.0.1.tgz",
+              "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^5.0.1"
+              }
+            }
+          }
+        },
         "strip-ansi": {
           "version": "7.1.0",
           "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-7.1.0.tgz",
@@ -139,6 +194,23 @@
             "ansi-regex": "^6.0.1"
           }
         },
+        "strip-ansi-cjs": {
+          "version": "npm:strip-ansi@6.0.1",
+          "resolved": "https://repo.huaweicloud.com/repository/npm/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "5.0.1",
+              "resolved": "https://repo.huaweicloud.com/repository/npm/ansi-regex/-/ansi-regex-5.0.1.tgz",
+              "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+              "dev": true
+            }
+          }
+        },
         "wrap-ansi": {
           "version": "8.1.0",
           "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
@@ -149,6 +221,60 @@
             "string-width": "^5.0.1",
             "strip-ansi": "^7.0.1"
           }
+        },
+        "wrap-ansi-cjs": {
+          "version": "npm:wrap-ansi@7.0.0",
+          "resolved": "https://repo.huaweicloud.com/repository/npm/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "5.0.1",
+              "resolved": "https://repo.huaweicloud.com/repository/npm/ansi-regex/-/ansi-regex-5.0.1.tgz",
+              "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+              "dev": true
+            },
+            "ansi-styles": {
+              "version": "4.3.0",
+              "resolved": "https://repo.huaweicloud.com/repository/npm/ansi-styles/-/ansi-styles-4.3.0.tgz",
+              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+              "dev": true,
+              "requires": {
+                "color-convert": "^2.0.1"
+              }
+            },
+            "emoji-regex": {
+              "version": "8.0.0",
+              "resolved": "https://repo.huaweicloud.com/repository/npm/emoji-regex/-/emoji-regex-8.0.0.tgz",
+              "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+              "dev": true
+            },
+            "string-width": {
+              "version": "4.2.3",
+              "resolved": "https://repo.huaweicloud.com/repository/npm/string-width/-/string-width-4.2.3.tgz",
+              "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+              "dev": true,
+              "requires": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+              }
+            },
+            "strip-ansi": {
+              "version": "6.0.1",
+              "resolved": "https://repo.huaweicloud.com/repository/npm/strip-ansi/-/strip-ansi-6.0.1.tgz",
+              "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^5.0.1"
+              }
+            }
+          }
         }
       }
     },
@@ -14791,46 +14917,6 @@
         }
       }
     },
-    "string-width-cjs": {
-      "version": "npm:string-width@4.2.3",
-      "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
-          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.1"
-          }
-        }
-      }
-    },
     "string.prototype.trim": {
       "version": "1.2.8",
       "resolved": "https://registry.npmmirror.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
@@ -14887,23 +14973,6 @@
         "ansi-regex": "^2.0.0"
       }
     },
-    "strip-ansi-cjs": {
-      "version": "npm:strip-ansi@6.0.1",
-      "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-          "dev": true
-        }
-      }
-    },
     "strip-bom": {
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/strip-bom/-/strip-bom-2.0.0.tgz",
@@ -17312,81 +17381,6 @@
         }
       }
     },
-    "wrap-ansi-cjs": {
-      "version": "npm:wrap-ansi@7.0.0",
-      "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
-          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.1"
-          }
-        }
-      }
-    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz",

src/api/dialog.js

@@ -1,50 +1,61 @@
 import { POST, GET } from './index.js'
 
-const URL_TYPE_LIST = '/screen/material/returnOfMaterialsInfo/getTypeList'
+const URL_TYPE_LIST = '/material/returnOfMaterialsInfo/getTypeList'
-const URL_DETAILS = '/screen/base/largeScreen/home/getMaterialReqData/details'
+const URL_DETAILS = '/material/base/largeScreen/home/getMaterialReqData/details'
-const URL_RETURN_DETAILS = '/screen/base/largeScreen/home/getMaterialReturnData/details'
+const URL_RETURN_DETAILS =
-const URL_UNIT_LIST = '/screen/material/agreementInfo/getUnitList'
+  '/material/base/largeScreen/home/getMaterialReturnData/details'
-const URL_PROJECT_LIST = '/screen/material/agreementInfo/getProjectList'
+const URL_UNIT_LIST = '/material/agreementInfo/getUnitList'
-const URL_SCRAP_ANALYSIS = '/screen/base/largeScreen/home/getScrapAnalysisByMonth/details'
+const URL_PROJECT_LIST = '/material/agreementInfo/getProjectList'
-const URL_TOTAL_OWNERSHIP = '/screen/base/largeScreen/home/getTotalOwnership/details'
+const URL_SCRAP_ANALYSIS =
-const URL_ACCEPTANCE_STORAGE = '/screen/base/largeScreen/home/getAcceptanceStorage/details'
+  '/material/base/largeScreen/home/getScrapAnalysisByMonth/details'
-const URL_PICKING_ANALYSIS = '/screen/base/largeScreen/home/getPickingAnalysisByMonth/details'
+const URL_TOTAL_OWNERSHIP =
-const URL_MATERIAL_RETURN_BY_MONTH = '/screen/base/largeScreen/home/getMaterialReturnByMonth/details'
+  '/material/base/largeScreen/home/getTotalOwnership/details'
-const URL_MAINTENANCE_BY_CHART = '/screen/base/largeScreen/home/getMaintenanceByMonth/chart'
+const URL_ACCEPTANCE_STORAGE =
-const URL_MAINTENANCE_BY_MONTH_DETAILS = '/screen/base/largeScreen/home/getMaintenanceByMonth/details'
+  '/material/base/largeScreen/home/getAcceptanceStorage/details'
+const URL_PICKING_ANALYSIS =
+  '/material/base/largeScreen/home/getPickingAnalysisByMonth/details'
+const URL_MATERIAL_RETURN_BY_MONTH =
+  '/material/base/largeScreen/home/getMaterialReturnByMonth/details'
+const URL_MAINTENANCE_BY_CHART =
+  '/material/base/largeScreen/home/getMaintenanceByMonth/chart'
+const URL_MAINTENANCE_BY_MONTH_DETAILS =
+  '/material/base/largeScreen/home/getMaintenanceByMonth/details'
 
 // 设备类型
-export const getTypeList = params => GET(URL_TYPE_LIST, params)
+export const getTypeList = (params) => GET(URL_TYPE_LIST, params)
 
 // 领料数据
-export const getDetails = data => POST(URL_DETAILS, data)
+export const getDetails = (data) => POST(URL_DETAILS, data)
 
 // 退料数据
-export const getReturnDetails = data => POST(URL_RETURN_DETAILS, data)
+export const getReturnDetails = (data) => POST(URL_RETURN_DETAILS, data)
 
 // 往来单位-下拉
-export const getUnitList = params => GET(URL_UNIT_LIST, params)
+export const getUnitList = (params) => GET(URL_UNIT_LIST, params)
 
 // 工程名称-下拉
-export const getProjectList = params => GET(URL_PROJECT_LIST, params)
+export const getProjectList = (params) => GET(URL_PROJECT_LIST, params)
 
 // 废料分析
-export const getScrapAnalysis = data => POST(URL_SCRAP_ANALYSIS, data)
+export const getScrapAnalysis = (data) => POST(URL_SCRAP_ANALYSIS, data)
 
 // 总保有量
-export const getTotalOwnership = data => POST(URL_TOTAL_OWNERSHIP, data)
+export const getTotalOwnership = (data) => POST(URL_TOTAL_OWNERSHIP, data)
 
 // 入库分析
-export const getAcceptanceStorage = data => POST(URL_ACCEPTANCE_STORAGE, data)
+export const getAcceptanceStorage = (data) => POST(URL_ACCEPTANCE_STORAGE, data)
 
 // 领料分析
-export const getPickingAnalysis = data => POST(URL_PICKING_ANALYSIS, data)
+export const getPickingAnalysis = (data) => POST(URL_PICKING_ANALYSIS, data)
 
 // 退料分析
-export const getMaterialReturnByMonth = data => POST(URL_MATERIAL_RETURN_BY_MONTH, data)
+export const getMaterialReturnByMonth = (data) =>
+  POST(URL_MATERIAL_RETURN_BY_MONTH, data)
 
 // 维修分析-pie+bar
-export const getMaintenanceByMonthChart = data => POST(URL_MAINTENANCE_BY_CHART, data)
+export const getMaintenanceByMonthChart = (data) =>
+  POST(URL_MAINTENANCE_BY_CHART, data)
 
 // 维修分析
-export const getMaintenanceByMonthDetails = data => POST(URL_MAINTENANCE_BY_MONTH_DETAILS, data)
+export const getMaintenanceByMonthDetails = (data) =>
+  POST(URL_MAINTENANCE_BY_MONTH_DETAILS, data)

src/api/index.js

@@ -1,29 +1,30 @@
 /**
  * axios全局配置
  */
-import axios from 'axios';
+import axios from 'axios'
 axios.defaults.timeout = 30000
 
 // 默认配置
-axios.defaults.baseURL = process.env.API_ROOT;
+// axios.defaults.baseURL = process.env.API_ROOT;
+axios.defaults.baseURL = 'http://112.29.103.165:21626/bigScreen'
 
 axios.interceptors.request.use(
-  config => {
+  (config) => {
     let token = localStorage.getItem('token')
     if (token) {
-      config.headers.accessToken = `${token}`;
+      config.headers.accessToken = `${token}`
-      config.headers.Authorization = `${token}`;
+      config.headers.Authorization = `${token}`
     }
-    return config;
+    return config
   },
-  error => {
+  (error) => {
-    return Promise.reject(error);
+    return Promise.reject(error)
   }
-);
+)
 
 // 添加一个请求拦截器
 axios.interceptors.response.use(
-  response => {
+  (response) => {
     if (response.data) {
       if (response.data.code === 401) {
       } else if (response.data.code === 200) {
@@ -34,30 +35,36 @@ axios.interceptors.response.use(
     } else {
       return Promise.reject(response.data)
     }
-
   },
-  error => {
+  (error) => {
-    if (error.code === 'ECONNABORTED' && error.message.indexOf('timeout') !== -1)
+    if (
+      error.code === 'ECONNABORTED' &&
+      error.message.indexOf('timeout') !== -1
+    )
       console.log('请求超时！')
     return Promise.reject(error)
   }
-);
+)
 
 // 通用POST方法
 export const POST = (url, params) => {
-  return axios.post(`${url}`, params).then(response => response);
+  return axios.post(`${url}`, params).then((response) => response)
-};
+}
 
 // 通用POST_JSON方法
 export const POST_JSON = (url, json, params) => {
-  return axios.post(`${url}`, json, {
+  return axios
-    params: params
+    .post(`${url}`, json, {
-  }).then(response => response);
+      params: params,
-};
+    })
+    .then((response) => response)
+}
 
 // 通用GET方法
 export const GET = (url, params) => {
-  return axios.get(`${url}`, {
+  return axios
-    params: params
+    .get(`${url}`, {
-  }).then(response => response);
+      params: params,
-};
+    })
+    .then((response) => response)
+}

src/api/screen.js

@@ -1,27 +1,50 @@
 import { POST, GET } from './index'
 
 // 领料数据
-export const getMaterialReqDataApi = params => POST(`/screen/base/largeScreen/home/getMaterialReqData`,)
+export const getMaterialReqDataApi = (params) =>
+  POST(`/material/base/largeScreen/home/getMaterialReqData`)
 // 退料数据
-export const getMaterialReturnDataApi = params => POST(`/screen/base/largeScreen/home/getMaterialReturnData`)
+export const getMaterialReturnDataApi = (params) =>
+  POST(`/material/base/largeScreen/home/getMaterialReturnData`)
 //当月报废分析
-export const getScrapAnalysisByMonthApi = params => POST(`/screen/base/largeScreen/home/getScrapAnalysisByMonth?maType=${params.maType}`)
+export const getScrapAnalysisByMonthApi = (params) =>
+  POST(
+    `/material/base/largeScreen/home/getScrapAnalysisByMonth?maType=${params.maType}`
+  )
 //新购验收入库分析
-export const getAcceptanceStorageApi = params => POST(`/screen/base/largeScreen/home/getAcceptanceStorage?maType=${params.maType}`,)
+export const getAcceptanceStorageApi = (params) =>
+  POST(
+    `/material/base/largeScreen/home/getAcceptanceStorage?maType=${params.maType}`
+  )
 //当月领料分析
-export const getPickingAnalysisByMonthApi = params => POST(`/screen/base/largeScreen/home/getPickingAnalysisByMonth?maType=${params.maType}`,)
+export const getPickingAnalysisByMonthApi = (params) =>
+  POST(
+    `/material/base/largeScreen/home/getPickingAnalysisByMonth?maType=${params.maType}`
+  )
 //当月退料分析
-export const getMaterialReturnByMonthApi = params => POST(`/screen/base/largeScreen/home/getMaterialReturnByMonth?maType=${params.maType}`,)
+export const getMaterialReturnByMonthApi = (params) =>
+  POST(
+    `/material/base/largeScreen/home/getMaterialReturnByMonth?maType=${params.maType}`
+  )
 //当月维修分析
-export const getMaintenanceByMonthApi = params => POST(`/screen/base/largeScreen/home/getMaintenanceByMonth?maType=${params.maType}`,)
+export const getMaintenanceByMonthApi = (params) =>
+  POST(
+    `/material/base/largeScreen/home/getMaintenanceByMonth?maType=${params.maType}`
+  )
 //设备分布图
-export const getEquipmentDisByMapApi = params => POST(`/screen/base/largeScreen/home/getEquipmentDisByMap`,)
+export const getEquipmentDisByMapApi = (params) =>
+  POST(`/material/base/largeScreen/home/getEquipmentDisByMap`)
 //施工机具/
-export const getTotalOwnershipApi = params => POST(`/screen/base/largeScreen/home/getTotalOwnership`,)
+export const getTotalOwnershipApi = (params) =>
+  POST(`/material/base/largeScreen/home/getTotalOwnership`)
 // 当月使用车辆
-export const getCarUseByMonthApi = params => POST(`/screen/base/largeScreen/home/getCarUseByMonth?maType=${params.maType}`,)
+export const getCarUseByMonthApi = (params) =>
+  POST(
+    `/material/base/largeScreen/home/getCarUseByMonth?maType=${params.maType}`
+  )
 // 当月使用车辆
-export const getMaintenanceWarningApi = params => POST(`/screen/base/largeScreen/home/getMaintenanceWarning`,)
+export const getMaintenanceWarningApi = (params) =>
+  POST(`/material/base/largeScreen/home/getMaintenanceWarning`)
 //各公司机具保有量
-export const getTotalOwnershipByCompany = params => POST(`/screen/base/largeScreen/home/getTotalOwnershipByCompany`)
+export const getTotalOwnershipByCompany = (params) =>
-
+  POST(`/material/base/largeScreen/home/getTotalOwnershipByCompany`)

src/router/index.js

@@ -5,12 +5,12 @@ Vue.use(Router)
 
 const originalPush = Router.prototype.push
 Router.prototype.push = function push(location) {
-  return originalPush.call(this, location).catch(err => err)
+  return originalPush.call(this, location).catch((err) => err)
 }
 
-const Layout = () => import('@/views/layout');
+const Layout = () => import('@/views/layout')
-const Home = () => import('@/views/Home/index');
+const Home = () => import('@/views/Home/index')
-const Login = () => import('@/views/Login/index');
+const Login = () => import('@/views/Login/index')
 const routes = [
   {
     path: '/',
@@ -49,10 +49,10 @@ const routes = [
         name: 'Login',
         meta: {
           title: '登录',
-          requireLoginAuth: true
+          requireLoginAuth: true,
-        }
+        },
-      }
+      },
-    ]
+    ],
   },
   {
     path: '*',
@@ -63,21 +63,20 @@ const routes = [
 const router = new Router({
   mode: 'history',
   routes,
+  base: '/screen',
 })
 
 router.beforeEach(async (to, from, next) => {
   if (to.path === '/login/index') {
-    return next();
+    return next()
   }
-  const token = localStorage.getItem('token');
+  const token = localStorage.getItem('token')
   if (!token) {
-    next('/login/index'); // 跳转到登录页
+    next('/screen/login/index') // 跳转到登录页
   } else {
-    next(); // 放行
+    next() // 放行
   }
-});
+})
-
-
 
 // if (to.matched.some(r => r.meta.requireLoginAuth)) {
 //   next();
@@ -86,4 +85,3 @@ router.beforeEach(async (to, from, next) => {
 // }
 
 export default router
-

src/views/login/index.vue

@@ -107,20 +107,25 @@
   </div>
 </template>
 <script>
-import { authLoginApi, getSendIphoneCodeApi, loginCodeApi } from "../../api/userLogin";
+import {
+  authLoginApi,
+  getSendIphoneCodeApi,
+  loginCodeApi,
+} from '../../api/userLogin'
 export default {
   name: 'Login',
   data() {
     const validatePhone = (rule, value, callback) => {
-      const reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
       if (!value) {
-        callback(new Error('请输入手机号'));
+        callback(new Error('请输入手机号'))
       } else if (!reg.test(value)) {
-        callback(new Error('请输入正确的手机号'));
+        callback(new Error('请输入正确的手机号'))
       } else {
-        callback();
+        callback()
+      }
     }
-    };
     return {
       isButtonState: false,
       isCode: true,
@@ -129,13 +134,13 @@ export default {
       showPwd: false,
       captcha: '',
       form: {
-        userName: "",
+        userName: '',
-        passWord: "",
+        passWord: '',
         phone: '',
-        phoneCode: ''
+        phoneCode: '',
       },
       UserLogin: true,
-      codeUrl: "",
+      codeUrl: '',
       rules: {
         userName: [
           { required: true, message: '账号不能为空', trigger: 'blur' },
@@ -144,20 +149,24 @@ export default {
           { required: true, message: '密码不能为空', trigger: 'blur' },
         ],
         phone: [
-          { validator: validatePhone, message: '请输入正确的手机号', trigger: 'blur' },
+          {
+            validator: validatePhone,
+            message: '请输入正确的手机号',
+            trigger: 'blur',
+          },
           { required: true, message: '手机号码不能为空', trigger: 'blur' },
         ],
         phoneCode: [
           { required: true, message: '验证码不能为空', trigger: 'blur' },
         ],
       },
-      type: 1
+      type: 1,
     }
   },
   mounted() {
     console.log(this.$route)
-    if(localStorage.getItem('token')!=''){
+    if (localStorage.getItem('token') != '') {
-      this.$router.push('./Home/index')
+      // this.$router.push('./Home/index')
     }
   },
 
@@ -172,7 +181,7 @@ export default {
               username: this.form.userName,
               password: this.form.passWord,
             }
-            authLoginApi(params).then(res => {
+            authLoginApi(params).then((res) => {
               if (res.code == 200) {
                 localStorage.setItem('token', res.data.access_token)
                 this.$router.push('./Home/index')
@@ -183,9 +192,9 @@ export default {
             })
           } else {
             this.isButtonState = false
-            return false;
+            return false
           }
-        });
+        })
       }
       if (this.type == 2) {
         this.isButtonState = true
@@ -196,7 +205,7 @@ export default {
               phone: this.form.phone,
               code: this.form.phoneCode,
             }
-            loginCodeApi(params).then(res => {
+            loginCodeApi(params).then((res) => {
               if (res.code == 200) {
                 localStorage.setItem('token', res.data.access_token)
                 this.$router.push('./Home/index')
@@ -207,11 +216,10 @@ export default {
             })
           } else {
             this.isButtonState = false
-            return false;
+            return false
           }
-        });
+        })
       }
-
     },
     loginWayClick(type) {
       if (type == 1) {
@@ -219,26 +227,27 @@ export default {
         this.UserLogin = true
         this.loginWay = true
         this.form = {}
-        this.$refs.form.resetFields();
+        this.$refs.form.resetFields()
       } else {
         this.type = 2
         this.UserLogin = false
         this.loginWay = false
         this.form = {}
-        this.$refs.form.resetFields();
+        this.$refs.form.resetFields()
       }
     },
     getCode() {
-      const regex = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/; // 手机号正则表达式
+      const regex =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/ // 手机号正则表达式
       let reg = regex.test(this.form.phone)
       if (!reg) {
-        this.$refs.form.validateField("phone");
+        this.$refs.form.validateField('phone')
       } else {
         this.isCode = false
         let params = {
-          phone: this.form.phone
+          phone: this.form.phone,
         }
-        getSendIphoneCodeApi(params).then(res => {
+        getSendIphoneCodeApi(params).then((res) => {
           if (res.code == 200) {
             this.$message.success('短信发送成功！')
           }
@@ -273,8 +282,8 @@ export default {
           alert('图片验证码不正确')
         }
       }
-    }
+    },
-  }
+  },
 }
 </script>
 <style lang="scss" scoped>