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

public/iconfont/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe645;</span>
+                <div class="name">撤销战果</div>
+                <div class="code-name">&amp;#xe645;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe644;</span>
                 <div class="name">复核详情</div>
                 <div class="code-name">&amp;#xe644;</div>
@@ -384,9 +390,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1639552343312') format('woff2'),
-       url('iconfont.woff?t=1639552343312') format('woff'),
-       url('iconfont.ttf?t=1639552343312') format('truetype');
+  src: url('iconfont.woff2?t=1639728205908') format('woff2'),
+       url('iconfont.woff?t=1639728205908') format('woff'),
+       url('iconfont.ttf?t=1639728205908') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -413,6 +419,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-chexiaozhanguo"></span>
+            <div class="name">
+              撤销战果
+            </div>
+            <div class="code-name">.icon-chexiaozhanguo
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-fuhexiangqing"></span>
             <div class="name">
               复核详情
@@ -909,6 +924,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-chexiaozhanguo"></use>
+                </svg>
+                <div class="name">撤销战果</div>
+                <div class="code-name">#icon-chexiaozhanguo</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-fuhexiangqing"></use>
                 </svg>
                 <div class="name">复核详情</div>

public/iconfont/iconfont.css

 @font-face {
   font-family: "iconfont"; /* Project id 2961960 */
-  src: url('iconfont.woff2?t=1639552343312') format('woff2'),
-       url('iconfont.woff?t=1639552343312') format('woff'),
-       url('iconfont.ttf?t=1639552343312') format('truetype');
+  src: url('iconfont.woff2?t=1639728205908') format('woff2'),
+       url('iconfont.woff?t=1639728205908') format('woff'),
+       url('iconfont.ttf?t=1639728205908') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-chexiaozhanguo:before {
+  content: "\e645";
+}
+
 .icon-fuhexiangqing:before {
   content: "\e644";
 }

public/iconfont/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "26523809",
+      "name": "撤销战果",
+      "font_class": "chexiaozhanguo",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
+    {
       "icon_id": "26504089",
       "name": "复核详情",
       "font_class": "fuhexiangqing",

src/components/SelectCode.vue

 <!--
  * @Author: your name
  * @Date: 2021-11-25 10:15:01
- * @LastEditTime: 2021-12-17 10:18:53
+ * @LastEditTime: 2021-12-17 17:25:57
  * @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
@@ -17,7 +17,7 @@
       :multiple="multiple"
       default-first-option
       :popper-append-to-body="false"
-      :loading="options.length <= 0"
+      :loading="options.length <= 0 && loadingIndex == 0"
       :placeholder="placeholder"
       @focus="placeholder = '请输入'"
       @blur="placeholder = '请选择'"
@@ -55,6 +55,7 @@ export default {
       checkList: [],
       newForm: this.form,
       allData: [],
+      loadingIndex: 0,
     };
   },
   props: {
@@ -124,6 +125,7 @@ export default {
     },
     getOptions() {
       this.$axios.get(this.codeUrl).then((res) => {
+        this.loadingIndex++;
         if (
           (res.data.code == 0 || res.data.code == 200) &&
           (res.data.message == "success" || res.data.info == "success")
@@ -144,6 +146,9 @@ export default {
   mounted() {
     this.getOptions();
   },
+  beforeDestroy() {
+    this.loadingIndex = 0;
+  },
 };
 </script>
 <style>

src/router/modules/index.js

 /*
  * @Author: your name
  * @Date: 2021-09-07 09:58:13
- * @LastEditTime: 2021-12-17 14:26:13
+ * @LastEditTime: 2021-12-17 15:39:53
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\router\modules\index.js
@@ -206,5 +206,23 @@ export default [
       auth: "5"
     },
     component: () => import("@/views/rgrd/rgLL.vue")
+  },
+  {
+    path: "/rgLT",
+    name: "rgLT",
+    meta: {
+      title: "人工认定界面",
+      auth: "5"
+    },
+    component: () => import("@/views/rgrd/rgLT.vue")
+  },
+  {
+    path: "/rgTL",
+    name: "rgTL",
+    meta: {
+      title: "人工认定界面",
+      auth: "5"
+    },
+    component: () => import("@/views/rgrd/rgTL.vue")
   }
 ];

src/views/SystemManage/GroupManage.vue

@@ -137,7 +137,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column :width="width1">
+        <el-table-column :width="width4">
           <template slot-scope="scope">
             <div class="set-btn" @click="setRole(scope.row)">角色设置</div>
           </template>
@@ -160,6 +160,23 @@
             </div>
           </template>
         </el-table-column>
+          <el-table-column
+            prop="permissionNames"
+            label="权限"
+            :width="width6"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <div
+                v-for="(item, index) in scope.row.permissionNames &&
+                scope.row.permissionNames.split(',')"
+                :key="index"
+              >
+                {{ index > 0 ? "/" : "" }}
+                {{ item }}
+              </div>
+            </template>
+          </el-table-column>
         <el-table-column prop="status" label="启用状态" width="auto">
           <template slot-scope="scope">
             <div v-if="scope.row.status === 0" class="circle-red"></div>
@@ -670,6 +687,7 @@ export default {
     let w2 = window.innerWidth;
     this.height = (this.height * w2) / w1;
     this.width1 = (this.width1 * w2) / w1;
+    this.width6 = (this.width6 * w2) / w1;
     this.width2 = (this.width2 * w2) / w1;
     this.width3 = (this.width3 * w2) / w1;
     this.width4 = (this.width4 * w2) / w1;
@@ -716,7 +734,8 @@ export default {
       width3: 90,
       width2: 400,
       width1: 200,
-      width4: 150,
+      width6: 300,
+      width4: 120,
       height: 550,
       btnwidth: 200,
       unitname: "",

src/views/bzxxgl/BzxxsfOpt.vue

@@ -27,7 +27,7 @@
                     </svg>
                 </div>
             </div>
-            <el-dropdown-menu slot="dropdown" class="select-list-content" style="margin-top: 0px;">
+            <el-dropdown-menu slot="dropdown" class="select-list-content">
                 <div v-for="item in curOpt" class="select-list-content-item" @click="clictItem(item,$event)">
                     <svg class="icon opt-select-right-svg" aria-hidden="true"
                          style="margin-right: 5px;width: 20px;height: 20px;">
@@ -61,7 +61,7 @@ export default {
       SHYX: {name: '审核有效', value: '2', icon: '#icon-shenheyouxiao'},
       // CXSH: {name: "重新审核", value: "1", icon: "#icon-zhongxinshenhe"},
       JRZG: {name: '计入战果', value: '1', icon: '#icon-jiruzhanguo'},
-      CXZG: {name: '撤销战果', value: '2', icon: '#icon-bujizhanguo'},
+      CXZG: {name: '撤销战果', value: '2', icon: '#icon-chexiaozhanguo'},
       BJZG: {name: '不计战果', value: '0', icon: '#icon-bujizhanguo'},
       SBST: {name: '上报省厅', value: '3', icon: '#icon-shangbaoshengxingzhuan'},
       SBGAB: {name: '上报公安部', value: '3', icon: '#icon-shangbaoshengxingzhuan'},
@@ -162,7 +162,6 @@ export default {
       let _that = this
       _that.curOpt = []
       let shzt = _that.getShState()
-      console.log("shzt",shzt)
       switch (shzt) {
         case _that.SH_TYPE.FH.value    :
           _that.curOpt.push(_that.FH)
@@ -229,7 +228,7 @@ export default {
       }
       if (_path) {
         let query = {
-          isFromSh: true,
+          isFromSh: 'true',
           isSh: isSh,
           shxx: JSON.stringify(_that.shInfo)
         }
@@ -248,13 +247,12 @@ export default {
         _that.$refs.dropdown.visible = false
       }
       //TODO... 业务逻辑
-      PrintLog('clictItem', JSON.stringify(type))
       switch (type.name) {
         case _that.FH.name:
-          _that.goFhOrSh(false)
+          _that.goFhOrSh('false')
           break
         case _that.SH.name:
-          _that.goFhOrSh(true)
+          _that.goFhOrSh('true')
           break
         case _that.CHEXSH.name:
         case _that.SHWX.name:
@@ -301,7 +299,7 @@ export default {
       }
     },
     goNextAction(type, desc) {
-      PrintLog('goNextAction-type', type)
+      // PrintLog('goNextAction-type', type)
       let _that = this
       switch (type.name) {
         case _that.CHEXSH.name:
@@ -348,7 +346,6 @@ export default {
       ruleForm.username = username
 
       PrintLog(TITLE + '请求参数', ruleForm)
-      // PrintLog(TITLE + '接口', 'udateShzt')
 
       bzxxSh(_that, ruleForm).then(res => {
         PrintLog(TITLE + '返回结果', res, _that.TAG)
@@ -502,6 +499,8 @@ export default {
     }
 
     .select-list-content {
+        margin-top: 0px;
+
         width: 126px;
         /*height: 100px;*/
         display: block;
@@ -525,7 +524,7 @@ export default {
         position: relative;
         z-index: 9999;
         /*background: black;*/
-        margin-left: 20px;
+        padding-left: 20px;
         display: flex;
         align-items: center;
         justify-content: left;

src/views/bzxxgl/fhxxLT.vue

@@ -269,6 +269,7 @@ export default {
   created () {
     console.log(this.$route)
     this.id = this.$route.params.id
+    // PrintLog('query', this.$route.query)
     if (this.$route.query.isFromSh) {
       this.isFromSh = this.$route.query.isFromSh
     }
@@ -288,10 +289,10 @@ export default {
   methods: {
     getShOrFhName () {
       let _that = this
-      if (_that.isFromSh) {
-        return _that.isSh ? '审核' : '复核'
+      if (_that.isFromSh  === 'true') {
+        return _that.isSh  === 'true'? '审核' : '复核'
       } else {
-        return '复核'
+        return '审核'
       }
     },
     /**
@@ -417,6 +418,7 @@ export default {
       }
       let tip = isPass ? '通过' : '不通过'
       let yj = isPass ? '' : '  意见：' + _that.fhyj
+      yj = '' // 暂时不显示
       _that.$confirm(
         '是否确定执行 "' + tip + '" 操作?' + yj,
         '提示',
@@ -445,7 +447,7 @@ export default {
      */
     noPassChange () {
       let self = this
-      if (self.isFromSh) {
+      if (self.isFromSh=== 'true') {
         self.doSh(false)
         return
       }
@@ -473,7 +475,7 @@ export default {
      */
     passChange () {
       let self = this
-      if (self.isFromSh) {
+      if (self.isFromSh=== 'true') {
         self.doSh(true)
         return
       }
@@ -540,7 +542,7 @@ export default {
 
       let shzt  // 1 审核无效 2 审核有效
       let fhzt  //1 代表 复核无效，2 代表 复核有效
-      if (_that.isSh) {
+      if (_that.isSh=== 'true') {
         shzt = isPass ? '2' : '1'
         fhzt = '2'
       } else {

src/views/bzxxgl/fhxxTL.vue

@@ -295,6 +295,7 @@ export default {
   created () {
     console.log(this.$route)
     this.id = this.$route.params.id
+    // PrintLog('query', this.$route.query)
     if (this.$route.query.isFromSh) {
       this.isFromSh = this.$route.query.isFromSh
     }
@@ -309,10 +310,10 @@ export default {
   methods: {
     getShOrFhName () {
       let _that = this
-      if (_that.isFromSh) {
-        return _that.isSh ? '审核' : '复核'
+      if (_that.isFromSh  === 'true') {
+        return _that.isSh  === 'true'? '审核' : '复核'
       } else {
-        return '复核'
+        return '审核'
       }
     },
     /**
@@ -430,6 +431,7 @@ export default {
       }
       let tip = isPass ? '通过' : '不通过'
       let yj = isPass ? '' : '  意见：' + _that.fhyj
+      yj = '' // 暂时不显示
       _that.$confirm(
         '是否确定执行 "' + tip + '" 操作?' + yj,
         '提示',
@@ -458,7 +460,7 @@ export default {
      */
     noPassChange () {
       let self = this
-      if (self.isFromSh) {
+      if (self.isFromSh=== 'true') {
         self.doSh(false)
         return
       }
@@ -486,7 +488,7 @@ export default {
      */
     passChange () {
       let self = this
-      if (self.isFromSh) {
+      if (self.isFromSh=== 'true') {
         self.doSh(true)
         return
       }
@@ -553,7 +555,7 @@ export default {
 
       let shzt  // 1 审核无效 2 审核有效
       let fhzt  //1 代表 复核无效，2 代表 复核有效
-      if (_that.isSh) {
+      if (_that.isSh=== 'true') {
         shzt = isPass ? '2' : '1'
         fhzt = '2'
       } else {

src/views/bzxxgl/scss/bzxxsh.scss

@@ -453,16 +453,16 @@ $tableHeight: var(--tableHeight, 450px);
   }
 
   .tip-history {
-    margin-left: 5px;
-    width: 12px;
-    height: 12px;
+    margin-left: 6px;
+    width: 16px;
+    height: 16px;
   }
 
 
   .cxfh-dialog {
     z-index: 99;
     position: absolute;
-    right: 175px;
+    right: 195px;
     top: 280px;
     width: 400px;
     height: 326px;

src/views/cxyrd/modules/Recognition_dialog.vue

@@ -21,7 +21,7 @@
             type="text"
             placeholder="请输入内容"
             v-model="ruleForm.originCode"
-            maxlength="22"
+            maxlength="23"
             show-word-limit
           >
           </el-input>
@@ -39,7 +39,7 @@
             type="text"
             placeholder="请输入内容"
             v-model="ruleForm.targetCode"
-            maxlength="22"
+            maxlength="23"
             show-word-limit
           >
           </el-input>
@@ -64,6 +64,7 @@
 </template>
 
 <script>
+import qs from "qs";
 export default {
   name: "tjddl",
   props: {},
@@ -101,19 +102,36 @@ export default {
       this.$refs.ruleForm.validate((boo) => {
         if (boo) {
           let form = this.ruleForm;
-          //人人查重
-          if (form.originCodeType == "0" && form.targetCodeType == "0") {
-            self.$router.pushToTab("/rgTT");
-            //人案倒查
-          } else if (form.originCodeType == "0" && form.targetCodeType == "1") {
-            self.$router.pushToTab("/rgTL");
-            //案人正查
-          } else if (form.originCodeType == "1" && form.targetCodeType == "0") {
-            self.$router.pushToTab("/rgLT");
-            //案案串查
-          } else if (form.originCodeType == "1" && form.targetCodeType == "1") {
-            self.$router.pushToTab("/rgLL");
-          }
+          self
+            .$axios({
+              method: "post",
+              url: "/api/queryIdentification/isExist",
+              data: JSON.stringify(form),
+              headers: {
+                "Content-Type": "application/json;charset=UTF-8",
+              },
+            })
+            .then((res) => {
+              if (res.data.code == 0 && res.data.message == 'success'){
+                //人人查重
+                if (form.originCodeType == "0" && form.targetCodeType == "0") {
+                  self.$router.pushToTab("/rgTT");
+                  //人案倒查
+                } else if (form.originCodeType == "0" && form.targetCodeType == "1") {
+                  self.$router.pushToTab("/rgTL");
+                  //案人正查
+                } else if (form.originCodeType == "1" && form.targetCodeType == "0") {
+                  self.$router.pushToTab("/rgLT");
+                  //案案串查
+                } else if (form.originCodeType == "1" && form.targetCodeType == "1") {
+                  self.$router.pushToTab("/rgLL");
+                }
+                self.dialogVisible = false
+              } else{
+                this.$message.error(res.data.message)
+              }
+            });
+          
         }
       });
     },

vue.config.js

 /*
  * @Author: your name
  * @Date: 2021-09-07 09:57:48
- * @LastEditTime: 2021-12-17 23:04:51
+ * @LastEditTime: 2021-12-16 14:43:29
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\vue.config.js
@@ -91,6 +91,7 @@ module.exports = {
       "/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.121:8099/", // 湖南-张
         // target: "http://192.168.128.114:8099",  // 湖南-马
         // target: "http://192.168.128.116:8099",  // 湖南-王
         // target: "http://192.168.128.118:8764",  // 湖南-张呈光
@@ -98,8 +99,8 @@ module.exports = {
         // target: "http://127.0.0.1:8099",
         // target: "http://47.92.225.109:5602",
         // target: "http://www.meetfood.cn:2390", // 湖南-线上
-        target:"http://zwpt.xzclub.top:9333/", 
-        // target: "http://192.168.128.115:8099",  // 江
+        // target:"http://zwpt.xzclub.top:9333/",
+        target: "http://192.168.128.115:8099",  // 江
         ws: true,
         changeOrigin: true,
         pathRewrite: {
@@ -130,9 +131,9 @@ module.exports = {
 
       "/security": {
         //target: "http://192.168.128.106:8765", // 湖南-王
-        target: "http://192.168.128.121:8765", // 湖南-张
+        // target: "http://192.168.128.121:8765", // 湖南-张
         // target: "http://www.meetfood.cn:2390", // 湖南-王
-        // target: "http://zwpt.xzclub.top:9333",
+        target: "http://zwpt.xzclub.top:9333",
         ws: true,
         changeOrigin: true,
         pathRewrite: {