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

src/api/ajxscxbd.js

+import { get, post, postform } from "@/utils/http.js";
+import base from "@/api/base";
+
+//指纹比中详细信息
+export const xczwDetail = params =>
+  post(`${base.alyIP}/zwbh/queryByXxzjbh`, params);
+// /zwbz/queryAll
+//DNA比中详细信息
+export const dnaDetail = params =>
+  post(`${base.alyIP}/dnabz/queryByXxzjbh`, params);
+// /dnabz/queryAll
+//YSTR比对详细信息
+export const ystrDetail = params =>
+  post(`${base.alyIP}/ystrbz/queryByXxzjbh`, params);
+// /ystrbz/queryAllAsj
+// /ystrbz/queryAllRy
+//现场人像串查详细信息
+export const xcrxcDetail = params =>
+  post(`${base.alyIP}/rxbd/queryByXxzjbh`, params);
+// /rxbd/queryAll
+//现场足迹串查详细信息
+export const xczjcDetail = params =>
+  post(`${base.alyIP}/zjbzxx/queryByXxzjbh`, params);
+//人像比对
+// /rxbz/queryAll
+//新增人像比对
+export const rxbdInsert = params =>
+  postform(`${base.alyIP}/rxbz/insertRxbz`, params);
+//修改人像比对
+export const rxbdUpdate = params =>
+  postform(`${base.alyIP}/rxbz/updateRxbz`, params);
+//删除人像比对
+export const rxbdDelete = params =>
+  post(`${base.alyIP}/rxbz/deleteRxbz`, params);
+//人像比对详情
+export const rxdbDetail = params =>
+  post(`${base.alyIP}/rxbz/queryByXxzjbh`, params);
+
+

src/components/form.vue

@@ -1001,7 +1001,7 @@
         <slot name="xyrList"></slot>
       </div>
     </div>
-    <div class="button" id="spbtn" :style="pageBs == '' ? 'display:none' : 'display:block'">
+    <div class="button" id="spbtn">
       <el-button @click="submit()" class="finish">保存</el-button>
     </div>
     <!-- <div class="prive_picture" v-if="filePreviewFlag" @click="closefilePreview">

src/router/index.js

@@ -19,6 +19,7 @@ import rlqbxsRoutes from "./modules/rlqbxs";
 import xsjsdbRoutes from "./modules/xsjsdb";
 import zjclRoutes from "./modules/zjcl";
 import userAuthRoutes from "./modules/userAuth";
+import ajxscxbdRoutes from "./modules/ajxscxbd";
 
 
 const originalPush = VueRouter.prototype.push;
@@ -51,6 +52,7 @@ const mainRouters = [
   xsjsdbRoutes,
   zjclRoutes,
   userAuthRoutes,
+  ajxscxbdRoutes,
   {
     path: "*",
     name: "error",

src/router/modules/ajxscxbd.js

+import menuLayout from "@/layout/menuLayout.vue";
+const menuLayouts = [
+  {
+    path: "/queryXczw",
+    name: "queryXczw",
+    meta: {
+      title: '现场指纹比中信息'
+    },
+    component: () => import("@/views/ajxscxbd/xczw/queryXczw.vue")
+  },
+  {
+    path: "/detailXczw",
+    name: "detailXczw",
+    meta: {
+      title: '指纹比中详细信息'
+    },
+    component: () => import("@/views/ajxscxbd/xczw/detailXczw.vue")
+  },
+  {
+    path: "/queryDnabz",
+    name: "queryDnabz",
+    meta: {
+      title: '现场DNA比中信息'
+    },
+    component: () => import("@/views/ajxscxbd/xcdna/queryDnabz.vue")
+  },
+  {
+    path: "/detailDnabz",
+    name: "detailDnabz",
+    meta: {
+      title: '现场DNA详细信息'
+    },
+    component: () => import("@/views/ajxscxbd/xcdna/detailDnabz.vue")
+  },
+  {
+    path: "/detailXcystr",
+    name: "detailXcystr",
+    meta: {
+      title: '现场YSTR比中信息详情'
+    },
+    component: () => import("@/views/ajxscxbd/xcystr/detailXcystr.vue")
+  },
+  {
+    path: "/queryXcystrCase",
+    name: "queryXcystrCase",
+    meta: {
+      title: '现场YSTR比中详情'
+    },
+    component: () => import("@/views/ajxscxbd/xcystr/queryXcystrCase.vue")
+  },
+  {
+    path: "/queryXcystrPeople",
+    name: "queryXcystrPeople",
+    meta: {
+      title: '现场YSTR比中详情'
+    },
+    component: () => import("@/views/ajxscxbd/xcystr/queryXcystrPeople.vue")
+  },
+  {
+    path: "/queryXcrx",
+    name: "queryXcrx",
+    meta: {
+      title: '现场人像串查信息'
+    },
+    component: () => import("@/views/ajxscxbd/xcrx/queryXcrx.vue")
+  },
+  {
+    path: "/detailXcrx",
+    name: "detailXcrx",
+    meta: {
+      title: '现场人像串查详情'
+    },
+    component: () => import("@/views/ajxscxbd/xcrx/detailXcrx.vue")
+  },
+  {
+    path: "/queryXczj",
+    name: "queryXczj",
+    meta: {
+      title: '现场足迹串查信息'
+    },
+    component: () => import("@/views/ajxscxbd/xczj/queryXczj.vue")
+  },
+  {
+    path: "/detailXczj",
+    name: "detailXczj",
+    meta: {
+      title: '现场足迹串查详情'
+    },
+    component: () => import("@/views/ajxscxbd/xczj/detailXczj.vue")
+  },
+  {
+    path: "/queryRxbd",
+    name: "queryRxbd",
+    meta: {
+      title: '现场人像比对'
+    },
+    component: () => import("@/views/ajxscxbd/rxbd/queryRxbd.vue")
+  },
+  {
+    path: "/addRxbd",
+    name: "addRxbd",
+    meta: {
+      title: '人像比对信息'
+    },
+    component: () => import("@/views/ajxscxbd/rxbd/addRxbd.vue")
+  },
+  {
+    path: "/detailRxbd",
+    name: "detailRxbd",
+    meta: {
+      title: '人像比对详情'
+    },
+    component: () => import("@/views/ajxscxbd/rxbd/detailRxbd.vue")
+  }
+
+];
+
+export default {
+  path: "/right",
+  component: menuLayout,
+  children: [...menuLayouts]
+};
\ No newline at end of file

src/views/ajxscxbd/xczw/detailXczw.vue

+<template>
+  <div class="Content" id="hmxsDetail">
+    <right-content
+      :cxQueryField="cxQueryField"
+      :pageObject="pageObject"
+      :pageFooterProps="pageFooterProps"
+      labelWidth="110px"
+      title="关注人员详情"
+    >
+    </right-content>
+  </div>
+</template>
+
+<script>
+import rightContent from "@c/PersonInfor.vue";
+import { selectGzryById } from "@/api/xxtk/gzry.js";
+import axios from "@/utils/http.js";
+export default {
+  name: "detailGzry",
+  components: {
+    rightContent,
+  },
+  data() {
+    return {
+      cxQueryField: [
+        {
+          label: "信息编号:",
+          prop: "xxzjbh",
+          col: "3",
+        },
+        {
+          label: "关联信息编号:",
+          prop: "glxxXxzjbh",
+          col: "3",
+        },
+        {
+          label: "案事件编号:",
+          prop: "asjbh",
+          col: "3",
+        },
+        {
+          label: "工作中可疑线索标识号类型:",
+          prop: "gzzkyxsbshdm",
+          type: "codeTree",
+          codeTree: "CODE_DXZP_FWBSHS",
+          col: "3",
+        },
+        {
+          label: "工作中可疑线索标识号:",
+          prop: "gzzkyxsbsh",
+          col: "3",
+        },
+        {
+          label: "可疑依据:",
+          prop: "kyyj",
+          col: "3",
+        },
+      ],
+      pageFooterProps: [
+        {
+          label: "填表单位:",
+          prop: "xxdjdwGajgmc",
+          col: "3",
+        },
+        {
+          label: "填表人:",
+          prop: "xxdjryXm",
+          col: "3",
+        },
+        {
+          label: "填表时间:",
+          prop: "djsj",
+          col: "3",
+        },
+      ],
+      defaultProps: {
+        parent: "parentId", // 父级唯一标识
+        value: "id", // 唯一标识
+        label: "label", // 标签显示
+        children: "children", // 子级
+      },
+      pageObject: {},
+      xxzjbh: "",
+      breadcrumbList: [
+        {
+          name: "刑嫌列控管理",
+          to: "/queryGzry",
+          isActive: false,
+        },
+        {
+          name: "工作中可疑线索列表",
+          to: "/queryGzzkyxs",
+          isActive: false,
+        },
+        {
+          name: "工作中可疑线索详情",
+          to: "/detailGzzkyxs",
+          isActive: true,
+        },
+      ],
+    };
+  },
+  mounted() {},
+  methods: {
+    getInfor() {
+      let _this = this;
+      selectGzryById({
+        xxzjbh: _this.xxzjbh,
+      }).then((res) => {
+        var result = res.data.rows;
+        _this.filterTreeCode(result);
+      });
+    },
+    filterTreeCode(obj) {
+      let _this = this;
+      let arr = [..._this.cxQueryField, ..._this.pageFooterProps];
+      console.log(arr);
+      arr.forEach((i) => {
+        if (i.type && i.type == "codeTree") {
+          axios
+            .get(`JsonData/${i.codeTree}.json`)
+            .then((codRes) => {
+              let value = _this.queryTree(codRes.data.rows, obj[i.prop]);
+              _this.$set(_this.pageObject, i.prop, value);
+            })
+            .catch((err) => {
+              console.log(err);
+            });
+        } else {
+          _this.$set(_this.pageObject, i.prop, obj[i.prop]);
+        }
+      });
+      console.log(_this.pageObject);
+    },
+    queryTree(tree, id) {
+      let stark = [];
+      stark = stark.concat(tree);
+      while (stark.length) {
+        const temp = stark.shift();
+        if (temp[this.defaultProps.children]) {
+          stark = stark.concat(temp[this.defaultProps.children]);
+        }
+        if (temp[this.defaultProps.value] === id) {
+          return temp[this.defaultProps.label];
+        }
+      }
+      return "";
+    },
+  },
+  created() {
+    this.$store.commit("user/SET_Breadcrumb", this.breadcrumbList);
+    this.xxzjbh = this.$route.query.xxzjbh;
+    this.getInfor();
+  },
+};
+</script>
+<style scoped lang="scss">
+</style>

src/views/ajxscxbd/xczw/queryXczw.vue

+<template>
+  <div class="Content">
+    <right-content
+      :pageBs="pageBs"
+      :header="header"
+      :cxFormData="cxFormData"
+      :cxQueryField="cxQueryField"
+      :cxDefaultFormThead="cxDefaultFormThead"
+      :cxUrl="cxUrl"
+      @toInfor="toInfor"
+    ></right-content>
+  </div>
+</template>
+
+<script>
+import rightContent from "@c/ptCxForm_components.vue";
+export default {
+  name: "xczw",
+  components: {
+    rightContent,
+  },
+  data() {
+    return {
+      header: "案件线索查询比对", //头部标题 (模块第一个页面需要)
+      pageBs: "queryXczw", //页面名称
+      cxFormData: {
+        //查询条件
+        // lkPdbz: "2",
+        limit: 10,
+        page: 1,
+        // xm: "",
+        // zjhm: "",
+        // xbdm: "",
+        // mzdm: "",
+        // hjdzXzqhdm: "",
+        // sfyxdsPdbz: "",
+        // sfazbbdxdzPdbz: "",
+        // xzgzrylbdm: "",
+        // xzgzrygzjbdm: "",
+        // xxdjdwGajgjgdm: "",
+        // xzgzryzt: "",
+      },
+      cxQueryField: [
+        //查询条件
+        {
+          name: "姓名",
+          id: "xm",
+          type: "text",
+          value: "",
+          placeholder: "",
+          col: "3",
+        },
+        {
+          name: "证件号码",
+          id: "zjhm",
+          type: "text",
+          value: "",
+          placeholder: "",
+          col: "3",
+        },
+        {
+          name: "性别代码",
+          id: "xbdm",
+          type: "codeTreeDialog",
+          props: [], //字典弹框需要的字段
+          value: "",
+          col: "3",
+          codeOptions: [],
+          codeTree: "CODE_XB",
+        },
+        {
+          name: "民族代码",
+          id: "mzdm",
+          type: "codeTreeDialog",
+          props: [], //字典弹框需要的字段
+          value: "",
+          col: "3",
+          codeOptions: [],
+          codeTree: "CODE_XB",
+        },
+        {
+          name: "户籍",
+          id: "hjdzXzqhdm",
+          type: "codeTreeDialog",
+          props: [], //字典弹框需要的字段
+          value: "",
+          col: "3",
+          codeOptions: [],
+          codeTree: "CODE_XB",
+        },
+        {
+          name: "是否有吸毒史",
+          id: "sfyxdsPdbz",
+          type: "codeTreeDialog",
+          props: [], //字典弹框需要的字段
+          value: "",
+          col: "3",
+          codeOptions: [],
+          codeTree: "CODE_XB",
+        },
+        {
+          name: "是否携带艾滋病毒",
+          id: "sfazbbdxdzPdbz",
+          type: "codeTreeDialog",
+          props: [], //字典弹框需要的字段
+          value: "",
+          col: "3",
+          codeOptions: [],
+          codeTree: "CODE_XB",
+        },
+        {
+          name: "人员类别",
+          id: "xzgzrylbdm",
+          type: "codeTreeDialog",
+          props: [], //字典弹框需要的字段
+          value: "",
+          col: "3",
+          codeOptions: [],
+          codeTree: "CODE_XB",
+        },
+        {
+          name: "关注级别",
+          id: "xzgzrygzjbdm",
+          type: "codeTreeDialog",
+          props: [], //字典弹框需要的字段
+          value: "",
+          col: "3",
+          codeOptions: [],
+          codeTree: "CODE_XB",
+        },
+        {
+          name: "纳嫌单位",
+          id: "xxdjdwGajgjgdm",
+          type: "text",
+          value: "",
+          placeholder: "",
+          col: "3",
+        },
+
+        {
+          name: "刑侦关注人员状态",
+          id: "xzgzryzt",
+          type: "text",
+          value: "",
+          placeholder: "",
+          col: "3",
+        },
+      ],
+      cxDefaultFormThead: [
+        //table 展示
+        {
+          label: "姓名",
+          prop: "xm",
+        },
+        {
+          /*table默认得表头*/
+          label: "证件号码",
+          prop: "zjhm",
+          width: "200",
+        },
+        {
+          label: "性别代码",
+          prop: "xbdm",
+        },
+        {
+          label: "人员类别代码",
+          prop: "xzgzrylbdm",
+        },
+        {
+          label: "关注级别代码",
+          prop: "xzgzrygzjbdm",
+        },
+        {
+          label: "纳嫌单位",
+          prop: "xxdjdwGajgjgdm",
+        },
+        {
+          label: "刑侦关注人员状态",
+          prop: "xzgzryzt",
+        },
+      ],
+      cxUrl: "/zwbz/queryAll", //列表查询接口
+      Menu: [
+        //头部导航(模块第一个页面需要)
+        {
+          id: "queryXczw",
+          label: "现场指纹比中信息",
+          index: "queryXczw",
+          auth: "M0101",
+          className: "iconfont iconrizhi",
+          disabled: false,
+        },
+        {
+          id: "queryXcdna",
+          label: "现场DNA比中信息",
+          index: "queryXcdna",
+          auth: "M0102",
+          className: "iconfont icongongnengfuwu",
+          disabled: false,
+        },
+        {
+          id: "queryXcystrPeople",
+          label: "根据YSTR查询相关人员",
+          index: "queryXcystrPeople",
+          auth: "M0103",
+          className: "iconfont iconfangwen",
+          disabled: false,
+        },
+        {
+          id: "queryXcystrCase",
+          label: "根据YSTR查询相关时间",
+          index: "queryXcystrCase",
+          auth: "M0101",
+          className: "iconfont iconrizhi",
+          disabled: false,
+        },
+        {
+          id: "queryXcrx",
+          label: "人像串查信息",
+          index: "queryXcrx",
+          auth: "M0102",
+          className: "iconfont icongongnengfuwu",
+          disabled: false,
+        },
+        {
+          id: "queryXczj",
+          label: "足迹串查信息",
+          index: "queryXczj",
+          auth: "M0103",
+          className: "iconfont iconfangwen",
+          disabled: false,
+        },
+        {
+          id: "queryRxbd",
+          label: "人像比对",
+          index: "queryYdtx",
+          auth: "M0101",
+          className: "iconfont iconrizhi",
+          disabled: false,
+        },
+      ],
+      leftMenus: [
+        //左侧导航(模块第一个页面需要)
+        {
+          id: "queryXczw",
+          label: "案件线索查询比对",
+          newAuth: "M01",
+          index: "2",
+          className: "iconfont icongongnengfuwu",
+          hasChildren: true,
+          children: [
+            {
+              id: "queryXczw",
+              label: "现场指纹比中信息",
+              index: "queryXczw",
+              auth: "M0101",
+              className: "iconfont iconrizhi",
+              disabled: false,
+            }
+          ],
+        },
+      ],
+      propFormFieldLK: [{
+        title: "",
+        id: 1,
+        objStr: "",
+        index: 0,
+        data: [
+          {
+            name: "列控单位:",
+            id: "lkdwGajgjgdm",
+            type: "codeTree",
+            codeTree: "QGCODE_UNIT",
+            codeOptions: [],
+            value: "",
+            col: "3",
+          },
+          {
+            name: "列控时间:",
+            id: "lksj",
+            type: "dates",
+            value: "",
+            col: "3",
+          },
+          {
+            name: "列控原因:",
+            id: "lkyyJyqk",
+            type: "textarea",
+            value: "",
+            placeholder: "请填写列控原因",
+            col: "3",
+          },
+        ],
+      },],
+      formLabelAlignLK: {},
+      propFormFieldCK: [{
+        title: "",
+        id: 1,
+        objStr: "",
+        index: 0,
+        data: [
+          {
+            name: "撤控单位:",
+            id: "cxdwGajgjgdm",
+            type: "codeTree",
+            codeTree: "QGCODE_UNIT",
+            codeOptions: [],
+            value: "",
+            col: "3",
+          },
+          {
+            name: "列控时间:",
+            id: "lksj",
+            type: "dates",
+            value: "",
+            col: "3",
+          },
+          {
+            name: "列控原因:",
+            id: "cxyyJyqk",
+            type: "textarea",
+            value: "",
+            placeholder: "请填写列控原因",
+            col: "3",
+          },],
+      },],
+      formLabelAlignCK: {},
+    };
+  },
+  created() {
+    this.$store.commit("user/SET_Menu", this.Menu);
+    this.$store.commit("user/SET_LeftMenu", this.leftMenus);
+    this.$store.commit("user/SET_Header", this.header);
+  },
+  mounted() {
+    
+  },
+  methods: {
+    add() {
+      this.$router.push("addGzry");
+    },
+    edit() {
+      this.$router.push({ path: "/addGzry", query: { xxzjbh: this.xxzjbh } });
+    },
+    dele() {
+      this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          deleteGzry({
+            xxzjbh: obj.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: "已取消删除",
+          });
+        });
+    },
+    toInfor(obj) {
+      this.$router.push({
+        path: "/detailGzry",
+        query: {
+          xxzjbh: obj.xxzjbh,
+        },
+      });
+    },
+  },
+};
+</script>
+<style>
+.el-dialog__body {
+  padding: 10px 15px !important;
+}
+.rightContent .el-input__inner,
+#formCommonPage .el-input__inner {
+  height: 32px;
+  line-height: 32px;
+  font-family: inherit;
+}
+.el-table__header-wrapper th,
+.el-table__header-wrapper tr {
+  background: #f4f6f7;
+}
+.rightContent .el-input__icon,
+#formCommonPage .el-input__icon,
+.el-input__suffix-inner {
+  line-height: 36px;
+}
+.rightContent .el-range-separator {
+  position: relative;
+  top: -4px;
+}
+.rightContent .el-textarea__inner,
+#formCommonPage .el-textarea__inner {
+  width: 100%;
+  font-family: inherit;
+}
+.rightContent .el-range-input,
+#formCommonPage .el-range-input {
+  vertical-align: top;
+}
+.rightContent .el-date-editor .el-range__close-icon {
+  margin-top: -4px;
+}
+.rightContent .el-form-item__error {
+  left: calc(66% - 27px);
+  top: 12px;
+}
+.success-row {
+  background-color: #fbf9f4 !important;
+}
+.Content .el-input,
+.Content .el-date-editor--daterange.el-input__inner {
+  width: 100% !important;
+}
+</style>
+<style scoped lang="scss">
+@import "@/assets/styles/rightContent.scss";
+</style>