Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

public/image-edit/js/tui-image-editor.js

@@ -18459,6 +18459,9 @@
               if (!data) {
                 return _util.Promise.reject(_consts.rejectMessages.invalidParameters);
               }
+              // 裁剪的----张
+              console.log(data);
+              // _util.Promise.resolve(data)
 
               return this.loadImageFromURL(data.url, data.imageName);
             }

src/App.vue

@@ -147,4 +147,29 @@ export default {};
     color: #2e3846;
   }
 }
+
+/*.el-loading-spinner {
+  position: relative;
+  width: 170px;
+  height: 170px;
+  background-image: url("./assets/img/loadingfinger.gif");
+  background-repeat: no-repeat;
+  background-size: 170px 170px;
+  background-position: center;
+
+  svg {
+    display: none;
+  }
+}
+.el-loading-spinner::after {
+  top: 100px;
+  left: 0;
+  content: "";
+  position: absolute;
+  width: 140px;
+  height: 40px;
+  background-image: url("./assets/img/loadingtxt.gif");
+  background-repeat: no-repeat;
+  background-size: 140px 40px;
+}*/
 </style>

src/components/SelectCode.vue

 <!--
  * @Author: your name
  * @Date: 2021-11-25 10:15:01
- * @LastEditTime: 2021-11-26 15:57:33
+ * @LastEditTime: 2021-11-27 14:29:27
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \founder_vue\src\components\SelectCode.vue
@@ -140,7 +140,7 @@ export default {
 }
 .multiple /deep/ {
   .el-tag {
-    max-width: 100%;
+    max-width: calc(100% - 80px);
     position: relative;
     padding-right: 15px;
   }

src/plugins/axios.js

 /*
  * @Author: your name
  * @Date: 2021-09-07 09:57:48
- * @LastEditTime: 2021-11-26 16:55:10
+ * @LastEditTime: 2021-11-27 17:11:21
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
@@ -36,7 +36,6 @@ const _axios = axios.create(config);
 
 _axios.interceptors.request.use(
   function (config) {
-    debugger;
     //判断是否登录
     if (config.url.indexOf('/login/myLoginForm') <= 0) {
       if (localStorage.getItem("token")) {
@@ -58,7 +57,7 @@ _axios.interceptors.request.use(
 
     // 判断当前请求是否设置了不显示Loading,默认显示
     if (config.loading !== false) {
-      showLoading(config.headers.loadingTarget); // 如果设置了targer,使用设置的target,比如el-table
+      showLoading(config.loadingTarget); // 如果设置了targer,使用设置的target,比如el-table
     }
     NProgress.start();
     return config;
@@ -73,7 +72,6 @@ _axios.interceptors.request.use(
 // Add a response interceptor
 _axios.interceptors.response.use(
   function (response) {
-    debugger;
     if (response.config.loading !== false) {
       hideLoading();
     }

src/router/index.js

 /*
  * @Author: your name
  * @Date: 2021-09-07 09:57:48
- * @LastEditTime: 2021-11-15 20:07:17
+ * @LastEditTime: 2021-11-27 14:20:16
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\router\index.js
@@ -67,7 +67,7 @@ const router = new VueRouter({
 
 router.beforeEach((to, from, next) => {
   console.log(from);
-  if(from.name === 'ryzwbj' || from.name === 'ajzwbj') {
+  if (from.name === 'ryzwbj' || from.name === 'ajzwbj') {
     setTimeout(() => {
       // 清空session
       sessionStorage.clear()

src/store/index.js

@@ -16,6 +16,7 @@ import layout from "./modules/layout"
 import publicData from "./modules/publicData"
 import rydaxx from "./modules/rydaxx";
 import ajdaxx from "./modules/ajdaxx";
+import loading from "./modules/loading";
 
 Vue.use(Vuex);
 
@@ -26,7 +27,8 @@ const store = new Vuex.Store({
     layout,
     publicData,
     rydaxx,
-    ajdaxx
+    ajdaxx,
+    loading
   },
   getters,
   plugins: [

src/store/modules/loading.js

+/*
+ * @Author: your name
+ * @Date: 2021-11-04 11:12:33
+ * @LastEditTime: 2021-11-11 23:22:08
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: \指纹系统\founder_vue\src\store\modules\zwbj.js
+ */
+import { SET_LOADING, SET_JUMPROUTE } from "./mutations-types";
+const state = {
+  // 是否处于加载中
+  loading: false,
+  jumproute: true
+};
+
+const mutations = {
+  [SET_LOADING] (state, content) {
+    state.loading = content
+  },
+  [SET_JUMPROUTE] (state, content) {
+    state.jumproute = content
+  }
+};
+
+const actions = {
+
+};
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+};

src/store/modules/mutations-types.js

@@ -17,3 +17,10 @@ export const SET_AUTOZYHZ = 'setAutoZyhz'
 // 人员档案信息
 export const SET_RYINFO = 'setRyInfo'
 export const SET_AJINFO = 'setAjInfo'
+
+
+// 全局loading
+export const SET_LOADING = 'setLoading'
+
+// 跳转路由
+export const SET_JUMPROUTE = 'setJumpRoute'

src/utils/requestLoading.js

 /*
  * @Author: your name
  * @Date: 2021-11-26 16:37:59
- * @LastEditTime: 2021-11-26 16:59:01
+ * @LastEditTime: 2021-11-27 18:02:15
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \founder_vue\src\utils\requestLoading.js
  */
 import utils from "./util";
-import { Loading } from 'element-ui' // 装包方式这样引入,我这里通过cdn引入,通过window.ELEMENT调用
+import store from '../store/index';
+// import { Loading } from 'element-ui' // 装包方式这样引入,我这里通过cdn引入,通过window.ELEMENT调用
 // loading对象
 let loading;
 
@@ -20,12 +21,13 @@ export function showLoading(target) {
   // 但needLoadingRequestCount已经变成0.避免这种情况下会重新创建个loading
   console.log(needLoadingRequestCount, loading);
   if (needLoadingRequestCount === 0 && !loading) {
-    loading = Loading.service({ // 通过cdn引入的element-ui
-      lock: true,
-      text: "加载中...",
-      background: "rgba(255, 255, 255, 0.7)",
-      target: target || "#micro-apps-container"
-    });
+    // loading = Loading.service({ // 通过cdn引入的element-ui
+    //   lock: true,
+    //   text: "",
+    //   background: "rgba(255, 255, 255, 0.7)",
+    //   target: target || "#micro-apps-container"
+    // });
+    store.commit('loading/setLoading', true)
   }
   needLoadingRequestCount++;
 }
@@ -42,6 +44,7 @@ export function hideLoading() {
 
 // 防抖：将 300ms 间隔内的关闭 loading 便合并为一次。防止连续请求时， loading闪烁的问题。
 let toHideLoading = utils.debounce(() => {
-  loading.close();
+  // loading.close();
   loading = null;
+  store.commit('loading/setLoading', false)
 }, 500);

src/views/Editor/modules/ajzwbjLeft.vue

 <!--
  * @Author: your name
  * @Date: 2021-10-22 09:42:07
- * @LastEditTime: 2021-11-22 11:00:22
+ * @LastEditTime: 2021-11-27 17:04:54
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
@@ -198,9 +198,9 @@ export default {
      * 获取案件指纹原图
      */
     getCaseOrigin (seq) {
-      this.loading = Loading.service({ fullscreen: true, text: '正在加载...' });
-      this.$store.commit('zwbj/setSeq', seq)
       let self = this
+      self.$store.commit('loading/setLoading', true)
+      this.$store.commit('zwbj/setSeq', seq)
       this.$axios({
         method: 'post',
         url: `/api/org/caseBybarcode/barcode/seq`,
@@ -223,9 +223,8 @@ export default {
       })
       clearTimeout(self.timer)
       self.timer = setTimeout(() => {
-        self.loading && self.loading.close();
-        self.loading = null
-      }, 1200);
+        self.$store.commit('loading/setLoading', false)
+      }, 500);
     },
     /**
      * 获取案件指纹

src/views/Editor/modules/imageEd.scss

@@ -20,7 +20,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
     .imageEd_header {
       margin-top: 20px;
       margin-bottom: 14px;
-      height: 59px !important;
+      height: 32px !important;
       // flex-grow: 1;
       display: flex;
       align-items: center;
@@ -1067,11 +1067,13 @@ $transOrigin: var(--transOrigin, 0px, 0px);
               display: flex;
               margin-right: 4px;
               img {
+                cursor: pointer;
                 width: 100%;
                 height: 100%;
               }
             }
             .name {
+              cursor: pointer;
               font-size: 14px;
               font-family: MicrosoftYaHei;
               color: #055fe7;
@@ -1506,10 +1508,13 @@ $transOrigin: var(--transOrigin, 0px, 0px);
       .options-bottom {
         margin-top: 16px;
         width: 336px;
-        height: 512px;
+        height: 488px;
         background: #F6F8FA;
         box-shadow: 0px -1px 2px 0px rgba(5, 95, 231, 0.25);
         border-radius: 4px;
+        font-size: 15px;
+        font-family: MicrosoftYaHei;
+        color: #333333;
         .options-bottom-title {
           padding-left: 16px;
           width: 336px;
@@ -1526,13 +1531,15 @@ $transOrigin: var(--transOrigin, 0px, 0px);
           flex-wrap: wrap;
           padding: 24px 16px 0 16px;
           .btn {
+            font-size: 14px;
+            font-family: MicrosoftYaHei;
             color: #666666;
             cursor: pointer;
             display: flex;
             justify-content: center;
             align-items: center;
             width: 64px;
-            height: 40px;
+            height: 32px;
             background: #f6f8fa;
             box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8),
               -4px -4px 4px 0px #ffffff;

src/views/Editor/modules/imageEd.vue

@@ -2317,6 +2317,8 @@ export default {
       // 移除图片上的点
       $(".tzdDom").remove();
       $(".auto_tzdDom").remove();
+      this.$store.commit('zwbj/setTzdall', null)
+      this.$store.commit('zwbj/setAutoTzdall', null)
 
       self.historys.push("清空");
       this.$message.success("已清空！");
@@ -3859,6 +3861,7 @@ export default {
     if (sessionArr.length == this.sessionCount) {
       return;
     } else {
+      this.$store.commit('loading/setJumpRoute', false)
       this.$message.error("当前页面有未保存的指位!");
     }
   }

src/views/Editor/modules/imageEdAJ.scss

@@ -19,7 +19,7 @@ $directionRotate: var(--directionRotate, 0deg);
     .imageEd_header {
       margin-top: 20px;
       margin-bottom: 14px;
-      height: 59px;
+      height: 32px;
       // flex-grow: 1;
       display: flex;
       align-items: center;
@@ -2085,7 +2085,7 @@ $directionRotate: var(--directionRotate, 0deg);
             z-index: 10;
             position: absolute;
             top: 50px;
-            right: 204px;
+            right: 0px;
             width: 300px;
             height: 114px;
             background: #ffffff;

src/views/Editor/modules/ryzwbjLeft.scss

@@ -185,8 +185,9 @@
         color: #AEAFB4;
       }
       .finger-total {
-        position: absolute;
-        bottom: 30px;
+        margin-top: 100px;
+        //position: absolute;
+        //bottom: 30px;
         display: flex;
         align-items: center;
         justify-content: center;

src/views/Editor/modules/ryzwbjLeft.vue

 <!--
  * @Author: your name
  * @Date: 2021-10-22 09:42:07
- * @LastEditTime: 2021-11-15 14:41:58
+ * @LastEditTime: 2021-11-27 17:05:04
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
@@ -293,10 +293,10 @@ export default {
      * @return {*}
      */
     getRollFingerOrigin (seq) {
-      this.loading = Loading.service({ fullscreen: true, text: '正在加载...' });
+      let self = this
+      self.$store.commit('loading/setLoading', true)
       this.$store.commit('zwbj/setSeq', seq)
       // ip:port/api/org/roll/{id}/{seq}
-      let self = this
       this.$axios({
         method: 'post',
         // url: `/api/org/roll/${self.id}/${seq}?mnt=1`,
@@ -320,9 +320,8 @@ export default {
       })
       clearTimeout(self.timer)
       self.timer = setTimeout(() => {
-        self.loading && self.loading.close();
-        self.loading = null
-      }, 1200);
+        self.$store.commit('loading/setLoading', false)
+      }, 500);
     },
     /**
      * @description: 获取平面指纹原图
@@ -330,10 +329,10 @@ export default {
      * @return {*}
      */
     getPainFingerOrigin (seq) {
-      this.loading = Loading.service({ fullscreen: true, text: '正在加载...' });
+      let self = this
+      self.$store.commit('loading/setLoading', true)
       this.$store.commit('zwbj/setSeq', seq)
       // ip:port/api/org/plain/{id}/{seq}
-      let self = this
       this.$axios({
         method: 'post',
         // url: `/api/org/plain/${self.id}/${seq}?mnt=1`,
@@ -357,9 +356,8 @@ export default {
       })
       clearTimeout(self.timer)
       self.timer = setTimeout(() => {
-        self.loading && self.loading.close();
-        self.loading = null
-      }, 1200);
+        self.$store.commit('loading/setLoading', false)
+      }, 500);
     },
     /**
      * @description: 获取滚动指纹
@@ -367,8 +365,8 @@ export default {
      * @return {*}
      */
     async getRollFingers () {
-      this.loading = Loading.service({ fullscreen: true, text: '正在加载...' });
       let self = this
+      self.$store.commit('loading/setLoading', true)
       // 请求之前先清空图片数据
       self.rollFingersLeft.forEach((item) => {
         item.image = null
@@ -467,9 +465,8 @@ export default {
       }
       clearTimeout(self.timer)
       self.timer = setTimeout(() => {
-        self.loading && self.loading.close();
-        self.loading = null
-      }, 1200);
+        self.$store.commit('loading/setLoading', false)
+      }, 500);
     },
     /**
      * @description: 切换单个指纹

src/views/Home.vue

 <template>
   <div id="home-div">
-    <div id="home" :class="{ zhanshi: isCropper }">
+    <div id="home" :class="{ zhanshi: isCropper || loading}">
       <el-container class="layout-container">
         <transition name="slide">
           <el-aside :width="isCollapse ? '4rem' : '17.5rem'" class="aside">
             <div
               class="logo"
               :class="{ minLogo: isCollapse }"
-              @click="$router.push('/Home/Home')"
+              @click="$router.push('/gateway')"
             >
               <img class="jh" src="../assets/img/Home/jh.png" alt="" />
               <img
@@ -91,7 +91,7 @@
               <div class="message">
                 <div class="circle"></div>
               </div>
-              <div class="quit" @click="$router.push('/Home/Home')"></div>
+              <div class="quit" @click="$router.push('/gateway')"></div>
               <div class="logout" @click="logout">
                 <svg-icon
                   v-show="!isHoverLogout"
@@ -140,6 +140,14 @@
     <button @click="toAllPersonnelBase">全部人员库</button> -->
     </div>
     <div class="shadow" v-show="isCropper"></div>
+    <div class="loading" v-show="loading">
+      <div class="loading-finger">
+        <img src="../assets/img/loadingfinger.gif" alt="">
+      </div>
+      <div class="loading-name">
+        <img src="../assets/img/loadingtxt.gif" alt="">
+      </div>
+    </div>
   </div>
 </template>
 
@@ -148,7 +156,7 @@ import html2canvas from "html2canvas";
 import "@/icons/logout_d.svg";
 import "@/icons/logout_a.svg";
 import indexRoutes from "@/router/modules/index";
-import { mapGetters } from "vuex";
+import { mapGetters, mapState } from "vuex";
 export default {
   name: "Home",
   data() {
@@ -169,6 +177,7 @@ export default {
     };
   },
   mounted() {
+    console.log(this.loading);
     let self = this;
     this.menuActive = this.$route.name;
 
@@ -186,6 +195,9 @@ export default {
   },
   computed: {
     ...mapGetters(["defaultGoodsImage", "userAuth"]),
+    ...mapState({
+      loading: state => state.loading.loading
+    }),
     cachePageName() {
       return this.$store.state.layout.cachePageName;
     },
@@ -328,6 +340,9 @@ export default {
     },
   },
   watch: {
+    loading(newValue, oldValue) {
+      console.log(newValue);
+    },
     $route: {
       handler(newValue, oldValue) {
         //console.log(this.routePath, 11111111111);
@@ -755,4 +770,34 @@ export default {
     }
   }
 }
+.loading {
+  z-index: 999999;
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba($color: #fff, $alpha: 0.65);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  .loading-finger {
+    width: 100px;
+    height: 100px;
+    img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+  .loading-name {
+    width: 100px;
+    height: auto;
+    margin-top: 20px;
+    img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+}
 </style>

src/views/SystemManage/GroupManage.vue

@@ -91,6 +91,7 @@
         :height="height"
         highlight-current-row
         ref="multipleTable"
+        :key="key"
         :data="tableData"
         class="table"
         :class="{ table: true, delSelection: !selectBoo }"
@@ -722,6 +723,7 @@ export default {
       checked: false,
       defaultPerson: [], //系统默认角色集合
       customPerson: [], //自定义角色集合
+      key: 1,
     };
   },
   computed: {
@@ -1031,6 +1033,7 @@ export default {
       this.$axios.get("/security/user-groups").then((res) => {
         if (res.data.code == "200") {
           this.tableData = res.data.detail;
+          this.allTableData = res.data.detail;
         }
       });
     },
@@ -1052,6 +1055,14 @@ export default {
     $(".groupYonghuDialog").remove();
   },
   watch: {
+    checked(val) {
+      this.key++;
+      if (val) {
+        this.tableData = this.allTableData.filter((i) => i.status == 0);
+      } else {
+        this.tableData = this.allTableData;
+      }
+    },
     isShowEditGroupDialog(val) {
       this.$bus.emit("isBlur", val);
     },

src/views/SystemManage/UserManage.vue

@@ -28,7 +28,7 @@
         />
       </div>
       <div class="search-item">
-        <div class="label">单位代码：</div>
+        <div class="label">单位：</div>
         <Cascader :form="searchParams" id="unitCode" width="9.6875"></Cascader>
         <!-- <el-input
           class="search-info"
@@ -103,6 +103,7 @@
         highlight-current-row
         ref="multipleTable"
         :data="tableData"
+        :key="key"
         :class="{ table: true, delSelection: !selectBoo }"
         @selection-change="handleSelectionChange"
       >
@@ -292,6 +293,7 @@
             ></el-input>
           </el-form-item>
           <el-form-item class="info-item" label="所属单位:" prop="unitCode">
+            <!-- <SelectCode :form="addFormParams" id="unitCode" codeUrl="cjxxyydm" multiple></SelectCode> -->
             <Cascader :form="addFormParams" id="unitCode"></Cascader>
           </el-form-item>
           <el-form-item class="info-item" label="用户警号:" prop="policeNumber">
@@ -684,6 +686,7 @@ export default {
       isShowEditUserDialog: false,
       tableData: [],
       checked: false,
+      key: 1,
       // tableData: data1,
     };
   },
@@ -833,6 +836,7 @@ export default {
       this.$axios.get("/security/users").then((res) => {
         if (res.data.code == 200) {
           this.tableData = res.data.detail;
+          this.allTableData = res.data.detail;
         }
       });
     },
@@ -987,6 +991,14 @@ export default {
     });
   },
   watch: {
+    checked(val) {
+      this.key++;
+      if (val) {
+        this.tableData = this.allTableData.filter((i) => i.status == 0);
+      } else {
+        this.tableData = this.allTableData;
+      }
+    },
     isShowAddUserDialog(val) {
       this.$bus.emit("isBlur", val);
     },
@@ -1069,7 +1081,7 @@ const data1 = [
 }
 </style>
 <style scoped lang="scss">
-.delSelection /deep/ .el-table-column--selection .cell {
+.el-checkbox /deep/ .delSelection /deep/ .el-table-column--selection .cell {
   display: none;
 }
 /deep/ .el-form-item {

src/views/SystemManage/scss/group.scss

@@ -13,6 +13,17 @@
     }
   }
 }
+.el-checkbox /deep/ {
+  .el-checkbox__label{
+    color: #666666 !important;
+  }
+  .is-checked {
+    .el-checkbox__inner {
+      background-color: #055fe7;
+      border-color: #055fe7;
+    }
+  }
+}
 .manage-page {
   width: 100%;
   padding: 24px;
@@ -175,7 +186,7 @@
     .circle-blue {
       width: 8px;
       height: 8px;
-      background-color: #055fe7;
+      background-color: #00b47a;
       border-radius: 50%;
       -moz-border-radius: 50%;
       -webkit-border-radius: 50%;

src/views/SystemManage/scss/permission.scss

@@ -121,7 +121,7 @@
       .circle-blue {
         width: 8px;
         height: 8px;
-        background-color: #055fe7;
+        background-color: #00b47a;
         border-radius: 50%;
         -moz-border-radius: 50%;
         -webkit-border-radius: 50%;
@@ -270,7 +270,7 @@
       .circle-blue {
         width: 8px;
         height: 8px;
-        background-color: #055fe7;
+        background-color: #00b47a;
         border-radius: 50%;
         -moz-border-radius: 50%;
         -webkit-border-radius: 50%;

src/views/SystemManage/scss/user.scss

@@ -13,6 +13,17 @@
     }
   }
 }
+.el-checkbox /deep/ {
+  .el-checkbox__label {
+    color: #666666 !important;
+  }
+  .is-checked {
+    .el-checkbox__inner {
+      background-color: #055fe7;
+      border-color: #055fe7;
+    }
+  }
+}
 .manage-page {
   width: 100%;
   padding: 24px;
@@ -179,7 +190,7 @@
     .circle-blue {
       width: 8px;
       height: 8px;
-      background-color: #055fe7;
+      background-color: #00b47a;
       border-radius: 50%;
       -moz-border-radius: 50%;
       -webkit-border-radius: 50%;

src/views/cxyrd/modules/LTCandidate.vue

@@ -1185,7 +1185,7 @@ export default {
       // }
       let zcseq = sessionStorage.getItem("zcseq");
       let qqid = sessionStorage.getItem("qqid");
-      this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
+      self.$store.commit('loading/setLoading', true)
       this.$axios.post(`/api/query/matchcand/dest/${qqid}/${zcseq}`, {
         srcbarcode: sessionStorage.getItem("srcbarcode"),
         destbarcode: self.input3.trim()
@@ -1194,12 +1194,10 @@ export default {
           //console.log(response);
           self.tableData = response.data.ret;
           self.total = self.tableData.length;
-
-          clearTimeout(self.timer);
+          clearTimeout(self.timer)
           self.timer = setTimeout(() => {
-            self.loading && self.loading.close();
-            self.loading = null;
-          }, 1200);
+            self.$store.commit('loading/setLoading', false)
+          }, 500);
         });
     },
     /**
@@ -1226,7 +1224,7 @@ export default {
           // 存储目的数据序号
           sessionStorage.setItem("destseqno", val.destseqno);
 
-          this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
+          self.$store.commit('loading/setLoading', true)
           // 平面 --- 换压缩图
           if (val.destseqno > 10) {
             this.$axios
@@ -1248,11 +1246,10 @@ export default {
               self.$bus.emit("changImageEditTarget", response.data.ret[0].image);
             });
           }
-          clearTimeout(self.timer);
+          clearTimeout(self.timer)
           self.timer = setTimeout(() => {
-            self.loading && self.loading.close();
-            self.loading = null;
-          }, 1200);
+            self.$store.commit('loading/setLoading', false)
+          }, 500);
 
           // this.$axios.get(`/api/api/org/plainByBarcode/R1100002487002018050034/1/`)
           // this.$axios

src/views/cxyrd/modules/LTSrc.vue

@@ -245,7 +245,7 @@ export default {
     handleCurrentChange(val, old) {
       let self = this;
       // 发送请求
-      this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
+      self.$store.commit('loading/setLoading', true)
       // 被删除
       if(val.removeFlag === 1) {
         self.$bus.emit('deleteMessage', {
@@ -273,16 +273,16 @@ export default {
           sessionStorage.setItem("srcseqno", imageInfo.seq);
           sessionStorage.setItem("zcseq", imageInfo.seq);
           // 发送请求
-          this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
+          self.$store.commit('loading/setLoading', true)
           this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.seq}`, { srcbarcode: sessionStorage.getItem("srcbarcode") })
             .then(response => {
               //console.log(response);
               self.$bus.emit("initCandidate", response.data.ret);
             });
+          clearTimeout(self.timer)
           self.timer = setTimeout(() => {
-            self.loading && self.loading.close();
-            self.loading = null;
-          }, 1200);
+            self.$store.commit('loading/setLoading', false)
+          }, 500);
         });
       } else {
         // 没有被删除
@@ -319,11 +319,10 @@ export default {
         self.isActive = "";
       }
 
-      clearTimeout(self.timer);
+      clearTimeout(self.timer)
       self.timer = setTimeout(() => {
-        self.loading && self.loading.close();
-        self.loading = null;
-      }, 1200);
+        self.$store.commit('loading/setLoading', false)
+      }, 500);
     },
     /**
      * @description: 获取列表数据
@@ -331,9 +330,9 @@ export default {
      * @return {*}
      */
     getDetailData() {
+      let self = this
       // 发送请求
-      this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
-      let self = this;
+      self.$store.commit('loading/setLoading', true)
       if (this.type == "father") {
         this.$axios
           .post("/api/queryque/standardAll", { contrastCustomSearchReq: { qid: Number(self.qid) } })
@@ -363,10 +362,10 @@ export default {
             });
           });
       }
+      clearTimeout(self.timer)
       self.timer = setTimeout(() => {
-        self.loading && self.loading.close();
-        self.loading = null;
-      }, 1200);
+        self.$store.commit('loading/setLoading', false)
+      }, 500);
     },
     // 获取选择的任务详情
     getFirgerPrintDetail(row) {
@@ -398,16 +397,16 @@ export default {
         sessionStorage.setItem("zcseq", imageInfo.seq);
         this.$bus.emit("changImageEdit", imageInfo.image);
         // 发送请求
-        this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
+        self.$store.commit('loading/setLoading', true)
         this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.seq}`, { srcbarcode: sessionStorage.getItem("srcbarcode") })
           .then(response => {
             //console.log(response);
             self.$bus.emit("initCandidate", response.data.ret);
           });
+        clearTimeout(self.timer)
         self.timer = setTimeout(() => {
-          self.loading && self.loading.close();
-          self.loading = null;
-        }, 1200);
+          self.$store.commit('loading/setLoading', false)
+        }, 500);
       }
     },
     /**

src/views/cxyrd/modules/TLCandidate.vue

@@ -99,11 +99,10 @@ export default {
           //console.log(response);
           self.tableData = response.data.ret;
           self.total = self.tableData.total;
-          clearTimeout(self.timer);
+          clearTimeout(self.timer)
           self.timer = setTimeout(() => {
-            self.loading && self.loading.close();
-            self.loading = null;
-          }, 1200);
+            self.$store.commit('loading/setLoading', false)
+          }, 500);
         });
     },
     /**
@@ -128,7 +127,7 @@ export default {
         sessionStorage.setItem("backcheckXh", val.destseqno);
         // this.$axios.get(`/api/api/org/plainByBarcode/R1100002487002018050034/1/`)
         if (!self.isFirstMounted) {
-          this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
+          self.$store.commit('loading/setLoading', true)
         }
 
         this.$axios
@@ -140,11 +139,10 @@ export default {
           //console.log(response);
           self.$bus.emit("changImageEditTarget", response.data.ret[0].image);
           if (!self.isFirstMounted) {
-            clearTimeout(self.timer);
+            clearTimeout(self.timer)
             self.timer = setTimeout(() => {
-              self.loading && self.loading.close();
-              self.loading = null;
-            }, 1200);
+              self.$store.commit('loading/setLoading', false)
+            }, 500);
           }
         });
         // this.$axios

src/views/cxyrd/modules/TLSrc.vue

@@ -465,7 +465,7 @@ export default {
     async handleCurrentChange(val, old) {
       let self = this;
       // 发送请求
-      this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
+      self.$store.commit('loading/setLoading', true)
       // 被删除
       if(val.removeFlag === 1) {
         self.painFlag = false
@@ -841,19 +841,18 @@ export default {
         }
       }
 
-      clearTimeout(self.timer);
+      clearTimeout(self.timer)
       self.timer = setTimeout(() => {
-        self.loading && self.loading.close();
-        self.loading = null;
-      }, 1200);
+        self.$store.commit('loading/setLoading', false)
+      }, 500);
     },
     // 获取列表数据
     async getDetailData() {
+      let self = this;
       // 发送请求
-      this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
+      self.$store.commit('loading/setLoading', true)
       NProgress.start();
       //console.info(this.dataList);
-      let self = this;
       if (self.type == "father") {
         await this.$axios
           .post("/api/queryque/standardAll", { contrastCustomSearchReq: { qid: Number(self.qid) } }, {
@@ -1027,7 +1026,7 @@ export default {
         }
         NProgress.start();
         if (!this.isFirstMounted) {
-          this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
+          self.$store.commit('loading/setLoading', true)
         }
         this.$axios({
           method: "post",
@@ -1051,11 +1050,10 @@ export default {
         });
         NProgress.done();
         if (!this.isFirstMounted) {
-          clearTimeout(self.timer);
+          clearTimeout(self.timer)
           self.timer = setTimeout(() => {
-            self.loading && self.loading.close();
-            self.loading = null;
-          }, 1200);
+            self.$store.commit('loading/setLoading', false)
+          }, 500);
         }
 
         self.isFirstMounted = false
@@ -1085,7 +1083,7 @@ export default {
         }
         NProgress.start();
         if (!this.isFirstMounted) {
-          this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
+          self.$store.commit('loading/setLoading', true)
         }
         this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.code}`, { srcbarcode: sessionStorage.getItem("srcbarcode") }, {
           loading: false,
@@ -1104,11 +1102,10 @@ export default {
         });
         NProgress.done();
         if (!this.isFirstMounted) {
-          clearTimeout(self.timer);
+          clearTimeout(self.timer)
           self.timer = setTimeout(() => {
-            self.loading && self.loading.close();
-            self.loading = null;
-          }, 1200);
+            self.$store.commit('loading/setLoading', false)
+          }, 500);
         }
 
         self.isFirstMounted = false
@@ -1138,7 +1135,7 @@ export default {
         }
         NProgress.start();
         if(!this.isFirstMounted) {
-          this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
+          self.$store.commit('loading/setLoading', true)
         }
         this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.code}`, { srcbarcode: sessionStorage.getItem("srcbarcode") }, {
           loading: false,
@@ -1157,11 +1154,10 @@ export default {
         });
         NProgress.done();
         if(!this.isFirstMounted) {
-          clearTimeout(self.timer);
+          clearTimeout(self.timer)
           self.timer = setTimeout(() => {
-            self.loading && self.loading.close();
-            self.loading = null;
-          }, 1200);
+            self.$store.commit('loading/setLoading', false)
+          }, 500);
         }
 
         self.isFirstMounted = false
@@ -1191,7 +1187,7 @@ export default {
         }
         NProgress.start();
         if(!this.isFirstMounted) {
-          this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
+          self.$store.commit('loading/setLoading', true)
         }
 
         this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.code}`, { "srcbarcode": sessionStorage.getItem("srcbarcode") }, {
@@ -1211,11 +1207,10 @@ export default {
         });
         NProgress.done();
         if(!this.isFirstMounted) {
-          clearTimeout(self.timer);
+          clearTimeout(self.timer)
           self.timer = setTimeout(() => {
-            self.loading && self.loading.close();
-            self.loading = null;
-          }, 1200);
+            self.$store.commit('loading/setLoading', false)
+          }, 500);
         }
 
         self.isFirstMounted = false

src/views/login/modules/AccountsLogin.vue

@@ -96,7 +96,7 @@ export default {
           this.$message.success("登录成功！");
           //所在单位数据
           this.$store.dispatch("publicData/_getList");
-          this.$router.push("/Home/Home");
+          this.$router.push("/gateway");
         } else {
           this.$message.error("登陆失败");
         }

vue.config.js

@@ -92,13 +92,13 @@ module.exports = {
         // target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
         // target: "http://172.18.108.2:8099/", // 张 认定
         // target: "http://192.168.128.166:8099", // 湖南-张
-        // target: "http://192.168.128.114:8099",  // 湖南-马
+        target: "http://192.168.128.114:8099",  // 湖南-马
         // target: "http://192.168.128.116:8099",  // 湖南-王
         // target: "http://192.168.128.118:8764",  // 湖南-张呈光
         // target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/   ma
         // target: "http://127.0.0.1:8099",
         // target: "http://47.92.225.109:5602",
-        target: "http://www.meetfood.cn:2390/", // 湖南-线上
+        // target: "http://www.meetfood.cn:2390/", // 湖南-线上
 
         ws: true,
         changeOrigin: true,