Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop

# Conflicts:
#	package-lock.json
#	src/components/drawers/AssessmentList.vue
#	vue.config.js

vue.config.js

@@ -8,22 +8,22 @@
  */
 const { defineConfig } = require("@vue/cli-service");
 module.exports = defineConfig({
-	publicPath: '/manage',
-	// transpileDependencies: true,
-	devServer: {
-		port: 8080,
-		proxy: {
-			"/manageApi": {
+  publicPath: "/manage",
+  // transpileDependencies: true,
+  devServer: {
+    port: 8080,
+    proxy: {
+      "/manageApi": {
 				// target:"http://192.168.19.246:30001",
 				// target:"http://192.168.100.208:30001",
 				target: "https://u-pre.boe.com/manageApi/", //这里后台的地址模拟的;应该填写你们真实的后台接口
-				changeOrigin: true, //表示是否改变原域名
-				// secure: false,
-				// ws: false, //表示WebSocket协议
-				pathRewrite: {
-					"^/manageApi": "",
-				},
-			},
-		},
-	},
+        changeOrigin: true, //表示是否改变原域名
+        // secure: false,
+        // ws: false, //表示WebSocket协议
+        pathRewrite: {
+          "^/manageApi": "",
+        },
+      },
+    },
+  },
 });