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

src/api/dswtz/bzxx.js

@@ -20,3 +20,11 @@ export const saveRxbzrw = params =>
   postform(`${base.alyIP}/Rxbzrw/saveRxbzrw`, params);
 export const selectJglist = params =>
   post(`${base.alyIP}/Rxbzrw/selectJglist`, params);
+export const deleteRxbz = params =>
+  post(`${base.alyIP}/rxbz/deleteRxbz`, params);
+export const insertRxbz = params =>
+  postform(`${base.alyIP}/rxbz/insertRxbz`, params);
+export const queryByXxzjbh = params =>
+  postform(`${base.alyIP}/rxbz/queryByXxzjbh`, params);
+export const updateRxbz = params =>
+  postform(`${base.alyIP}/rxbz/updateRxbz`, params);

src/assets/js/transformFormTable.js

@@ -28,6 +28,7 @@ const ifsp = {
 const bdzt = {
     '0': '未比对',
     '1': '比对结果',
+    '2': '比对中',
 }
 export {
     spsftg,

src/router/modules/dswtzxx.js

@@ -112,6 +112,14 @@ const menuLayouts = [
     },
     component: () => import("@/views/dswtzxx/dnaxx/adddna.vue")
   },
+  {
+    path: "/bdjgAddRx",
+    name: "bdjgAddRx",
+    meta: {
+      title: '新增人像比对信息'
+    },
+    component: () => import("@/views/dswtzxx/bdjg/addRx.vue")
+  },
 ];
 
 export default {

src/views/dswtzxx/bdjg/addRx.vue

+<template>
+    <div >
+        <form-compontent
+                :formField="propFormField"
+                :formLabelAligns="formLabelAlign"
+                @submit="submit"
+                :propTitle="title"
+                @removePhoto="removePhoto"
+                pageBs="addsqfbzl"
+                ref="formCompontent"
+                :base64Transform="true"
+                :fileBase64="fileBase64"
+                @onBase64Transform="onBase64Transform"
+        >
+        </form-compontent>
+    </div>
+</template>
+
+<script>
+  import formCompontent from "@c/form.vue";
+
+  import { queryByXxzjbh,insertRxbz,updateRxbz } from "@/api/dswtz/bzxx";
+  export default {
+    name: "addryxx",
+    props:{
+      info:{}
+    },
+    components: {
+      formCompontent,
+    },
+    data() {
+      return {
+        loading: true,
+        fileBase64:{},
+        title: "添加人像比中",
+        propFormField: [
+          {
+            title: "",
+            id: 1,
+            objStr: "",
+            index: 0,
+            data: [
+              {
+                name: "比中人员姓名:",
+                id: "bzrXm",
+                type: "text",
+                value: "",
+                placeholder: "请输入",
+                col: "2",
+              },
+              {
+                name: "比中人员证件号码:",
+                id: "bzrGmsfhm",
+                type: "text",
+                value: "",
+                placeholder: "请输入",
+                col: "2",
+              },
+              {
+                name: "与源图片的相似度:",
+                id: "similarity",
+                type: "text",
+                value: "",
+                placeholder: "请输入",
+                col: "2",
+              },
+              {
+                name: "案事件编号:",
+                id: "asjbh",
+                type: "text",
+                value: "",
+                placeholder: "请输入",
+                col: "2",
+              },
+              {
+                name: "嫌疑人姓名:",
+                id: "xyrXm",
+                type: "text",
+                value: "",
+                placeholder: "请输入",
+                col: "2",
+              },
+              {
+                name: "嫌疑人证件号码:",
+                id: "xyrZjhm",
+                type: "text",
+                value: "",
+                placeholder: "请输入",
+                col: "2",
+              },
+              {
+                name: "人员编号:",
+                id: "rybh",
+                type: "text",
+                value: "",
+                placeholder: "请输入",
+                col: "2",
+              },
+              {
+                name: "比中时间:",
+                id: "bzsjStr",
+                type: "datas",
+                value: "",
+                placeholder: "请输入",
+                col: "2",
+              },
+            ],
+          },
+        ],
+        formLabelAlign: {
+          file:''
+        },
+        type: "",
+        xxzjbh: "",
+        result: "",
+        removeFileXxzjbh: [],
+      };
+    },
+    methods: {
+      onBase64Transform(p){
+        this.fileBase64 = p
+      },
+      removePhoto(item) {
+        let loading = this.$loading({
+          lock: true,
+          text: "正在删除...",
+          spinner: "el-icon-loading",
+          background: "rgba(255, 255, 255, 0.7)",
+        });
+        let id= item.id
+        this.$set(this.formLabelAlign, id, '');
+        loading.close();
+      },
+      submit(params) {
+        let loading = this.$loading({
+          lock: true,
+          text: "正在保存...",
+          spinner: "el-icon-loading",
+          background: "rgba(255, 255, 255, 0.7)",
+        });
+        if(this.$route.query.glxxzjbh){
+          params.append('glxxzjbh',this.$route.query.glxxzjbh)
+          insertRxbz(params).then(res=>{
+            if(res.code){
+              loading.close()
+              this.$router.push({
+                path:'/bzxxRx'
+              })
+            }
+          })
+        }
+        else {
+          params.append('xxzjbh',this.$route.query.xxzjbh)
+          updateRxbz(params).then(res=>{
+            if(res.code){
+              loading.close()
+              this.$router.push({
+                path:'/bzxxRx'
+              })
+            }
+          })
+        }
+
+
+      },
+      handleRemove(val) {
+        this.removeFileXxzjbh.push(val.xxzjbh);
+      },
+      getshuju() {
+        let loading = this.$loading({
+          lock: true,
+          text: "正在加载...",
+          spinner: "el-icon-loading",
+          background: "rgba(255, 255, 255, 0.7)",
+        });
+        var self = this;
+        let params = new FormData();
+        params.append("xxzjbh", this.xxzjbh);
+
+        queryByXxzjbh(params).then((res) => {
+          var result = res.data.rxbz;
+          this.result = result;
+          self.propFormField.forEach((fieldItem) => {
+            if (fieldItem.data && fieldItem.data.length > 0) {
+              fieldItem.data.forEach((i) => {
+                this.$set(this.formLabelAlign, i.id, result[i.id]);
+              });
+            }
+            this.$forceUpdate();
+          });
+          loading.close();
+
+        });
+      },
+    },
+    created() {
+      if (this.$route.query.xxzjbh) {
+        this.title = "添加人像比中";
+        this.xxzjbh = this.$route.query.xxzjbh;
+        this.getshuju();
+      }
+    },
+  };
+</script>
+
+<style scoped lang="scss">
+</style>

src/views/dswtzxx/bzxx/rx.vue

@@ -16,39 +16,52 @@
                 @toInfor="toInfor"
                 ref="rightContent"
                 :transformFormTable="transformFormTable"
+
         >
+            <template #customize="scope">
+                <el-button v-if="scope.scope.row.bdzt=='1'" @click="bjjg(scope.scope)" type="text">比对结果</el-button>
+                <el-button v-else  type="text" disabled>未比对</el-button>
+            </template>
             <template #btnGroup="scope">
                 <el-button @click="dele(scope.scope)" type="text">删除</el-button>
                 <el-button @click="rxbd(scope.scope)" type="text">人像比对</el-button>
+                <el-button v-if="scope.scope.row.bdzt=='比对结果'" @click="bjjg(scope.scope)" type="text">比对结果</el-button>
             </template>
 
         </right-content>
         <el-drawer
-
+                :with-header="false"
                 :visible.sync="table"
                 direction="rtl"
-                size="80%">
-            <el-table :data="gridData">
-                <el-table-column property="asjxgrybh" label="人员编号" ></el-table-column>
-                <el-table-column property="xm" label="姓名"></el-table-column>
-                <el-table-column property="bmch" label="别名"></el-table-column>
-                <el-table-column property="cyzjCyzjmc" label="证件类型"></el-table-column>
-                <el-table-column property="cyzjZjhm" label="证件号码"></el-table-column>
-                <el-table-column property="xbdmStr" label="性别"></el-table-column>
-                <el-table-column property="csrq" label="出生日期"></el-table-column>
-                <el-table-column property="gjdmStr" label="国籍"></el-table-column>
-                <el-table-column property="mzdmStr" label="民族"></el-table-column>
-                <el-table-column property="jgdmStr" label="籍贯"></el-table-column>
-                <el-table-column property="zzmmdmStr" label="政治面貌"></el-table-column>
-                <el-table-column property="xldmStr" label="学历"></el-table-column>
-            </el-table>
+                size="90%">
+            <right-content
+                    :tableOperation="tableOperation"
+                    :tableOperationWidth="tableOperationWidth"
+                    :pageBs="pageBs"
+                    :header="header"
+                    :cxFormData="cxFormData1"
+                    :cxDefaultFormThead="cxDefaultFormThead1"
+                    cxUrl="/Rxbzrw/selectJglist"
+                    @edit="edit"
+                    @dele="dele"
+                    @add="add1"
+                    @toInfor="toInfor"
+                    ref="rightContent1"
+
+            >
+                <template #btnGroup="scope">
+                    <el-button @click="dele1(scope.scope)" type="text">删除</el-button>
+                    <el-button @click="edit1(scope.scope)" type="text">修改</el-button>
+                </template>
+            </right-content>
         </el-drawer>
     </div>
 </template>
 
 <script>
   import rightContent from "@c/ptCxForm_components.vue";
-  import { deleteRxcbrwById,updateRxbdById,selectJglist } from "@/api/dswtz/bzxx";
+  import { deleteRxcbrwById,updateRxbdById,selectJglist,deleteRxbz } from "@/api/dswtz/bzxx";
+  import { deleteRyzpById } from "@/api/dswtz/rxxx.js";
   import {bdzt} from "@/assets/js/transformFormTable.js";
   export default {
     name: "lbxx",
@@ -57,15 +70,19 @@
     },
     data() {
       return {
+        transformFormTable: {bdzt},
         table: false,
         gridData: [],
-        transformFormTable: {bdzt},
         tableOperation:true,
         tableOperationWidth:200,
         header: "人像比中信息",
         pageBs: "dswtzxxlbxx",
         cxFormData: {
-          sfzh: "",
+          page:'1',
+          limit:'10'
+        },
+        cxFormData1: {
+          xxzjbh:'142302000000202111290031709643',
           page:'1',
           limit:'10'
         },
@@ -79,23 +96,28 @@
             placeholder: "请输入",
             col: "3",
           },
-          {
-            name: "文件描述",
-            id: "wjms",
-            type: "text",
-            props: "checkEmpty",
-            value: "",
-            placeholder: "请输入",
-            col: "3",
-          },
-
         ],
         cxDefaultFormThead: [
           {label: "图片名称", prop: "zpDzwjbt"},
           {label: "建立时间", prop: "zpJlsj"},
           {label: "图片描述", prop: "xxlyms"},
+          {label: "比中状态", prop: "bdzt"},
           {label: "登录姓名", prop: "xxdjryXm"},
-          {label: "比中状态", prop: "bdzt",toInfor:true,disabled:true},
+        ],
+        cxDefaultFormThead1: [
+          {label: "人员编号", prop: "asjxgrybh"},
+          {label: "姓名", prop: "xm"},
+          {label: "别名", prop: "bmch"},
+          {label: "证件类型", prop: "cyzjCyzjmc"},
+          {label: "证件号码", prop: "cyzjZjhm"},
+          {label: "性别", prop: "xbdmStr"},
+          {label: "出生日期", prop: "csrq"},
+          {label: "国籍", prop: "gjdmStr"},
+          {label: "民族", prop: "mzdmStr"},
+          {label: "籍贯", prop: "jgdmStr"},
+          {label: "政治面貌", prop: "zzmmdmStr"},
+          {label: "学历", prop: "xldmStr"},
+          {label: "相识度", prop: "similarity"},
         ],
         // 需要转化table的显示
         cxUrl: "/Rxbzrw/getRxrwList",
@@ -172,6 +194,7 @@
             ],
           },
         ],
+        xxzjbh:''
       };
     },
     created() {
@@ -192,14 +215,25 @@
           query: { rybh: this.$route.query.rybh},
         });
       },
+      add1(){
+        this.$router.push({
+          path: "bdjgAddRx",
+          query: { glxxzjbh: this.xxzjbh},
+        });
+      },
       edit(scope) {
         this.$router.push({
           path: "bzxxAddzj",
           query: { xxzjbh: scope.row.xxzjbh },
         });
       },
+      edit1(scope) {
+        this.$router.push({
+          path: "bdjgAddRx",
+          query: { xxzjbh: scope.row.xxzjbh },
+        });
+      },
       dele(scope) {
-        console.log(scope);
         this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -225,11 +259,37 @@
             });
           });
       },
+      dele1(scope) {
+        this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            deleteRxbz({
+              xxzjbh: scope.row.xxzjbh,
+            }).then((res) => {
+              if (res.success && res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功",
+                });
+                this.$refs.rightContent1.doQuery("yes");
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+      },
       toInfor(scope) {
         this.table = true
         let bdzt  = scope.bdzt
         let xxzjbh  = scope.xxzjbh
-        if(bdzt ==="比对结果"){
+        if(bdzt =="1"){
           selectJglist({xxzjbh}).then(res=>{
             if(res.code ===200){
               this.gridData = res.data.rows
@@ -238,6 +298,27 @@
         }
 
       },
+      bjjg(scope){
+        let row = scope.row
+        console.log(row);
+        this.table = true
+        let bdzt  = row.bdzt
+        let xxzjbh  = row.xxzjbh
+        this.xxzjbh = xxzjbh
+        if(bdzt =="比对结果"){
+          selectJglist({xxzjbh}).then(res=>{
+            if(res.code ===200){
+              this.gridData = res.data.rows
+            }
+          })
+        }
+      },
+      toSwtzxxgl(i){
+        this.$router.push({
+          path:'/swtzxxgl',
+          query:{rybh:i}
+        })
+      },
       rxbd(scope){
         let self = this
         let xxzjbh = scope.row.xxzjbh;
@@ -262,6 +343,40 @@
           }
         })
       },
+      deleChildren(row){
+        console.log(row);
+        this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            deleteRyzpById({
+              xxzjbh: row.xxzjbh,
+            }).then((res) => {
+              if (res.success && res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功",
+                });
+                this.$refs.rightContent.doQuery("yes");
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+      },
+      toRyxxrxbj(row){
+        this.$router.push({
+          path:'/ryxxrxbj',
+          query:{rybh:row.asjxgrybh}
+        })
+
+      },
     },
     mounted() {},
   };