Merge branch 'dev_xzeq_xz' of http://39.99.224.27:9022/changchao/founder_vue into dev_xzeq_xz

9ab2ed16 · yuhao · f32d7aa3 · 70bb6a2c · 9ab2ed16 · 9ab2ed16
Commit 9ab2ed16 authored Sep 27, 2023 by yuhao
21 changed files
--- a/package-lock.json
+++ b/package-lock.json
@@ -2719,9 +2719,9 @@
      }
    },
    "base64-arraybuffer": {
-      "version": "0.2.0",
+      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
-      "integrity": "sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ=="
+      "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ=="
    },
    "base64-js": {
      "version": "1.3.1",
@@ -4161,11 +4161,11 @@
      }
    },
    "css-line-break": {
-      "version": "2.0.1",
+      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz",
-      "integrity": "sha512-gwKYIMUn7xodIcb346wgUhE2Dt5O1Kmrc16PWi8sL4FTfyDj8P5095rzH7+O8CTZudJr+uw2GCI/hwEkDJFI2w==",
+      "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
      "requires": {
-        "base64-arraybuffer": "^0.2.0"
+        "utrie": "^1.0.2"
      }
    },
    "css-loader": {
@@ -6414,12 +6414,12 @@
      }
    },
    "html2canvas": {
-      "version": "1.3.2",
+      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.3.2.tgz",
+      "resolved": "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz",
-      "integrity": "sha512-4+zqv87/a1LsaCrINV69wVLGG8GBZcYBboz1JPWEgiXcWoD9kroLzccsBRU/L9UlfV2MAZ+3J92U9IQPVMDeSQ==",
+      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
      "requires": {
-        "css-line-break": "2.0.1",
+        "css-line-break": "^2.1.0",
-        "text-segmentation": "^1.0.2"
+        "text-segmentation": "^1.0.3"
      }
    },
    "htmlparser2": {
@@ -7278,7 +7278,7 @@
    "kindeditor": {
      "version": "4.1.10",
      "resolved": "https://registry.npmjs.org/kindeditor/-/kindeditor-4.1.10.tgz",
-      "integrity": "sha512-tZb3OJ+XqGUfnQJNtOZqfc+PJ45I+ciNowjEB1lTVrOBCYXzoLA0l/W1cBEm0ihuDuyq5FFiG8hFsX/PPW6AIg=="
+      "integrity": "sha1-u7u6neOOE/hWggW+dl73M5621RU="
    },
    "launch-editor": {
      "version": "2.2.1",
@@ -10098,7 +10098,7 @@
    },
    "relation-graph": {
      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/relation-graph/-/relation-graph-1.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/relation-graph/-/relation-graph-1.1.0.tgz",
      "integrity": "sha512-bPBjFOStki5kJqVDkcoTVg1pEg8tztsHk2XLjyc7i16RQFoZcAU0SJRwlAtG9ClLVNWlBYACxOS1lap9Ri3i6A==",
      "requires": {
        "html2canvas": "^1.0.0-rc.5",
@@ -11673,11 +11673,11 @@
      }
    },
    "text-segmentation": {
-      "version": "1.0.2",
+      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/text-segmentation/-/text-segmentation-1.0.3.tgz",
-      "integrity": "sha512-uTqvLxdBrVnx/CFQOtnf8tfzSXFm+1Qxau7Xi54j4OPTZokuDOX8qncQzrg2G8ZicAMOM8TgzFAYTb+AqNO4Cw==",
+      "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
      "requires": {
-        "utrie": "^1.0.1"
+        "utrie": "^1.0.2"
      }
    },
    "text-table": {
@@ -12213,18 +12213,11 @@
      "dev": true
    },
    "utrie": {
-      "version": "1.0.1",
+      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz",
-      "integrity": "sha512-JPaDXF3vzgZxfeEwutdGzlrNoVFL5UvZcbO6Qo9D4GoahrieUPoMU8GCpVpR7MQqcKhmShIh8VlbEN3PLM3EBg==",
+      "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
      "requires": {
-        "base64-arraybuffer": "^1.0.1"
+        "base64-arraybuffer": "^1.0.2"
-      },
-      "dependencies": {
-        "base64-arraybuffer": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz",
-          "integrity": "sha512-vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA=="
-        }
      }
    },
    "uuid": {
@@ -12403,7 +12396,7 @@
    },
    "vue-loader-v16": {
      "version": "npm:vue-loader@16.8.3",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
+      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
      "dev": true,
      "optional": true,
@@ -12415,7 +12408,7 @@
      "dependencies": {
        "ansi-styles": {
          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
          "dev": true,
          "optional": true,
@@ -12425,7 +12418,7 @@
        },
        "chalk": {
          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
          "dev": true,
          "optional": true,
@@ -12436,7 +12429,7 @@
        },
        "color-convert": {
          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
          "dev": true,
          "optional": true,
@@ -12446,7 +12439,7 @@
        },
        "loader-utils": {
          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
          "dev": true,
          "optional": true,

--- a/public/file/qtyp.xls
+++ b/public/file/qtyp.xls
--- a/src/api/base.js
+++ b/src/api/base.js
@@ -50,6 +50,7 @@ if (
  base.alyIP14 = 'http://xzxt-zhyy.dsj.xz/xzxt' // 西藏 人档车档
  base.alyIP17 = '/xzxtzhyyreport/apiSk' // 侦查脑图时空
  base.alyIP18 = 'http://xzxt-zhyy.dsj.xz/ajbz'
+  base.alyIP19 = "/xzxtzhyyreport/apiXzxt";
 }

--- a/src/api/dictionaryCode.js
+++ b/src/api/dictionaryCode.js
@@ -18,3 +18,44 @@ export const EsAsjQuery = params =>
 export const esAsjQuery = params =>
  post(`${base.alyIP2}/newAsjbz/esAsjQuery`, params);
+export const getQgTarKsh = params =>
+  postJson(`${base.alyIP19}/common/getQgTarKsh`, params);
+export const getQsTarKsh = params =>
+  postJson(`${base.alyIP19}/common/getQsTarKsh`, params);
+export const loginByZjhm = params =>
+  post(`${base.alyIP19}/loginByZjhm`, params);
+// 人员线索
+export const getKyRyList = params =>
+  postJson(`${base.alyIP}/dwkyxs/getKyRyList`, params);
+// 号码线索
+export const getKyDhList = params =>
+  postJson(`${base.alyIP}/dwkyxs/getKyDhList`, params);
+// 机动车线索
+export const getKyClList = params =>
+  postJson(`${base.alyIP}/dwkyxs/getKyClList`, params);
+// 银行卡线索
+export const getKyYhList = params =>
+  postJson(`${base.alyIP}/dwkyxs/getKyYhList`, params);
+// 人员统计
+export const getKyDhTj = params =>
+  postJson(`${base.alyIP}/dwkyxs/getKyDhTj`, params);
+// 机动车统计
+export const getKyClTj = params =>
+  postJson(`${base.alyIP}/dwkyxs/getKyClTj`, params);
+//银行卡统计
+export const getYhClTj = params =>
+  postJson(`${base.alyIP}/dwkyxs/getYhClTj`, params);
+// 号码统计
+export const getKyRyTj = params =>
+  postJson(`${base.alyIP}/dwkyxs/getKyRyTj`, params);
\ No newline at end of file
--- a/src/components/SearchGraph.vue
+++ b/src/components/SearchGraph.vue
@@ -330,7 +330,7 @@ export default {
                      let base = encodeURIComponent(
                        secret.Encrypt(
                          JSON.stringify(
-                            JSON.parse(sessionStorage.getItem("user"))
+                            JSON.parse(sessionStorage.getItem("userInfo"))
                          )
                        )
                      );
@@ -348,7 +348,7 @@ export default {
                      let base = encodeURIComponent(
                        secret.Encrypt(
                          JSON.stringify(
-                            JSON.parse(sessionStorage.getItem("user"))
+                            JSON.parse(sessionStorage.getItem("userInfo"))
                          )
                        )
                      );
@@ -378,7 +378,7 @@ export default {
                      let base = encodeURIComponent(
                        secret.Encrypt(
                          JSON.stringify(
-                            JSON.parse(sessionStorage.getItem("user"))
+                            JSON.parse(sessionStorage.getItem("userInfo"))
                          )
                        )
                      );

--- a/src/components/ptCxForm_components.vue
+++ b/src/components/ptCxForm_components.vue
@@ -3503,6 +3503,9 @@ export default {
        let formData = {};
        if (this.pageASs == "queryZjQt") {
          formData.taskId = row.rwid;
+          formData.gxmqd = self.formData.gxmqd;
+          formData.qtdxMin = self.formData.qtdxMin;
+          formData.qtdxMax =  self.formData.qtdxMax
        } else {
          formData.ssrwbh = row.xxzjbh;
        }

--- a/src/router/modules/ztyp.js
+++ b/src/router/modules/ztyp.js
@@ -283,6 +283,14 @@ const menuLayouts = [
    },
    component: () => import("@/views/ztyp/ztypNew/queryWlsfNew.vue")
  },
+  {
+    path: "/dtjjs",
+    name: "dtjjs",
+    meta: {
+      title: '多条件检索',
+    },
+    component: () => import("@/views/ksh/dtjjs.vue")
+  },
 ];
 export default [{
@@ -318,6 +326,30 @@ export default [{
    component: () => import("@/views/ztyp/addYpjg.vue")
  },
  {
+    path: "/gtgxKsh",
+    name: "gtgxKsh",
+    meta: {
+      title: '可视化',
+    },
+    component: () => import("@/views/ksh/gtgxKsh.vue")
+  },
+  {
+    path: "/ksh",
+    name: "ksh",
+    meta: {
+      title: '可视化',
+    },
+    component: () => import("@/views/ksh/ksh.vue")
+  },
+  {
+    path: "/dytjXs",
+    name: "dytjXs",
+    meta: {
+      title: '地域统计',
+    },
+    component: () => import("@/views/ksh/dytl.vue")
+  },
+  {
    path: "/detailYpjg",
    name: "detailYpjg",
    meta: {

--- a/src/views/brainPhoto/brainWffzkyfwbshQQ.vue
+++ b/src/views/brainPhoto/brainWffzkyfwbshQQ.vue
@@ -441,7 +441,7 @@ export default {
          });
        });
    },
-    goDetail(scope) {
+    toBrai(scope) {
      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
      var idcard = userInfo.identitycard;
      // var params = { type: "KyWx", kybh: this.form.wxh, userId: idcard, };

--- a/src/views/cbyp/yhjyxxfx.vue
+++ b/src/views/cbyp/yhjyxxfx.vue
@@ -59,10 +59,10 @@
    <el-dialog
      title="新增资金流转"
      :visible.sync="dialogVisible"
-      width="40%"
+      width="28%"
      center
    >
-      <div style="margin: 20px 0 0 0">
+      <div style="margin: 20px 0 0 0" class="addXz">
        <el-form :inline="true" :model="examineInfo" class="demo-form-inline">
          <el-row>
            <el-col :span="20" :offset="2">
@@ -72,7 +72,23 @@
                  v-model="examineInfo.zwmc"
                  :autosize="{ minRows: 3 }"
                  style="width: 300px"
-                  placeholder="请输入"
+                  placeholder="请输入任务名称"
+                ></el-input>
+              </el-form-item>
+                <el-form-item label="案事件编号:" style="width：100%">
+                <el-input
+                  type="text"
+                  v-model="examineInfo.asjbh"
+                  style="width: 400px"
+                  placeholder="请输入案事件编号"
+                ></el-input>
+              </el-form-item>
+                <el-form-item label="关注人员编号:" style="width：100%">
+                <el-input
+                  type="text"
+                  v-model="examineInfo.gzrybh"
+                  style="width: 300px"
+                  placeholder="请输入关注人员编号"
                ></el-input>
              </el-form-item>
            </el-col>
@@ -113,6 +129,8 @@ export default {
      dialogVisible: false,
      examineInfo: {
        zwmc: "",
+        asjbh: "",
+        gzrybh: "",
      },
      header: "主题研判",
      pageBs: "queryZj",
@@ -458,7 +476,11 @@ export default {
 </style>
 <style scoped lang="scss">
 @import "@/assets/styles/rightContent.scss";
+.addXz {
+  label.el-form-item__label {
+    width: 113px !important;
+}
+}
 .hbyps {
  width: 82px;
  height: 24px;

--- a/src/views/hbyprw/hbyprw/detailHbyp.vue
+++ b/src/views/hbyprw/hbyprw/detailHbyp.vue
@@ -437,7 +437,7 @@
            <template slot-scope="{ row }">
              <span class="cz" @click="editXs(row)">修改</span>
              <span class="cz" @click="delXs(row)">删除</span>
-              <span class="cz" @click="goDetailWrap(row)">GPS分析</span>
+              <span class="cz" @click="goDetailWrap(row, 'gps')">GPS分析</span>
              <span
                class="cz"
                v-if="
@@ -481,13 +481,17 @@
              >
              <span
                class="cz"
-                v-if="row.xslx == '0007' || row.xslx == '0008' && !row.isResult"
+                v-if="
+                  row.xslx == '0007' || (row.xslx == '0008' && !row.isResult)
+                "
                @click="goDetailWrap(row, 'fqbd')"
                >发起比对</span
              >
              <span
                class="cz"
-                v-if="(row.xslx == '0007' || row.xslx == '0008') && row.isResult"
+                v-if="
+                  (row.xslx == '0007' || row.xslx == '0008') && row.isResult
+                "
                @click="goDetailWrap(row, 'result')"
                >比对结果</span
              >
@@ -1029,7 +1033,9 @@
        <div style="text-align: center; padding: 0 0 19px 0">
          <span slot="footer" class="dialog-footer">
            <el-button @click="dialogVisiblResult = false">取 消</el-button>
-            <el-button type="primary" @click="dialogVisiblResult = false">确 定</el-button>
+            <el-button type="primary" @click="dialogVisiblResult = false"
+              >确 定</el-button
+            >
          </span>
        </div>
      </div>
@@ -1076,7 +1082,7 @@ export default {
  },
  data() {
    return {
-      dialogVisiblResult:false,
+      dialogVisiblResult: false,
      xslxDict: [],
      zczlbh: "",
      fpbh: "",
@@ -1710,7 +1716,7 @@ export default {
  },
  methods: {
    goDetailWrap(item, type) {
-      debugger
+      debugger;
      if (type == "nt") {
        let type = "";
        if (item.xslx == "0001") {
@@ -1737,6 +1743,7 @@ export default {
        // var params = {type:'KySj',kybh:item.row.kyxshmYdhm, userId: '142302198901012417'}
        this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
      } else if (type == "sk") {
+        let path = "";
        let identitycard = JSON.parse(
          sessionStorage.getItem("userInfo")
        ).identitycard;
@@ -1758,15 +1765,13 @@ export default {
        let rxtoken = sessionStorage.getItem("rxtoken")
          ? sessionStorage.getItem("rxtoken").replace(/\+/g, "%2B")
          : "";
-        let path = `http://xzxt-zhyy.dsj.xz/zjlfx/#/jump?path=/zjlfx&token=${encodeURIComponent(
+        let path = `http://xzxt-zhyy.dsj.xz/zjlfx/#/jumpZjl?path=/zjlfx&token=${rxtoken}`;
-          rxtoken
-        )}`;
        window.open(path, "_blank");
      } else if (type == "hd") {
        let rxtoken = sessionStorage.getItem("rxtoken")
          ? sessionStorage.getItem("rxtoken").replace(/\+/g, "%2B")
          : "";
-        let path = `http://xzxt-zhyy.dsj.xz/telephone/#/jump?path=/queryHdfx&token${rxtoken}`;
+        let path = `http://xzxt-zhyy.dsj.xz/telephone/#/jump?path=/queryHdfx&token=${rxtoken}`;
        window.open(path, "_blank");
      } else if (type == "da") {
        let path = `${
@@ -1782,11 +1787,23 @@ export default {
        let path = `http://xzxt-zhyy.dsj.xz/rxbd/#/jump?token=${rxtoken}&path=makeCompare`;
        window.open(path, "_blank");
      } else if (type == "fqbd") {
-        this.$set(item,'isResult',true)
+        this.$set(item, "isResult", true);
        this.$message("发起比对成功");
      } else if (type == "result") {
-        debugger
+        this.dialogVisiblResult = true;
-        this.dialogVisiblResult = true
+      } else if (type == "gps") {
+        let identitycard = JSON.parse(
+          sessionStorage.getItem("userInfo")
+        ).identitycard;
+        let key =
+          "maplogin" +
+          encrypt.creattimeBumderNYR(new Date()).split("-").join("");
+        let vi =
+          "map_vues" +
+          encrypt.creattimeBumderNYR(new Date()).split("-").join("");
+        let skjm = encrypt.skEncrypt(identitycard, key.trim(), vi.trim());
+        let path = `http://xzxt-zhyy.dsj.xz/gps/#/jumplogin?idcard=${skjm}`;
+        window.open(path, "_blank");
      }
    },
    toDetail(url, PARAMS) {

--- a/src/views/hbyprw/queryHcypgzt.vue
+++ b/src/views/hbyprw/queryHcypgzt.vue
@@ -20,9 +20,19 @@
            :on-remove="handleRemove"
            :auto-upload="false"
          >
-            <span class="hbyps">文件上传</span>
+            <span class="hbyps">研判要素导入</span>
          </el-upload>
-          <span class="hbyps" @click="exportFile()">导出</span>
+          <span class="hbyps" @click="exportFile()">研判要素导出</span>
+        </template>
+        <template #cxyhz>
+          <span
+            v-for="item in gzList"
+            :key="item.id"
+            @click="godetail(item)"
+            style="color: #007aff; font-size: 16px"
+          >
+            {{ item.name }}
+          </span>
        </template>
      </right-content>
    </div>
@@ -33,6 +43,7 @@
 import rightContent from "@c/ptCxForm_components.vue";
 import { importExcel, downloadExcel } from "@/api/hbyp/hbyp.js";
 import request from "@/utils/http";
+import encrypt from "@/utils/encry.js";
 import qs from "qs";
 import base from "@/api/base";
 export default {
@@ -127,12 +138,69 @@ export default {
          disabled: false,
        },
      ],
+      gzList: [
+        {
+          name: "话单分析",
+          id: "hdfx",
+          path: "queryHdfx",
+          url: "http://xzxt-zhyy.dsj.xz/telephone/#/jump",
+        },
+        {
+          name: "资金流分析",
+          id: "zjlfx",
+          path: "zjlfx",
+          url: "http://xzxt-zhyy.dsj.xz/zjlfx/#/jumpZjl",
+        },
+        {
+          name: "人像比对",
+          id: "rxbd",
+          path: "makeCompare",
+          url: "http://xzxt-zhyy.dsj.xz/rxbd/#/jump",
+        },
+        {
+          name: "GPS数据分析",
+          id: "gps",
+          path: "home",
+          url: "http://xzxt-zhyy.dsj.xz/gps/#/jumplogin?idcard=",
+        },
+        {
+          name: "时空大数据分析",
+          id: "skdsj",
+          path: "/jumplogin",
+          url: "http://xzxt-zhyy.dsj.xz/skdsj/#/jumplogin?idcard=",
+        },
+      ],
    };
  },
  created() {
    this.$store.commit("user/SET_Menu", this.Menu);
  },
  methods: {
+    godetail(item) {
+      let identitycard = JSON.parse(
+        sessionStorage.getItem("userInfo")
+      ).identitycard;
+      let key =
+        "maplogin" + encrypt.creattimeBumderNYR(new Date()).split("-").join("");
+      let vi =
+        "map_vues" + encrypt.creattimeBumderNYR(new Date()).split("-").join("");
+      let skjm = encrypt.skEncrypt(identitycard, key.trim(), vi.trim());
+      let rxtoken = sessionStorage.getItem("rxtoken")
+        ? sessionStorage.getItem("rxtoken").replace(/\+/g, "%2B")
+        : "";
+      let path = "";
+      if (item.id == "hdfx" || item.id == "zjlfx") {
+        path = `${item.url}?token=${rxtoken}&path=${item.path}`;
+      } else if (item.id == "rxbd") {
+        // path = `${item.url}?token=${rxtoken}&path=${item.path}`;
+        path = `${item.url}?token=${rxtoken}&path=${item.path}`;
+      } else if (item.id == "gps") {
+        path = `${item.url}${skjm}`;
+      } else if (item.id == "skdsj") {
+        path = `${item.url}${skjm}`;
+      }
+      path ? window.open(path, "_blank") : "";
+    },
    downMb() {
      window.open(`file/ypys.xlsx`, "_self");
    },
@@ -264,7 +332,7 @@ export default {
  cursor: pointer;
 }
 .hbyps {
-  width: 64px;
+  width: 80px;
  height: 24px;
  background: #ffffff;
  border: 1px solid #007aff;

--- a/src/views/ksh/components/params.js
+++ b/src/views/ksh/components/params.js
+export const ryxsQueryField = [
+  {
+    name: "案件编号",
+    id: "asjbh",
+    type: "text",
+    value: "",
+    placeholder: "请输入",
+    col: "3",
+  },
+  {
+    name: "证件号码",
+    id: "zjhm",
+    type: "text",
+    value: "",
+    placeholder: "请输入",
+    col: "3",
+  },
+  {
+    name: "可疑依据",
+    id: "kyyj",
+    type: "text",
+    value: "",
+    placeholder: "请输入",
+    col: "3",
+  },
+  {
+    name: "线索出现地域",
+    id: "kyyj",
+    type: "text",
+    value: "",
+    placeholder: "请输入",
+    col: "3",
+  },
+  {
+    name: "登记开始时间",
+    id: "kssj",
+    id2: "jssj",
+    type: "zdyDateTh",
+    value: "",
+    col: "3",
+  },
+]
+export const ryxsFromData = {
+  asjbh: '',
+  zjhm: '',
+  kyyj: '',
+  kssj: '',
+  jssj: '',
+  flxx: [],
+  page: 1,
+  limit: 10,
+}
+export const hmxsQueryField = [
+  {
+    name: "案件编号",
+    id: "asjbh",
+    type: "text",
+    value: "",
+    placeholder: "请输入",
+    col: "3",
+  },
+  {
+    name: "手机号码",
+    id: "ydhm",
+    type: "text",
+    value: "",
+    placeholder: "请输入",
+    col: "3",
+  },
+  {
+    name: "可疑依据",
+    id: "kyyj",
+    type: "text",
+    value: "",
+    placeholder: "请输入",
+    col: "3",
+  },
+  {
+    name: "登记开始时间",
+    id: "kssj",
+    id2: "jssj",
+    type: "zdyDateTh",
+    value: "",
+    col: "3",
+  },
+]
+export const hmxsFromData = {
+  asjbh: '',
+  ydhm: '',
+  kyyj: '',
+  kyyj: '',
+  kssj: '',
+  jssj: '',
+  flxx: [],
+  page: 1,
+  limit: 10,
+}
+export const jdcxsQueryField = [
+  {
+    name: "案件编号",
+    id: "asjbh",
+    type: "text",
+    value: "",
+    placeholder: "请输入",
+    col: "3",
+  },
+  {
+    name: "车牌号码",
+    id: "cphm",
+    type: "text",
+    value: "",
+    placeholder: "请输入",
+    col: "3",
+  },
+  {
+    name: "可疑依据",
+    id: "kyyj",
+    type: "text",
+    value: "",
+    placeholder: "请输入",
+    col: "3",
+  },
+  {
+    name: "登记开始时间",
+    id: "kssj",
+    id2: "jssj",
+    type: "zdyDateTh",
+    value: "",
+    col: "3",
+  },
+]
+export const jdcxsFromData = {
+  asjbh: '',
+  cphm: '',
+  kyyj: '',
+  kssj: '',
+  jssj: '',
+  flxx: [],
+  page: 1,
+  limit: 10,
+}
+export const yhkxsQueryField = [
+  {
+    name: "案件编号",
+    id: "asjbh",
+    type: "text",
+    value: "",
+    placeholder: "请输入",
+    col: "3",
+  },
+  {
+    name: "银行卡号",
+    id: "kh",
+    type: "text",
+    value: "",
+    placeholder: "请输入",
+    col: "3",
+  },
+  {
+    name: "可疑依据",
+    id: "kyyj",
+    type: "text",
+    value: "",
+    placeholder: "请输入",
+    col: "3",
+  },
+  {
+    name: "登记开始时间",
+    id: "kssj",
+    id2: "jssj",
+    type: "zdyDateTh",
+    value: "",
+    col: "3",
+  },
+]
+export const yhkxsFromData = {
+  asjbh: '',
+  kh: '',
+  kyyj: '',
+  flxx: [],
+  kssj: '',
+  jssj: '',
+  page: 1,
+  limit: 10,
+}
\ No newline at end of file
--- a/src/views/ksh/components/ptCxForm_components.vue
+++ b/src/views/ksh/components/ptCxForm_components.vue
--- a/src/views/ksh/components/table.vue
+++ b/src/views/ksh/components/table.vue
+<template>
+  <div>
+    <!-- 分类信息 -->
+    <div
+      v-loading="loading"
+      tooltip-effect="dark"
+      element-loading-text="数据加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="flxx"
+      v-if="flxxList.length > 0"
+    >
+      <div class="sxWrap">
+        <div class="cxjgsxTitle">查询结果筛选</div>
+        <div class="sxcontent">
+          <div v-for="item in flxxList" :key="item.name">
+            <div class="flTitle">{{ item.name }}：</div>
+            <div class="radioGroup">
+              <div class="left-radio">
+                <el-radio-group v-model="radio" class="none">
+                  <el-radio
+                    :label="item2.name"
+                    v-for="(item2, key) in item.list"
+                    :key="key"
+                    @change="getRadioValue($event, item.type)"
+                    ><span
+                      class="overflow inline width120"
+                      :title="item2.name"
+                      >{{ item2.name }}</span
+                    ><span class="inline">({{ item2.num }})</span></el-radio
+                  >
+                </el-radio-group>
+              </div>
+              <!-- <div
+                class="right-btn"
+                v-show="item.list.length > 8"
+                @click="more($event)"
+              >
+                展开条件
+              </div> -->
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 表格 -->
+    <div class="table" v-if="tableData.length > 0">
+      <div class="title">查询结果</div>
+      <div style="text-align: right; margin-bottom: 10px">
+        <el-button @click="$emit('toDytj', keyNum)" size="small" type="primary"
+          >地域统计</el-button
+        >
+        <el-button
+          @click="$emit('export2Excel', keyNum)"
+          size="small"
+          icon="el-icon-download"
+          type="warning"
+          >导出</el-button
+        >
+        <el-radio-group
+          @click="tabs(listMode)"
+          v-model="listMode"
+          class="list-mode"
+          size="small"
+        >
+          <el-radio-button label="1"
+            ><i class="el-icon-s-fold"></i
+          ></el-radio-button>
+          <el-radio-button label="2"
+            ><i class="el-icon-menu"></i
+          ></el-radio-button>
+        </el-radio-group>
+      </div>
+      <el-table
+        v-if="listMode == '1'"
+        ref="multipleTable"
+        v-loading="loading"
+        tooltip-effect="dark"
+        element-loading-text="数据加载中..."
+        element-loading-spinner="el-icon-loading"
+        :header-cell-style="{ background: '#F1F2F5', color: '#3e3e3e' }"
+        :data="tableData"
+        style="width: 100%"
+        border
+      >
+        <el-table-column
+          v-for="(item, index) in cxDefaultFormThead"
+          :key="index"
+          :label="item.label"
+          :prop="item.prop"
+          :min-width="item.width"
+          :align="item.align ? item.align : 'center'"
+        >
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row[item.prop] }}
+              <img
+                v-if="item.show"
+                @click="ksh"
+                style="cursor: pointer; width: 20px"
+                src="@/assets/img/asjxx_ychy.png"
+                alt=""
+              />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作" width="200">
+          <template slot-scope="scope">
+            <span
+              style="cursor: pointer; color: #126ce4; border-bottom: 1px solid"
+              @click="addKj(scope)"
+              ><i class="el-icon-upload"></i> 存入工作空间</span
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <div
+        v-loading="loading"
+        tooltip-effect="dark"
+        element-loading-text="数据加载中..."
+        element-loading-spinner="el-icon-loading"
+        v-if="listMode == '2'"
+      >
+        <div v-for="(itemX, indexX) in tableData" :key="indexX" class="qyk">
+          <div
+            class="qykForm"
+            v-for="(item, index) in cxDefaultFormThead"
+            :key="index"
+          >
+            <div class="qykO">
+              <span class="qykSpanOne">{{ item.label }}：</span
+              ><span class="qykSpan"
+                >{{ itemX[item.prop] }}
+                <img
+                  v-if="item.show"
+                  @click="ksh"
+                  style="cursor: pointer; width: 20px"
+                  src="@/assets/img/asjxx_ychy.png"
+                  alt=""
+              /></span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="pageInationg">
+        <el-pagination
+          background
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="page"
+          :page-sizes="[10, 30, 50, 100]"
+          :page-size="limit"
+          layout="total,sizes, prev, pager, next, jumper"
+          :total="tableTotal"
+        >
+        </el-pagination>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    cxDefaultFormThead: {
+      // 表格
+      type: Array,
+      default: () => [],
+    },
+    tableData: {
+      // 表格内容
+      type: Array,
+      default: () => [],
+    },
+    flxxList: {
+      // 分类内容
+      type: Array,
+      default: () => [],
+    },
+    tableTotal: Number,
+    keyNum: String,
+    loading: Boolean,
+    listModeNum: String,
+  },
+  data() {
+    return {
+      // loading: false,
+      radio: "",
+      page: 1,
+      limit: 10,
+      key: this.keyNum,
+      listMode: this.listModeNum,
+    };
+  },
+  methods: {
+    addKj(rows) {
+      this.$message.success("保存成功！");
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.$emit("handleSizeChange", val, this.key);
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.$emit("handleCurrentChange", val, this.key);
+    },
+    getRadioValue(val, type) {},
+    tabs(val) {
+      this.$emit("tabs", val);
+    },
+    ksh() {
+      this.$router.pushToTab({
+        path: "ksh",
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+/deep/.el-radio__input {
+  display: none !important;
+}
+.qyk {
+  padding: 20px;
+  display: flex;
+  border: 1px solid #dfdfdf;
+  margin-bottom: 20px;
+  .qykForm {
+    width: 50%;
+    .qykO {
+      .qykSpanOne {
+        display: inline-block;
+        font-size: 15px;
+        color: #ff710e;
+      }
+      .qykSpan {
+        display: inline-block;
+        font-size: 15px;
+      }
+    }
+  }
+}
+.pageInationg {
+  text-align: center;
+  margin-top: 15px;
+}
+.flxx {
+  background: #fff;
+  border-radius: 10px;
+  margin-bottom: 20px;
+}
+.table {
+  padding: 20px;
+  background: #fff;
+  border-radius: 10px;
+  .title {
+    display: inline-block;
+    font-weight: 600;
+    font-size: 16px;
+    vertical-align: middle;
+    margin: 0px 0 10px 0;
+  }
+}
+.sxWrap {
+  margin: 0px 34px;
+  display: flex;
+  .cxjgsxTitle {
+    font-size: 16px;
+    font-weight: bold;
+    line-height: 21px;
+    color: #fe9200;
+    margin-top: 24px;
+    display: inline-block;
+    padding-bottom: 24px;
+  }
+  .sxcontent {
+    flex: 1;
+    margin-top: 24px;
+    padding-bottom: 24px;
+    .flTitle {
+      width: 145px;
+      text-align: right;
+      display: inline-block;
+      color: #333333;
+      vertical-align: top;
+      font-size: 14px;
+      padding-top: 12px;
+    }
+    .radioGroup {
+      display: inline-block;
+      width: calc(100% - 150px);
+      vertical-align: middle;
+      color: #666666;
+    }
+  }
+  .left-radio {
+    display: inline-block;
+    width: calc(100% - 80px);
+    padding: 12px 0 12px 0;
+    border-bottom: 1px dashed #b7b7b7;
+  }
+  .right-btn {
+    display: inline-block;
+    width: 64px;
+    vertical-align: top;
+    font-size: 14px;
+    color: $base-color;
+    cursor: pointer;
+  }
+}
+.sxWrap .sxcontent > div:nth-child(1) .left-radio,
+.sxWrap .sxcontent > div:nth-child(1) .flTitle {
+  padding-top: 0px;
+}
+</style>
\ No newline at end of file
--- a/src/views/ksh/dtjjs.vue
+++ b/src/views/ksh/dtjjs.vue
--- a/src/views/ksh/dytl.vue
+++ b/src/views/ksh/dytl.vue
+<template>
+  <div>
+    <div class="dyTItle"><img src="@/assets/img/jh.png" alt="" /> 地域统计</div>
+    <div class="dyContent">
+      <div class="dyContent_top">
+        <el-button
+          @click="historyCharts"
+          v-if="historyArr.length > 1"
+          type="primary"
+          size="mini"
+          class="returnBtn"
+          >返回上层</el-button
+        >
+      </div>
+      <!-- {{ nextType }} -->
+      <div
+        v-loading="loading"
+        tooltip-effect="dark"
+        element-loading-text="数据加载中..."
+        element-loading-spinner="el-icon-loading"
+        id="charts"
+        ref="charts"
+      ></div>
+    </div>
+  </div>
+</template>
+<script>
+import {
+  getKyDhTj,
+  getKyClTj,
+  getYhClTj,
+  getKyRyTj,
+} from "@/api/dictionaryCode";
+export default {
+  data() {
+    return {
+      historyArr: [],
+      historyArrs: ["ladwSj"],
+      nextType: "ladwSj",
+      loading: false,
+    };
+  },
+  methods: {
+    doQuery(val, name) {
+      let obj = JSON.parse(this.$route.query.fromdata);
+      let josn = {};
+      for (let i in obj) {
+        if (i != "page" && i != "limit" && i != "fl") {
+          josn[i] = obj[i];
+        }
+      }
+      josn.type = val ? val : "ladwSj";
+      josn.name = name ? name : "";
+      this.loading = true;
+      if (this.$route.query.key == "jdcxs") {
+        getKyClTj(JSON.stringify(josn)).then((res) => {
+          if (res.code == 200 && res.success) {
+            if (res.success && res.code == 200) {
+              if (this.nextType) {
+                let xData = res.data.rows.map((i) => ({
+                  name: i.name,
+                  value: i.name,
+                }));
+                let data = res.data.rows.map((i) => ({
+                  name: i.name,
+                  value: i.num,
+                  dm: i.name,
+                }));
+                this.nextType = res.data.nextType;
+                //添加到histoy数组
+                this.historyArrs.push(res.data.nextType);
+                this.historyArr.push({ x: xData, data: data });
+                //刷新图
+                this.getCharts(xData, data);
+              } else {
+                this.$message.warning("没有下一层了");
+              }
+            }
+          }
+          this.loading = false;
+        });
+      } else if (this.$route.query.key == "yhkxs") {
+        getYhClTj(JSON.stringify(josn)).then((res) => {
+          if (res.code == 200 && res.success) {
+            if (res.success && res.code == 200) {
+              if (this.nextType) {
+                let xData = res.data.rows.map((i) => ({
+                  name: i.name,
+                  value: i.name,
+                }));
+                let data = res.data.rows.map((i) => ({
+                  name: i.name,
+                  value: i.num,
+                  dm: i.name,
+                }));
+                this.nextType = res.data.nextType;
+                //添加到histoy数组
+                this.historyArrs.push(res.data.nextType);
+                this.historyArr.push({ x: xData, data: data });
+                //刷新图
+                this.getCharts(xData, data);
+              } else {
+                this.$message.warning("没有下一层了");
+              }
+            }
+          }
+          this.loading = false;
+        });
+      } else if (this.$route.query.key == "hmxs") {
+        getKyDhTj(JSON.stringify(josn)).then((res) => {
+          if (res.code == 200 && res.success) {
+            if (res.success && res.code == 200) {
+              if (this.nextType) {
+                let xData = res.data.rows.map((i) => ({
+                  name: i.name,
+                  value: i.name,
+                }));
+                let data = res.data.rows.map((i) => ({
+                  name: i.name,
+                  value: i.num,
+                  dm: i.name,
+                }));
+                this.nextType = res.data.nextType;
+                //添加到histoy数组
+                this.historyArrs.push(res.data.nextType);
+                this.historyArr.push({ x: xData, data: data });
+                //刷新图
+                this.getCharts(xData, data);
+              } else {
+                this.$message.warning("没有下一层了");
+              }
+            }
+          }
+          this.loading = false;
+        });
+      } else {
+        getKyRyTj(JSON.stringify(josn)).then((res) => {
+          if (res.code == 200 && res.success) {
+            if (res.success && res.code == 200) {
+              if (this.nextType) {
+                let xData = res.data.rows.map((i) => ({
+                  name: i.name,
+                  value: i.name,
+                }));
+                let data = res.data.rows.map((i) => ({
+                  name: i.name,
+                  value: i.num,
+                  dm: i.name,
+                }));
+                this.nextType = res.data.nextType;
+                //添加到histoy数组
+                this.historyArrs.push(res.data.nextType);
+                this.historyArr.push({ x: xData, data: data });
+                //刷新图
+                this.getCharts(xData, data);
+              } else {
+                this.$message.warning("没有下一层了");
+              }
+            }
+          }
+          this.loading = false;
+        });
+      }
+    },
+    //点击返回上一层事件
+    historyCharts() {
+      if (this.historyArr.length == 1) {
+        this.$message.warning("无法返回");
+        return;
+      }
+      let obj = this.historyArr[this.historyArr.length - 2];
+      debugger;
+      let objs = this.historyArrs[this.historyArrs.length - 2];
+      this.nextType = objs;
+      this.getCharts(obj.x, obj.data);
+      this.historyArr.pop();
+      this.historyArrs.pop();
+    },
+    //初始化echarts以及添加点击事件
+    getCharts(x, data) {
+      let _this = this;
+      let myChart = this.$echarts.init(this.$refs.charts);
+      myChart.setOption({
+        // title: {
+        //   // text: "地域统计",
+        //   textStyle: {
+        //     color: "#000",
+        //     fontWeight: 600,
+        //     fontSize: 18,
+        //   },
+        //   left: "3%",
+        //   top: "5%",
+        // },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            label: {
+              formatter: function (name) {
+                return name.seriesData[0].name;
+              },
+            },
+            // 坐标轴指示器，坐标轴触发有效
+            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+          },
+        },
+        grid: {
+          top: "10%",
+          left: "5%",
+          right: "5%",
+          bottom: "10%",
+          // containLabel: true
+        },
+        xAxis: [
+          {
+            type: "category",
+            axisLine: {
+              show: false,
+              color: "#A582EA",
+            },
+            axisLabel: {
+              formatter: function (a, b) {
+                return x[b].name;
+              },
+              color: "#000",
+              width: 100,
+              clickable: true,
+            },
+            silent: false,
+            triggerEvent: true,
+            splitLine: {
+              show: false,
+            },
+            boundaryGap: true,
+            data: x,
+            id: 1,
+          },
+        ],
+        yAxis: [
+          {
+            type: "value",
+            min: 0,
+            splitNumber: 4,
+            splitLine: {
+              show: true,
+              lineStyle: {
+                color: "#000",
+                opacity: 0.23,
+              },
+            },
+            axisLine: {
+              show: false,
+            },
+            axisLabel: {
+              show: true,
+              margin: 20,
+              textStyle: {
+                color: "#000",
+              },
+            },
+            axisTick: {
+              show: false,
+            },
+          },
+        ],
+        legend: {
+          right: 35,
+          top: 52,
+          textStyle: {
+            color: "#000",
+          },
+          itemWidth: 12,
+          itemHeight: 10,
+          // itemGap: 35
+        },
+        series: [
+          {
+            // name: "地域统计数",
+            type: "bar",
+            data: data,
+            barWidth: "35px",
+            itemStyle: {
+              normal: {
+                color: "#247FDC",
+              },
+            },
+          },
+        ],
+      });
+      //自适应
+      window.addEventListener("resize", () => {
+        myChart.resize();
+      });
+      ///3、在渲染点击事件之前先清除点击事件
+      myChart.off("click");
+      myChart.on("click", function (params) {
+        //点击文字下钻
+        if (params.componentType == "xAxis") {
+          debugger;
+          let dm = params.value;
+          _this.doQuery(_this.nextType, dm);
+          //调用接口
+        } else if (params.componentSubType == "bar") {
+          let dm = params.data.dm;
+          // _this.doQuery(dm);
+        }
+      });
+    },
+  },
+  mounted() {
+    this.doQuery();
+  },
+};
+</script>
+<style lang="scss" scoped>
+.dyTItle {
+  height: 48px;
+  background: #0061f7;
+  font-size: 18px;
+  font-weight: bold;
+  line-height: 48px;
+  color: #ffffff;
+  padding: 0 17px;
+  > img {
+    width: 36px;
+    margin-right: 5px;
+    position: relative;
+    top: -3px;
+  }
+}
+.dyContent {
+  margin: 20px 120px;
+  background: #fff;
+  height: 85vh;
+  &_top {
+    padding: 20px;
+    text-align: right;
+  }
+  #charts {
+    background-color: #fff;
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
\ No newline at end of file
--- a/src/views/ksh/gtgxKsh.vue
+++ b/src/views/ksh/gtgxKsh.vue
--- a/src/views/ksh/ksh.vue
+++ b/src/views/ksh/ksh.vue
--- a/src/views/ztyp/queryGtgxfxNew.vue
+++ b/src/views/ztyp/queryGtgxfxNew.vue
 <template>
  <div class="rightConent">
    <div class="conent">
-      <el-form ref="form" :model="formData" label-width="80px">
+      <el-form ref="form" :model="formData" label-width="95px">
        <el-form-item
          v-for="item in formProp"
          :key="item.id"
@@ -32,6 +32,16 @@
              >
            </el-checkbox-group>
          </div>
+          <div class="zdyInputW" v-else-if="item.type == 'radio'">
+            <el-radio-group v-model="formData[item.id]" size="small">
+              <el-radio
+                :label="item2.val"
+                v-for="item2 in item.radioData"
+                :key="item2.val"
+                >{{ item2.label }}
+              </el-radio>
+            </el-radio-group>
+          </div>
          <!--日期框-->
          <el-date-picker
            v-model="formData[item.id]"
@@ -69,39 +79,42 @@ export default {
          id: "zjhm",
          type: "text",
          name: "身份证号码",
-          placeholder: "请输入身份证号码",
+          placeholder: "输入身份证号码以逗号隔开",
          hidden: true,
          col: "9",
        },
        {
-          name: "同案关系",
+          name: "关系类型",
          id: "lx",
-          type: "checkbox",
+          type: "radio",
          hidden: true,
          value: "",
-          checkList: [
+          radioData: [
            { label: "同户关系", val: "thgx" },
            { label: "婚姻关系", val: "hygx" },
-            { label: "全国同案人员", val: "qgtary" },
+            { label: "同案关系", val: "qgtary" },
-            { label: "全省同案人员", val: "qstary" },
+            // { label: "全省同案人员", val: "qstary" },
          ],
        },
        {
-          name: "同案时间",
+          name: "构造地域",
-          id: "tasj",
+          id: "approvalStatus",
-          placeholder: "请输入",
+          type: "radio",
-          hidden: false,
-          type: "date",
          value: "",
-          col: "3",
+          placeholder: "",
+          col: "6",
+          radioData: [
+            { label: "全区", val: "qs" },
+            { label: "全国", val: "qg" },
+          ],
        },
        {
-          name: "同案次数",
+          name: "构造时间",
-          id: "tacs",
+          id: "tasj",
          placeholder: "请输入",
          hidden: false,
-          type: "jsq",
+          type: "date",
          value: "",
          col: "3",
        },
@@ -119,6 +132,8 @@ export default {
      formData: {
        tacs: 0,
        lx: [],
+        zjhm: "",
+        approvalStatus: "qs",
      },
    };
  },
@@ -127,13 +142,24 @@ export default {
  },
  methods: {
    search() {
-      debugger;
+      if (this.formData.lx == "qgtary") {
+        this.$router.pushToTab({
+          path: "gtgxKsh",
+          query: {
+            zjhm: this.formData.zjhm,
+            tasj: this.formData.tasj,
+            approvalStatus: this.formData.approvalStatus
+              ? this.formData.approvalStatus
+              : "",
+          },
+        });
+      } else {
        var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
        var idcard = userInfo.identitycard;
        var params = {
          gtgx: this.formData.lx.toString(),
-        larqQssj: this.formData.tasj ? this.formData.tasj[0] : '',
+          larqQssj: this.formData.tasj ? this.formData.tasj[0] : "",
-        larqJssj: this.formData.tasj ? this.formData.tasj[1] : '',
+          larqJssj: this.formData.tasj ? this.formData.tasj[1] : "",
          tacs: this.formData.tacs,
          type: "hainanGtgx",
          kybh: this.formData.zjhm,
@@ -147,7 +173,9 @@ export default {
        console.log(params);
        this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
        // this.toDetail(`http://192.168.1.115:8080/naotuBox`, params);
+      }
    },
    toDetail(url, PARAMS) {
      var temp_form = document.createElement("form");
      temp_form.action = url;
@@ -168,7 +196,7 @@ export default {
    "formData.lx": {
      handler: function (val) {
        debugger;
-        if (val.includes("qgtary") || val.includes("qstary")) {
+        if (val == "qgtary") {
          this.$set(this.formProp[2], "hidden", true);
          this.$set(this.formProp[3], "hidden", true);
        } else {
@@ -183,6 +211,15 @@ export default {
 </script>
 <style lang="scss" scoped>
+/deep/.el-input {
+  position: relative;
+  font-size: 14px;
+  display: inline-block;
+  width: 120%;
+}
+/deep/.el-form-item__content {
+  margin-left: 50px !important;
+}
 .rightConent {
  // height: 480px;
  background: #fff;

--- a/src/views/ztyp/queryQt.vue
+++ b/src/views/ztyp/queryQt.vue
@@ -156,6 +156,9 @@ export default {
        lxrSfz: "",
        lxrXm: "",
        rygx: "",
+        gxmqd: "",
+        qtdxMin: "",
+        qtdxMax: "",
      },
      cxQueryField: [
        {
@@ -174,6 +177,38 @@ export default {
          value: "",
          col: "3",
        },
+        {
+          name: "关系密切度",
+          id: "gxmqd",
+          type: "select",
+          selectData: [
+            {
+              value: "高",
+              name: "高",
+            },
+            {
+              value: "中",
+              name: "中",
+            },
+            {
+              value: "低",
+              name: "低",
+            },
+          ],
+          value: "",
+          col: "3",
+        },
+            {
+              name: "群体大小",
+              id: "qtdxMin",
+              id2: "qtdxMax",
+              type: "zdyText",
+              value: "",
+              placeholder: "请输入",
+              value2: "",
+              placeholder2: "请输入",
+              col: "3",
+            },
      ],
      cxDefaultFormThead: [
        {
@@ -191,6 +226,26 @@ export default {
      ],
      cxDefaultFormTheadChildren: [
        {
+          label: "姓名",
+          prop: "xm",
+        },
+        {
+          label: "性别",
+          prop: "xb",
+        },
+        {
+          label: "证件号码",
+          prop: "zjhm",
+        },
+        {
+          label: "关系密切度",
+          prop: "gxmqd",
+        },
+        {
+          label: "群体大小",
+          prop: "qtdx",
+        },
+        {
          label: "数据量",
          prop: "dataCount",
        },
@@ -341,9 +396,9 @@ export default {
          hasChildren: true,
          children: [
            {
-              id: "dwcx",
+              id: "dtjjs",
              label: "多条件检索",
-              index: "dwcx",
+              index: "dtjjs",
              auth: "M0101",
              className: "iconfont iconrizhi",
              disabled: false,
@@ -608,6 +663,38 @@ export default {
          value: "",
          col: "3",
        },
+                {
+          name: "关系密切度",
+          id: "gxmqd",
+          type: "select",
+          selectData: [
+            {
+              value: "高",
+              name: "高",
+            },
+            {
+              value: "中",
+              name: "中",
+            },
+            {
+              value: "低",
+              name: "低",
+            },
+          ],
+          value: "",
+          col: "3",
+        },
+                 {
+              name: "群体大小",
+              id: "qtdxMin",
+              id2: "qtdxMax",
+              type: "zdyText",
+              value: "",
+              placeholder: "请输入",
+              value2: "",
+              placeholder2: "请输入",
+              col: "3",
+            },
      ];
      var arrey = [
        {

--- a/src/views/ztyp/transactionFlow.vue
+++ b/src/views/ztyp/transactionFlow.vue
@@ -847,6 +847,22 @@ export default {
          col: "3",
        },
        {
+          name: "案事件编号",
+          id: "asjbh",
+          type: "text",
+          value: "",
+          placeholder: "",
+          col: "3",
+        },
+        {
+          name: "关注人员编号",
+          id: "gzrybh",
+          type: "text",
+          value: "",
+          placeholder: "",
+          col: "3",
+        },
+        {
          name: "本方持卡人姓名",
          id: "bfCardsName",
          type: "text",
@@ -897,6 +913,14 @@ export default {
      ],
      cxDefaultFormThead: [
        {
+          label: "案事件编号",
+          prop: "asjbh",
+        },
+        {
+          label: "关注人员编号",
+          prop: "gzrybh",
+        },
+        {
          label: "交易任务名称",
          prop: "taskName",
        },