Merge remote-tracking branch 'origin/master'

sample-form-client-ui/admin/.browserslistrc

 > 1%
 last 2 versions
-not dead
+not ie <= 10

sample-form-client-ui/admin/.gitignore

 .DS_Store
 node_modules
 /dist
-
+样表终端系统.zip
 
 # local env files
 .env.local

sample-form-client-ui/admin/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "dev": "vue-cli-service serve",
-    "build": "vue-cli-service build",
+    "build": "vue-cli-service build --mode production",
     "lint": "vue-cli-service lint",
     "test": "vue-cli-service build --mode test",
     "build:prod": "vue-cli-service build --model prod"
@@ -43,6 +43,7 @@
     "@vue/cli-service": "~5.0.0",
     "eslint": "^7.32.0",
     "eslint-plugin-vue": "^8.0.3",
+    "filemanager-webpack-plugin": "^8.0.0",
     "less": "^4.0.0",
     "less-loader": "^8.0.0",
     "svg-sprite-loader": "^4.1.6",

sample-form-client-ui/admin/src/components/SearchBox.vue

@@ -81,7 +81,7 @@ export default {
   right: 200px;
 }
 .el-icon-circle-close {
-  font-size: 20px;
+  font-size: 30px;
 }
 :deep(.el-input__inner) {
   height: 72px;

sample-form-client-ui/admin/src/pages/home/Home.vue

@@ -440,7 +440,7 @@ export default {
   right: 200px;
 }
 .el-icon-circle-close {
-  font-size: 20px;
+  font-size: 30px;
 }
 .search-btn {
   width: 167px;

sample-form-client-ui/admin/vue.config.js

-const { defineConfig } = require('@vue/cli-service')
+const { defineConfig } = require("@vue/cli-service");
+const FileManagerPlugin = require("filemanager-webpack-plugin"); // 压缩文件夹
+const isDev = process.env.NODE_ENV === "development";
+let plugins = [];
+// 避免打本地启项目时自动打zip包
+if (!isDev) {
+  plugins.push(
+    new FileManagerPlugin({
+      events: {
+        onEnd: {
+          mkdir: ["./dist"],
+          delete: ["./样表终端系统.zip"],
+          archive: [{ source: "./dist", destination: "./样表终端系统.zip" }],
+        },
+      },
+    })
+  );
+}
 module.exports = defineConfig({
   transpileDependencies: true,
   productionSourceMap: false,
-  assetsDir: 's',
-
-  lintOnSave:false,
+  lintOnSave: false,
+  // webpack 插件
+  configureWebpack: {
+    plugins: [...plugins],
+  },
+  transpileDependencies: true,
+  // 打包输出目录
+  outputDir: "dist/dist",
+  publicPath: "./",
   devServer: {
     port: 9086,
-    hot: "only",//自动保存
+    hot: "only", //自动保存
     proxy: {
-      '/sampleform': {
-        target: 'http://localhost:17002',
+      "/sampleform": {
+        target: "http://localhost:17002",
         changeOrigin: true,
         secure: false,
-        cookieDomainRewrite: 'localhost',
-      }
-    }
-  }
-})
+        cookieDomainRewrite: "localhost",
+      },
+    },
+  },
+});

sample-form-manager-ui/admin/.browserslistrc

 > 1%
 last 2 versions
-not dead
+not ie <= 10

sample-form-manager-ui/admin/.env.development

 #开发环境
 NODE_ENV = "development"
-VUE_APP_API_BASE_URL=http://192.168.0.98:11078
-#VUE_APP_API_BASE_URL=http://192.168.0.98:11071/zwfw
+VUE_APP_API_BASE_URL=http://192.168.0.98:11078
\ No newline at end of file
-#VUE_APP_API_BASE_URL=http://192.168.0.98:11023
-#VUE_APP_API_BASE_URL=http://192.168.0.217:17311
\ No newline at end of file

sample-form-manager-ui/admin/.env.production

 #生产环境
 NODE_ENV = "production"
-VUE_APP_API_BASE_URL=http://192.168.0.98:17008
+VUE_APP_API_BASE_URL=/basics_api
+#基础设置
+VUE_APP_API_basics_URL=/basics_api/base
+#门户
+VUE_APP_API_portal_URL=/portal_home

sample-form-manager-ui/admin/.env.test

 #开发环境
 NODE_ENV = "test"
-VUE_APP_API_BASE_URL=http://192.168.0.98:11078
+VUE_APP_API_BASE_URL=/basics_api
\ No newline at end of file
+#基础设置
+VUE_APP_API_basics_URL=/basics_api/base
+#门户
+VUE_APP_API_portal_URL=/portal_home
\ No newline at end of file

sample-form-manager-ui/admin/.gitignore

 .DS_Store
 node_modules
 /dist
-
+样表管理系统.zip
 
 # local env files
 .env.local

sample-form-manager-ui/admin/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "vue-cli-service serve",
     "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
+    "build": "vue-cli-service build --mode production",
     "test": "vue-cli-service build --mode test",
     "lint": "vue-cli-service lint",
     "stage": "vue-cli-service build --mode stage",
@@ -42,6 +42,7 @@
     "@vue/cli-service": "~5.0.0",
     "eslint": "^7.32.0",
     "eslint-plugin-vue": "^8.0.3",
+    "filemanager-webpack-plugin": "^8.0.0",
     "less": "^4.0.0",
     "less-loader": "^8.0.0",
     "svg-sprite-loader": "^4.1.6",

sample-form-manager-ui/admin/src/pages/hardware/NumberWriteDevice.vue

@@ -329,4 +329,4 @@ export default {
 .el-switch .el-switch__label {
   width: 60px !important; /*开关按钮的宽度大小*/
 }
-</style>
+</style>
\ No newline at end of file

sample-form-manager-ui/admin/src/pages/jump/jump.vue

@@ -8,7 +8,7 @@ import local from "@/utils/local";
 export default {
   data() {
     return {
-      portal: process.env.VUE_APP_API_portal_URL + "/#/",
+      portal: process.env.VUE_APP_API_portal_URL,
     };
   },
   created() {

sample-form-manager-ui/admin/src/pages/software/librarymanage/LibraryManage.vue

@@ -251,6 +251,7 @@ export default {
           if (code === 1) {
             this.$message.success(msg);
             this.getPbuList();
+            this.$refs.multipleTable.clearSelection();
             this.selectKeys = [];
           }
         })

sample-form-manager-ui/admin/src/pages/software/materials/MaterialsManage.vue

@@ -504,6 +504,7 @@ export default {
             this.$message.success(msg);
             this.getMaterialsList();
             this.getWriteMatterList();
+            this.$refs.rightTable.clearSelection();
             this.rightSelectedRowKeys = [];
           }
         })

sample-form-manager-ui/admin/src/pages/software/matter/MatterManage.vue

@@ -471,6 +471,8 @@ export default {
           let { code, msg } = res.data;
           if (code === 1) {
             this.$message.success(msg);
+            this.$refs.leftTable.clearSelection();
+            this.leftSelectedRowKeys = [];
             this.getWriteMatterList();
             this.getMatterSubList();
           }

sample-form-manager-ui/admin/src/pages/software/skinManage/SkinManage.vue

@@ -77,23 +77,24 @@ export default {
   methods: {
     // 选择使用皮肤
     async changeSkin(device, row) {
-      if (row.check === "1") {
-        // let obj = {
-        //   skin_id: "",
-        //   css_path: "",
-        //   skin_name: "",
-        //   previewImagePath: "",
-        //   skinFieldList: "",
-        //   device,
-        // };
-        row.check = "0";
-        console.log(check, device);
-        // if (code === 1) {
-        //   this.$message.success("设置" + msg);
-        // }
-      } else {
-        row.check = "1";
-      }
+      // if (row.check === "1") {
+      //   // let obj = {
+      //   //   skin_id: "",
+      //   //   css_path: "",
+      //   //   skin_name: "",
+      //   //   previewImagePath: "",
+      //   //   skinFieldList: "",
+      //   //   device,
+      //   // };
+      //   row.check = "0";
+      //   console.log(check, device);
+      //   // if (code === 1) {
+      //   //   this.$message.success("设置" + msg);
+      //   // }
+      // } else {
+      //   row.check = "1";
+      // }
+      console.log(device, row);
     },
     // 预览皮肤
     handlePreview(url) {

sample-form-manager-ui/admin/src/router/index.js

@@ -2,6 +2,7 @@ import Vue from "vue";
 import VueRouter from "vue-router";
 import Layouts from "@/pages/layouts/Layouts.vue";
 import store from "@/store";
+import local from "@/utils/local";
 // 解决重复点击同一个路由报错
 const originalPush = VueRouter.prototype.push;
 VueRouter.prototype.push = function (location) {
@@ -30,6 +31,21 @@ const router = new VueRouter({
   routes,
 });
 
+// 前置路由卫士
+router.beforeEach((to, from, next) => {
+  let islogin = local.getLocal("sampleToken") ? true : false;
+  if (islogin) {
+    next();
+  } else {
+    if (to.path === "/jump") {
+      next();
+    } else {
+      location.href = process.env.VUE_APP_API_portal_URL;
+      // next({ path: "/login" });
+    }
+  }
+});
+
 // 动态菜单
 const dynamicRouter = [
   {

sample-form-manager-ui/admin/src/utils/request.js

@@ -40,7 +40,7 @@ axios.interceptors.response.use(
           message: msg,
         });
         setTimeout(() => {
-          location.href = process.env.VUE_APP_API_portal_URL + "/#/";
+          location.href = process.env.VUE_APP_API_portal_URL;
         }, 2000);
       }
     }

sample-form-manager-ui/admin/vue.config.js

-const { defineConfig } = require('@vue/cli-service')
+const { defineConfig } = require("@vue/cli-service");
+const FileManagerPlugin = require("filemanager-webpack-plugin"); // 压缩文件夹
+const isDev = process.env.NODE_ENV === "development";
+let plugins = [];
+// 避免打本地启项目时自动打zip包
+if (!isDev) {
+  plugins.push(
+    new FileManagerPlugin({
+      events: {
+        onEnd: {
+          mkdir: ["./dist"],
+          delete: ["./样表管理系统.zip"],
+          archive: [{ source: "./dist", destination: "./样表管理系统.zip" }],
+        },
+      },
+    })
+  );
+}
 module.exports = defineConfig({
   transpileDependencies: true,
   productionSourceMap: false,
-	assetsDir: 's',
-
-	lintOnSave:false,
-	devServer: {
-		port: 8086,
-		hot: "only",//自动保存
-		proxy: {
-			'/sampleform': {
-				 target: 'http://localhost:17215',
-				changeOrigin: true,
-				secure: false,
-				cookieDomainRewrite: 'localhost',			
-			}
-		}
-	}
-
-})
+  // webpack 插件
+  configureWebpack: {
+    plugins: [...plugins],
+  },
+  transpileDependencies: true,
+  // 打包输出目录
+  outputDir: "dist/dist",
+  publicPath: "./",
+});