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

src/assets/styles/main.scss

@@ -5,7 +5,9 @@
   margin: 0;
   box-sizing: border-box;
 }
-
+body {
+  overflow: hidden;
+}
 .disabel {
   border: none !important;
   background-color: #ecedf1 !important;

src/components/Cascader.vue

 <!--
  * @Author: your name
  * @Date: 2021-11-15 14:15:58
- * @LastEditTime: 2021-11-30 13:45:59
+ * @LastEditTime: 2021-12-09 15:57:53
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \founder_vue\src\components\confrim.vue
 -->
 <template>
-  <div :style="{ width: width + 'rem' }">
-    <el-cascader
-      v-model="form[id]"
-      ref="cascader"
-      :placeholder="placeholder"
-      @focus="placeholder = '请输入'"
-      @blur="placeholder = '请选择'"
-      :clearable="clearable"
-      :options="options"
-      :props="props"
-      :show-all-levels="false"
-      @change="change"
-      filterable
-    >
-    </el-cascader>
-  </div>
+  <el-tooltip
+    class="item"
+    effect="dark"
+    :content="valStr"
+    :disabled="disable"
+    placement="top-start"
+    :open-delay="1000"
+  >
+    <div :style="{ width: width + 'rem' }">
+      <el-cascader
+        v-model="form[id]"
+        ref="cascader"
+        :placeholder="placeholder"
+        @focus="placeholder = '请输入'"
+        @blur="placeholder = '请选择'"
+        :clearable="clearable"
+        :options="options"
+        :props="props"
+        :show-all-levels="false"
+        @change="change"
+        filterable
+      >
+      </el-cascader>
+    </div>
+  </el-tooltip>
 </template>
 <script>
 export default {
@@ -31,8 +40,28 @@ export default {
       options: [],
       casVal: null,
       placeholder: "请选择",
+      valStr: "",
+      valTempStr: "",
     };
   },
+  watch: {
+    form: {
+      handler(val) {
+        //保存选中的label
+        setTimeout(() => {
+          //获取提示的中文
+          this.valStr = $(this.$refs.cascader.$el).find("input").val();
+          //如果是单位，从后截图6位中文然后赋值
+          if (!this.codeName) {
+            this.valTempStr = this.getTemplateStr(this.valStr);
+            $(this.$refs.cascader.$el).find("input").val(this.valTempStr);
+          }
+        }, 0);
+      },
+      immediate: true,
+      deep: true,
+    },
+  },
   props: {
     props: {
       type: Object,
@@ -56,13 +85,38 @@ export default {
     },
     codeName: String,
   },
+  computed: {
+    disable() {
+      if (this.valStr?.trim() == "" || this.form[this.id]?.trim() == "") {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
   methods: {
     change(val) {
       let newVal = val;
       if (!newVal) newVal = "";
       this.$set(this.form, this.id, newVal);
+      //选择完以后关闭下拉版
       this.$refs.cascader.dropDownVisible = false;
     },
+    getTemplateStr(str) {
+      let newStr;
+      let index = str.indexOf("[");
+      if (index >= 0) {
+        if (index > 6) {
+          newStr = "..." + str.slice(index - 6);
+        }
+        if (index <= 6) {
+          newStr = str;
+        }
+      } else {
+        newStr = "";
+      }
+      return newStr;
+    },
     getTreeData(data) {
       if (data && data.length > 0) {
         return data.map((item) => ({

src/plugins/axios.js

 /*
  * @Author: your name
  * @Date: 2021-09-07 09:57:48
- * @LastEditTime: 2021-12-08 17:13:56
+ * @LastEditTime: 2021-12-10 21:07:12
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
@@ -65,6 +65,10 @@ _axios.interceptors.request.use(
 _axios.interceptors.response.use(
   function (response) {
     if (response.headers.token) localStorage.setItem("token", response.headers.token);
+    if (response.config.loading !== false) {
+      hideLoading(response.config.loadingTarget);
+      // console.log(response.config.loadingTarget);
+    }
     if (response.data.code == 401) {
       if (resTimer) clearTimeout(resTimer)
       resTimer = setTimeout(() => {
@@ -77,10 +81,7 @@ _axios.interceptors.response.use(
         }).catch(() => {
         });
       }, 500);
-    }
-    if (response.config.loading !== false) {
-      hideLoading(response.config.loadingTarget);
-      // console.log(response.config.loadingTarget);
+      return;
     }
     // NProgress.done();
     return response;

src/router/index.js

 /*
  * @Author: your name
  * @Date: 2021-09-07 09:57:48
- * @LastEditTime: 2021-12-08 17:20:24
+ * @LastEditTime: 2021-12-10 16:41:15
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\router\index.js

src/store/modules/loading.js

 /*
  * @Author: your name
  * @Date: 2021-11-04 11:12:33
- * @LastEditTime: 2021-12-05 20:34:25
+ * @LastEditTime: 2021-12-09 10:08:11
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\store\modules\zwbj.js
  */
-import { SET_LOADING, SET_JUMPROUTE, SET_PREROUTE, SET_WILLROUTE, SET_SMALLLOADING, SET_LOADINGSD } from "./mutations-types";
+import { SET_LOADING, SET_JUMPROUTE, SET_PREROUTE, SET_WILLROUTE, SET_SMALLLOADING, SET_LOADINGSD, SET_GLASS } from "./mutations-types";
 const state = {
   // 是否处于加载中
   loading: false,
@@ -18,28 +18,33 @@ const state = {
   // 即将要跳转的路由
   willRoute: '',
   // 手动路由加载
-  loading_sd: false
+  loading_sd: false,
+  //全局毛玻璃
+  groundGlassBoo: false,
 };
 
 const mutations = {
-  [SET_LOADING] (state, content) {
+  [SET_LOADING](state, content) {
     state.loading = content
   },
-  [SET_JUMPROUTE] (state, content) {
+  [SET_JUMPROUTE](state, content) {
     state.jumproute = content
   },
-  [SET_PREROUTE] (state, content) {
+  [SET_PREROUTE](state, content) {
     state.preRoute = content
   },
-  [SET_WILLROUTE] (state, content) {
+  [SET_WILLROUTE](state, content) {
     state.willRoute = content
   },
-  [SET_SMALLLOADING] (state, content) {
+  [SET_SMALLLOADING](state, content) {
     state.smallLoading = content
   },
-  [SET_LOADINGSD] (state, content) {
+  [SET_LOADINGSD](state, content) {
     state.loading_sd = content
   },
+  [SET_GLASS](state, content) {
+    state.groundGlassBoo = content
+  },
 };
 
 const actions = {

src/store/modules/mutations-types.js

 /*
  * @Author: your name
  * @Date: 2021-11-04 13:14:49
- * @LastEditTime: 2021-12-06 11:46:37
+ * @LastEditTime: 2021-12-09 10:07:50
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\store\modules\mutations-types.js
@@ -43,3 +43,5 @@ export const SET_LOADINGSD = 'setLoadingSd'
 
 // 是否切换到了人像
 export const SET_ISFACE = 'setIsFace'
+// 记录全局毛玻璃是否开启
+export const SET_GLASS = 'setGlass'

src/utils/requestLoading.js

 /*
  * @Author: your name
  * @Date: 2021-11-26 16:37:59
- * @LastEditTime: 2021-12-07 20:15:55
+ * @LastEditTime: 2021-12-09 17:10:50
  * @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

src/views/Home/Home.vue

@@ -140,7 +140,7 @@ export default {
     },
     logout() {
       this.$axios
-        .get("/login/login/logout")
+        .get("/security/logout")
         .then((res) => {
           if (res.data.code == 200) {
             localStorage.removeItem("token"); //删除名称为“token”的信息。
@@ -158,7 +158,7 @@ export default {
   },
   created() {
     sessionStorage.setItem("crumbs", []);
-    this.userInfo = JSON.parse(localStorage.getItem("userInfo")).user;
+    this.userInfo = JSON.parse(localStorage.getItem("userInfo"));
     console.log(this.userInfo);
   },
 };

src/views/SystemManage/GroupManage.vue

@@ -1333,6 +1333,7 @@ export default {
   },
   activated() {
     this.$bus.on("enter", () => {
+      if (this.$store.state.loading.groundGlassBoo) return
       this.search();
     });
   },
@@ -1345,9 +1346,9 @@ export default {
   mounted() {
     this.search();
     this.$bus.on("enter", () => {
+      if (this.$store.state.loading.groundGlassBoo) return
       this.search();
     });
-    debugger;
     this.$nextTick(() => {
       document.body.appendChild(this.$refs.isShowEditGroupDialog);
       document.body.appendChild(this.$refs.isShowAddUserDialog);

src/views/SystemManage/GroupPermission.vue

@@ -488,7 +488,7 @@
 import "@/icons/group-item.svg";
 import qs from "qs";
 export default {
-  name: "UserPermission",
+  // name: "UserPermission",
   data() {
     return {
       id: "",

src/views/SystemManage/PermissionManage.vue

@@ -295,7 +295,7 @@
           ref="multipleTable"
           :data="groupTableData"
           :key="key2"
-          class="table"
+          class="table groupTable"
         >
           <el-table-column
             prop="name"
@@ -969,6 +969,7 @@ export default {
   },
   activated() {
     this.$bus.on("enter", () => {
+      if (this.$store.state.loading.groundGlassBoo) return
       if (this.isUser) {
         this.searchUser();
       } else {
@@ -984,6 +985,7 @@ export default {
   },
   mounted() {
     this.$bus.on("enter", () => {
+      if (this.$store.state.loading.groundGlassBoo) return
       if (this.isUser) {
         this.searchUser();
       } else {
@@ -1009,6 +1011,9 @@ export default {
 <style scoped lang="scss">
 @import "scss/group";
 @import "scss/permission";
+.groupTable{
+  height: 550px!important;
+}
 .el-table /deep/ {
   .el-tooltip {
     width: 100% !important;

src/views/SystemManage/RoleManage.vue

@@ -491,7 +491,7 @@ export default {
       if (item) {
         let id = this.diyRoleList.length + 20 + "copy";
         var roleitem = {
-          name: item.name + "_copy",
+          name: "请输入名称",
           value: "",
           flag: false,
           code: this.diyRoleList.length,
@@ -520,11 +520,14 @@ export default {
     // 保存
     save() {
       let self = this;
+      //如果是添加角色
       if (this.customAddUser.length > 0) {
+        //如果选的用户不是添加的用户
         if (this.diyRoleItemIndex !== this.customAddUser[0].id) {
           let userObj = this.diyRoleList.find(
             (i) => i.id == this.diyRoleItemIndex
           );
+          debugger;
           //修改
           let obj = {
             id: this.diyRoleItemIndex,
@@ -535,7 +538,7 @@ export default {
           return;
         }
         console.log(this.customAddUser);
-
+        //如果位置在新增的用户就新增
         let name = this.customAddUser[0].value;
         let checkArr = this.checkList;
         let params = {
@@ -571,12 +574,12 @@ export default {
             }, 800);
           } else {
             setTimeout(() => {
-              this.$message.success("新增角色失败!");
+              this.$message.error(res.data.detail);
             }, 800);
           }
         });
       } else {
-        //修改
+        //修改角色
         let userObj = this.diyRoleList.find(
           (i) => i.id == this.diyRoleItemIndex
         );
@@ -589,6 +592,7 @@ export default {
         this.editUserRole(obj);
       }
     },
+    //选中主的全选子的，取消主的取消全部子的
     handleCheckAllChange(boo, id) {
       let obj = this.permissionDataList.find((i) => i.id == id);
       let sonArr = obj.children.map((i) => i.id);
@@ -619,12 +623,15 @@ export default {
                 this.checkList = [];
               }
             }
-
+            //分开button，重构数据
             this.defaultRoleBtns = result.filter((i) => i.defaultFlag == 1);
-            this.diyRoleList = result.filter((i) => {
-              i.value = i.name;
-              return i.defaultFlag == 0;
-            });
+            this.diyRoleList = JSON.parse(JSON.stringify(result)).filter(
+              (i) => {
+                i.value = i.name;
+                i.name = "请输入名称";
+                return i.defaultFlag == 0;
+              }
+            );
             //console.log(1111111, this.diyRoleList);
             let arr = [...this.diyRoleList, ...this.defaultRoleBtns];
             let obj = arr.find((i) => i.id == this.diyRoleItemIndex);
@@ -644,6 +651,13 @@ export default {
         this.$message.error("请选择角色后操作");
         return;
       }
+      if (
+        this.customAddUser.length > 0 &&
+        this.btnCheckList.includes(this.customAddUser[0].id)
+      ) {
+        this.$message.error("请保存后进行删除操作");
+        return;
+      }
       let ids = this.btnCheckList.join(",");
       let boo = this.btnCheckList.find((i) => i == this.diyRoleItemIndex);
       let loading = this.$loading({
@@ -688,7 +702,7 @@ export default {
       let id = this.diyRoleList.length + 20 + "l";
       var roleitem = {
         value: "",
-        name: "自定义" + (this.diyRoleList.length + 1),
+        name: "请输入名称",
         flag: false,
         code: this.diyRoleList.length,
         edit: true,
@@ -748,6 +762,10 @@ export default {
             this.$message.success("更新成功");
           }, 500);
           this.resetEdit();
+        } else {
+          setTimeout(() => {
+            this.$message.error(res.data.detail);
+          }, 500);
         }
       });
     },
@@ -761,6 +779,7 @@ export default {
       this.viewSelect(item);
       this.diyRoleItemIndex = item.id;
     },
+    // 选中的权限
     viewSelect(item) {
       this.checkList =
         (item.permissions && item.permissions.map((i) => i.id)) || [];
@@ -774,7 +793,7 @@ export default {
       this.diyRoleItemIndex = item.id;
       this.viewSelect(item);
     },
-    // 编辑
+    // 编辑以后出现输入框的一系列细节
     editDiyRoleItem(item) {
       let edit = item.edit;
       let index = this.diyRoleList.findIndex((i) => i.id == item.id);

src/views/SystemManage/UserManage.vue

@@ -1118,6 +1118,7 @@ export default {
   },
   activated() {
     this.$bus.on("enter", () => {
+      if (this.$store.state.loading.groundGlassBoo) return;
       this.search();
     });
   },
@@ -1130,6 +1131,7 @@ export default {
   mounted() {
     this.search();
     this.$bus.on("enter", () => {
+      if (this.$store.state.loading.groundGlassBoo) return;
       this.search();
     });
     this.$nextTick(() => {

src/views/SystemManage/UserPermission.vue

@@ -412,7 +412,7 @@
 
 <script>
 export default {
-  name: "UserPermission",
+  // name: "UserPermission",
   data() {
     return {
       id: "",

src/views/SystemManage/scss/group.scss

@@ -223,9 +223,12 @@
     }
   }
 
-  .table-data {
-    height: 580px;
+  .table-data /deep/{
+    height: 530px;
     width: 100%;
+    .el-table {
+      height: 510px!important;
+    }
     .tagsBox {
       display: flex;
       .el-tooltip {
@@ -329,6 +332,7 @@
     }
   }
   .el-table /deep/ {
+
     .is-checked {
       .el-checkbox__inner {
         background: #055fe7;

src/views/SystemManage/scss/user.scss

@@ -181,9 +181,12 @@
       }
     }
   }
-  .table-data {
-    height: 580px;
+  .table-data /deep/ {
+    height: 530px;
     width: 100%;
+    .el-table {
+      height: 510px !important;
+    }
     .tagsBox {
       display: flex;
       .el-tooltip {

src/views/cxyrd/LL.vue

@@ -13,6 +13,11 @@
         <div class="lt_main_left">
           <LLSrc
             :src-data="qid"
+            @sourceObj="
+              (val) => {
+                sourceObj = val;
+              }
+            "
             @switchName="
               (val) => {
                 fingerShowType = val;
@@ -27,7 +32,14 @@
           <ImageEd></ImageEd>
         </div>
         <div class="lt_main_right">
-          <LLCandidate :fingerShowType="fingerShowType"></LLCandidate>
+          <LLCandidate
+            :fingerShowType="fingerShowType"
+            @targetObj="
+              (val) => {
+                targetObj = val;
+              }
+            "
+          ></LLCandidate>
         </div>
       </div>
     </div>
@@ -59,7 +71,7 @@
               串查
             </div>
           </div>
-          <div class="bzitem">
+          <div class="bzitem" style="visibility: hidden">
             <div class="bzname">现场勘验编号：</div>
             <div class="bzvalue">{{ xckybh }}</div>
           </div>
@@ -115,30 +127,31 @@
         <div class="bz-target">
           <div class="bzitem">
             <div class="bzname">比中单位：</div>
-            <div class="bzvalue">{{ bzdw }}</div>
+            <div class="bzvalue">{{ bzr.unitName }}</div>
           </div>
           <div class="bzitem">
             <div class="bzname">比中人：</div>
-            <div class="bzvalue">{{ bzr }}</div>
+            <div class="bzvalue">{{ bzr.name }}</div>
           </div>
           <div class="bzitem">
             <div class="bzname">单位代码：</div>
-            <div class="bzvalue">{{ dwdm }}</div>
+            <div class="bzvalue">{{ bzr.unitCode }}</div>
           </div>
           <div class="bzitem">
             <div class="bzname">比中人身份证号：</div>
-            <div class="bzvalue">{{ bzrsfzh }}</div>
+            <div class="bzvalue">{{ bzr.idCard }}</div>
           </div>
           <div class="bzitem">
             <div class="bzname">比中时间：</div>
-            <div class="bzvalue">{{ bzsj }}</div>
+            <div class="bzvalue">{{ bzr.bzTime }}</div>
           </div>
           <div class="bzitem">
             <div class="bzname">比中人联系电话：</div>
             <el-input
               class="bzphone"
-              v-model="phone"
+              v-model="bzr.phoneNumber"
               placeholder="请输入内容"
+              disabled
             ></el-input>
             <div class="input-error" v-show="isPhoneError">
               <!-- <img src="@/assets/img/inputerror.png" alt=""> -->
@@ -233,10 +246,23 @@ export default {
       xckybh: "",
       rybh: "",
       zw: "",
+      //比中人信息
+      bzr: {
+        bzTime: "",
+        idCard: "",
+        phoneNumber: "",
+        name: "",
+        unitCode: "",
+        unitName: "",
+      },
       // 是否展示认定完成确认框背景
       isShowrdwcDialogBg: false,
       // 是否展示认定完成确认框
       isShowrdwcDialog: false,
+      //当前选中的源对象
+      sourceObj: {},
+      //当前选中的目标对象
+      targetObj: {},
     };
   },
   created() {
@@ -336,27 +362,35 @@ export default {
         return;
       }
       // 3：串查
-      let querytype = 3;
+      let queryType = "3";
       this.$axios({
         method: "post",
         url: "/api/matchcand/affirm/hit",
         data: {
-          affirmstatus,
-          srcseqno,
-          destseqno,
+          srcseqno: parseInt(srcseqno),
+          destseqno: parseInt(destseqno),
           srcbarcode,
           destbarcode,
-          qqid,
-          qid,
-          querytype,
+          qqid: parseInt(qqid),
+          qid: parseInt(qid),
+          queryType,
           affirmDescribe: self.textarea,
+          userName: self.bzr.name,
+          idCard: self.bzr.idCard,
+          tel: self.bzr.phoneNumber,
+          unit: self.bzr.unitName,
+          unitCode: self.bzr.unitCode,
+          affirmtime: new Date(self.bzr.bzTime),
         },
       })
         .then((response) => {
-          // 跟新列表数据
-          self.$bus.emit("updateFinderSource");
-          //console.log(response);
-          this.$message.success("比中成功！");
+          if(response.data.code == 0){
+            // 跟新列表数据
+            self.$bus.emit("updateFinderSource");
+            this.$message.success("比中成功！");
+          }else{
+            this.$message.error(response.data.message)
+          }
         })
         .catch((err) => {
           this.$message.error("比中失败！");
@@ -398,6 +432,7 @@ export default {
             "xh",
             sessionStorage.getItem("destseqno") || ""
           );
+          this.$set(this.bzr, "bzTime", result.time);
         }
       });
     },
@@ -422,33 +457,9 @@ export default {
             }
           }
           this.$set(self.source, "xh", sessionStorage.getItem("zcseq") || "");
+          this.$set(this.bzr, "bzTime", result.time);
         }
       });
-      // this.$axios({
-      //   method: "post",
-      //   url: "/api/user/searchByUserid",
-      //   data: {
-      //     id: id,
-      //   },
-      //   loading: false,
-      // }).then(async (res) => {
-      //   if (res.data.code == 0) {
-      //     let data = res.data.ret[0];
-      //     //console.log(data);
-      //     let dw = await self.$axios({
-      //       method: "get",
-      //       url: "/api/code/unit/one/" + data.userunit,
-      //       loading: false,
-      //     });
-      //     let time = new Date(data.updatetime);
-      //     self.bzsj = Utils.timeStampTurnTime2(time);
-      //     self.bzr = data.userdesc;
-      //     self.dwdm = dw.data.ret.code;
-      //     self.bzdw = dw.data.ret.name;
-      //     self.bzrsfzh = data.idcard;
-      //     self.phone = data.telephone;
-      //   }
-      // });
     },
     /**
      * @description: 比中
@@ -456,12 +467,26 @@ export default {
      * @return {*}
      */
     Bz() {
+      if (
+        (this.targetObj.affirmstatus == 2 ||
+          this.targetObj.affirmstatus == 3) &&
+        (this.sourceObj.affirmstatus == 2 || this.sourceObj.affirmstatus == 3)
+      ) {
+        this.$message.error("已经比中过的数据无法再次比中！");
+        return;
+      }
+
+      let params = JSON.parse(localStorage.getItem("userInfo"));
+      for (let key in this.bzr) {
+        this.bzr[key] = params[key];
+      }
       this.getUserInfo();
       this.getUserInfo2();
       this.asjbh = sessionStorage.getItem("srcbarcode");
       this.xh = sessionStorage.getItem("srcseqno");
       this.rybh = sessionStorage.getItem("destbarcode");
       this.judgeZw(Number(sessionStorage.getItem("destseqno")));
+
       this.isShowbzDialogBg = true;
       this.isShowbzDialog = true;
     },

src/views/cxyrd/QueryConfirm.vue

@@ -25,8 +25,8 @@
             @change="selectUserInfo"
           >
             <el-option
-              v-for="item in userOption"
-              :key="item.userid"
+              v-for="(item,index) in userOption"
+              :key="index"
               :label="item.userdesc"
               :value="item.userid"
             >
@@ -34,10 +34,10 @@
           </el-select>
         </div>
         <div class="display_style">
-          <span>任务号/查询ID：</span>
+          <span>查询ID：</span>
           <el-input
             class="el_input"
-            placeholder="请输入任务号/查询ID"
+            placeholder="请输入查询ID"
             v-model="reqParam.contrastCustomSearchReq.qqid"
           ></el-input>
         </div>
@@ -62,6 +62,9 @@
             range-separator="-"
             start-placeholder="开始时间"
             end-placeholder="结束时间"
+            :picker-options="{
+              disabledDate: disabledDate,
+            }"
           >
           </el-date-picker>
         </div>
@@ -624,6 +627,13 @@ export default {
     },
   },
   methods: {
+    disabledDate(a) {
+      if (a.getTime() > new Date().getTime()) {
+        return true;
+      } else {
+        return false;
+      }
+    },
     // 获取认定列表
     search() {
       this.getParam();
@@ -637,7 +647,7 @@ export default {
               this.list = response.data.ret.list;
               this.reqParam.page.total = response.data.ret.total;
               //console.info("查询结果===>", this.list);
-              this.userInfo = this.getUserInfo(this.list);
+              // this.userInfo = this.getUserInfo(this.list);
             } else {
               // 请求成功无返回值
               this.list = [];
@@ -688,7 +698,7 @@ export default {
           });
         }
       });
-      this.userOption = this.unique(userInfo);
+      // this.userOption = this.unique(userInfo);
       // //console.info("用户信息==>", this.userOption);
     },
     // 用户信息去重

src/views/cxyrd/modules/LLCandidate.vue

@@ -43,7 +43,7 @@
     </div>
     <div class="lt_candidate_number">
       <el-table
-        highlight-current-row
+        :highlight-current-row="isDelete ? false : true"
         @current-change="handleCurrentChange"
         class="lt_candidate_table"
         :data="tableData"
@@ -1037,13 +1037,9 @@ export default {
      * @return {*}
      */
     handleCurrentChange(val, old) {
-      debugger;
       if (!val) return;
-      // document
-      //   .getElementsByClassName("lcurrte")[0]
-      //   .parentElement.parentElement.parentElement.classList.remove(
-      //     "current-row"
-      //   );
+      if (this.isDelete) return;
+      this.$emit("targetObj", val);
       this.targetBh = val.destbarcode;
       let self = this;
       if (val.removeFlag == "1") {

src/views/cxyrd/modules/LLSrc.vue

@@ -470,12 +470,12 @@ export default {
     },
     // 指纹部分 增加边框
     changeStyle(index, imageInfo) {
-      console.log(imageInfo);
       let self = this;
       this.isActive = index;
       //console.log(this.isActive);
       // 存储源数据序号
       if (imageInfo) {
+        this.$emit("sourceObj", imageInfo);
         // 改变数据为点击状态
         self.$set(imageInfo, "clickLog", "1");
         sessionStorage.setItem("srcseqno", imageInfo.seq);

src/views/cxyrd/modules/TTPlam.vue

 <!--
  * @Author: your name
  * @Date: 2021-10-23 17:43:14
- * @LastEditTime: 2021-12-06 10:01:49
+ * @LastEditTime: 2021-12-09 17:28:43
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\cxyrd\modules\TTPlam.vue
@@ -15,6 +15,7 @@
       </p>
       <el-carousel
         @mousewheel.native="rollScroll($event)"
+        @change="change"
         direction="vertical"
         ref="carousel"
         :autoplay="false"
@@ -144,6 +145,7 @@ export default {
     return {
       zwName: "222",
       loadingIndex: 0,
+      changeIndex: 0,
       sourceSrc: "",
       targetSrc: "",
       isShowDetail: false,
@@ -179,6 +181,9 @@ export default {
     });
   },
   methods: {
+    change(val) {
+      this.changeIndex = val;
+    },
     rollScroll(event) {
       let _that = this;
       // chrome、ie使用的wheelDelta，火狐使用detail
@@ -187,16 +192,17 @@ export default {
       if (!_that.timeOut) {
         _that.timeOut = setTimeout(() => {
           _that.timeOut = null;
-          scrollVal > 0
-            ? _that.$refs.carousel.prev()
-            : _that.$refs.carousel.next();
+          if (scrollVal > 0 && _that.changeIndex > 0) {
+            _that.$refs.carousel.prev();
+          } else if (scrollVal <= 0 && _that.changeIndex < 3) {
+            _that.$refs.carousel.next();
+          }
         }, 300);
       } else {
       }
     },
     showDetail(item) {
       this.checkItem = item;
-      console.log(this.checkItem);
       this.isShowDetail = true;
       this.$emit("logbg", true);
     },
@@ -205,6 +211,9 @@ export default {
     $(".plamDetail").remove();
   },
   watch: {
+    isPlam(val) {
+      if (val) this.changeIndex = 0;
+    },
     plamDetail(val) {
       this.isShowDetail = false;
     },

src/views/login/modules/AccountsLogin.vue

@@ -83,7 +83,7 @@ export default {
       let me = this;
       me.btnLoading = true;
       this.$axios({
-        url: "/login/login/myLoginForm",
+        url: "/security/login/myLoginForm",
         method: "post",
         data: qs.stringify(userinfo),
         headers: {

vue.config.js

 /*
  * @Author: your name
  * @Date: 2021-09-07 09:57:48
- * @LastEditTime: 2021-12-08 18:09:43
+ * @LastEditTime: 2021-12-10 21:10:28
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\vue.config.js
@@ -90,8 +90,8 @@ module.exports = {
     proxy: {
       "/api": {
         // target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
-        // target: "http://192.168.128.166:8099/", // 张 认定
-        // target: "http://192.168.128.108:8099", // 湖南-张
+        target: "http://192.168.128.166:8099/", // 张 认定
+        // target: "http://192.168.128.124:8099/", // 湖南-张
         // target: "http://192.168.128.114:8099",  // 湖南-马
         // target: "http://192.168.128.116:8099",  // 湖南-王
         // target: "http://192.168.128.118:8764",  // 湖南-张呈光
@@ -107,17 +107,17 @@ module.exports = {
           "^/api": "/api"
         }
       },
-      "/login": {
-        // target: "http://www.meetfood.cn:2390/", // 登录
-        target: "http://192.168.128.124:8764/", // 登录
-        // target: "http://192.168.128.114:8099", // 登录-马
-        ws: true,
-        changeOrigin: true,
-        pathRewrite: {
-          "^/login": "" //本地
-          // "^/login": "/login" //线上
-        }
-      },
+      // "/login": {
+      //   // target: "http://www.meetfood.cn:2390/", // 登录
+      //   target: "http://192.168.128.124:8764/", // 登录
+      //   // target: "http://192.168.128.114:8099", // 登录-马
+      //   ws: true,
+      //   changeOrigin: true,
+      //   pathRewrite: {
+      //     "^/login": "" //本地
+      //     // "^/login": "/login" //线上
+      //   }
+      // },
       // "/system": {
       //   target: "http://192.168.128.106:8765/security", // 湖南-王
       //   // target: "http://www.meetfood.cn:2390/system", // 湖南-王