dna串并可视化

a1093ca8 · liyuhang19990520 · 46e249bb · a1093ca8 · a1093ca8 · a1093ca8
Commit a1093ca8 authored Apr 01, 2022 by liyuhang19990520
9 changed files
--- a/src/api/grahEcharts.js
+++ b/src/api/grahEcharts.js
+/*
+ * @Author: your name
+ * @Date: 2022-04-01 11:34:31
+ * @LastEditTime: 2022-04-01 11:34:32
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \founder_vue\src\api\grahEcharts.js
+ */
+import {get, post} from "@/utils/http.js";
+
+//类案TOP10统计
+export const listWzgx = params =>
+  post("/api/wzgx/listWzgx", params)
\ No newline at end of file
--- a/src/components/Bshxqcb_component.vue
+++ b/src/components/Bshxqcb_component.vue
@@ -451,6 +451,14 @@
                >
              </div>
              <div
+                  v-else-if="columnTitle.prop == 'wzMc' && columnTitle.label == '物证'"
+                  style="
+                  font-size: 13px !important;
+                "
+              >
+                {{ scope.row[columnTitle.prop] }}({{scope.row.wzbh}})
+              </div>
+              <div
                  v-else-if="columnTitle.prop.indexOf('/') >= 0"
                  style="
                               font-size: 13px !important;

--- a/src/components/bshChildrenQuery.vue
+++ b/src/components/bshChildrenQuery.vue
@@ -468,7 +468,7 @@
              </div>
              <div v-else-if="columnTitle.prop == 'ryXm(rySfhm)'">
                <p>
-                  通过<span style="color: #3670ff">{{ scope.row.ryXm }}</span
+                  通过<span style="color: #3670ff">{{ getRyxm(scope.row.ryXm) }}</span
                  >(<span style="color: rgb(236, 152, 32)">{{
                    scope.row.rySfhm
                  }}</span
@@ -493,6 +493,7 @@
                <span
                  >{{ scope.row[columnTitle.prop] }}
                  <img
+                    v-if="cxFormData.bzgx != 1"
                    style="width: 16px; height: 16px; padding-bottom: 2px"
                    src="./../assets/img/lianhezhencha.png"
                    title="多轨联侦"
@@ -570,7 +571,7 @@
                style="cursor: pointer; color: #096cc9"
                @click="toRelation(scope.row, scope.column)"
              >
-                <i class="el-icon-edit-outline"></i> 可视化分析
+                <i class="el-icon-data-line"></i> 可视化分析
              </span>
            </template>
          </el-table-column>
@@ -656,6 +657,11 @@ export default {
    };
  },
  methods: {
+    getRyxm(val){
+      let index = val.indexOf(')');
+      let str = index >= 0 ? val.substring(index + 1,val.length) : val;
+      return str
+    },
    // 筛选变色
    showDate(val, keyword) {
      let _self = this;
@@ -754,6 +760,7 @@ export default {
          cbxgfwbzh: self.pageBs == "bshcb" ? row.cbxgfwbzh : row.rySfhm,
          cbxsypCbajs: row.cbxsypCbajs,
          type: pageBs,
+          bzType: self.cxFormData.bzgx
        },
      });
      // self.showLoading()
@@ -785,9 +792,9 @@ export default {
    },
    toRelation(row, column) {
      this.$router.pushToTab({
-        path: "ceshi",
+        path: "/grahEcharts",
        query: {
-          data: row,
+          data: row.xszajbh,
        },
      });
    },

--- a/src/components/lazy_treeCode_components.vue
+++ b/src/components/lazy_treeCode_components.vue
@@ -183,7 +183,8 @@ export default {
            .then((codeResult) => {
              var thisCodeOptions = [];
              if (codeResult.code == 200) {
-                var codRes = codeResult.data.data;
+                debugger;
+                var codRes = codeResult.data.data || codeResult.data.rows;
                var codeArry = [];
                var realCodeResult = [];
                for (var j = 0; j < codRes.length; j++) {
@@ -233,7 +234,7 @@ export default {
          .then((codeResult) => {
            var thisCodeOptions = [];
            if (codeResult.code == 200) {
-              var codRes = codeResult.data.data;
+              var codRes = codeResult.data.data || codeResult.data.rows;
              var codeArry = [];
              var realCodeResult = [];
              for (var j = 0; j < codRes.length; j++) {
@@ -402,7 +403,7 @@ export default {
          .doQueryRequest(parm, "/api/queryCodeByType")
          .then((codeResult) => {
            if (codeResult.code == 200) {
-              var codRes = codeResult.data.data;
+              var codRes = codeResult.data.data || codeResult.data.rows;
              var codeArry = [];
              var realCodeResult = [];
              for (var j = 0; j < codRes.length; j++) {
@@ -486,7 +487,7 @@ export default {
                realCodeItem.leaf = true;
              }
            });
-            resolve(codeResult.data.data);
+            resolve(codeResult.data.data || codeResult.data.rows);
          }
        });
    },

--- a/src/views/cbyp/dnabzcbxs.vue
+++ b/src/views/cbyp/dnabzcbxs.vue
@@ -98,6 +98,14 @@ export default {
          col: "3",
        },
        {
+          name: "发案时间",
+          id: "fasjStart",
+          id2: "fasjEnd",
+          type: "zdyDate",
+          value: "",
+          col: "3",
+        },
+        {
          name: "破案状态",
          id: "pazt",
          type: "radio",
@@ -110,18 +118,7 @@ export default {
            { label: "未破", val: "1" },
          ],
        },
-        {
-          name: "比中关系",
-          id: "bzgx",
-          type: "radio",
-          value: "10",
-          placeholder: "请选择",
-          col: "3",
-          radioData: [
-            { label: "案人比中", val: "0" },
-            { label: "案案比中", val: "1" },
-          ],
-        },
+
        {
          name: "案件类别",
          id: "ajlbdm",
@@ -141,12 +138,16 @@ export default {
          col: "3",
        },
        {
-          name: "发案时间",
-          id: "fasjStart",
-          id2: "fasjEnd",
-          type: "zdyDate",
-          value: "",
+          name: "比中关系",
+          id: "bzgx",
+          type: "radio",
+          value: "10",
+          placeholder: "请选择",
          col: "3",
+          radioData: [
+            { label: "案人比中", val: "0" },
+            { label: "案案比中", val: "1" },
+          ],
        },
        {
          name: "简要案情",
@@ -166,26 +167,18 @@ export default {
        {
          label: "案件数",
          prop: "cbxsypCbajs",
-          width: "100",
        },
        {
          label: "未破案数",
          prop: "wpaCount",
-          width: "100",
        },
        {
          label: "已破案数",
          prop: "paCount",
-          width: "100",
-        },
-        {
-          label: "串并依据",
-          prop: "ryXm(rySfhm)",
        },
        {
          label: "串并时间",
          prop: "djsj",
-          width: "120",
        },
      ],
      cxDefaultFormThead: [
@@ -212,7 +205,6 @@ export default {
        {
          label: "串并依据",
          prop: "ryXm(rySfhm)",
-          
        },
        // {
        //   label: "嫌疑人数",

--- a/src/views/cbyp/rgcbDetail.vue
+++ b/src/views/cbyp/rgcbDetail.vue
 <template>
  <div class="Content">
-    <div class="header">
+    <div class="header" v-if="bzType == '0'">
      <span><font color="#E6A23C">{{routeQuery.djsj}}</font>通过<font color="#E6A23C">{{routeQuery.bshlx}}</font>(<font
          color="#E6A23C">{{routeQuery.cbxgfwbzh}}</font>)串并<font
          color="#E6A23C">{{routeQuery.cbxsypCbajs}}</font>起案件</span>
      <span>{{ titleProp }}</span>
    </div>
+    <div class="header" v-if="bzType == '1'">
+      <span><font color="#E6A23C">{{routeQuery.djsj}}</font>串并<font
+          color="#E6A23C">{{routeQuery.cbxsypCbajs}}</font>起案件</span>
+      <span>{{ titleProp }}</span>
+    </div>
    <right-content
        :pageBs="pageBs"
        :header="header"
@@ -28,22 +33,27 @@
    },
    mounted() {
      this.xszmc = this.$route.query.xszmc
-      
    },
    created() {
      let self = this
-
-      if(this.$route.query.type == 'bshcb') {
-        self.cxDefaultFormThead = [ ...self.cxDefaultFormThead1]
+      self.bzType = this.$route.query.bzType;
+      if (this.$route.query.type == 'bshcb') {
+        self.cxDefaultFormThead = [...self.cxDefaultFormThead1]
        this.titleProp = '标识号串并'
-      }else if(this.$route.query.type == 'dnabzcbxs') {
-        self.cxDefaultFormThead = [ ...self.cxDefaultFormThead2]
-        this.titleProp = 'DNA比中串并线索'
+      } else if (this.$route.query.type == 'dnabzcbxs') {
+        self.cxDefaultFormThead = [...self.cxDefaultFormThead2]
+        if (this.$route.query.bzType == '0') {
+          this.titleProp = 'DNA案人比中串并线索'
+        } else {
+          this.titleProp = 'DNA案案比中串并线索'
+        }
+
      }

    },
    data() {
      return {
+        bzType: "",
        header: "立案信息管理",
        pageBs: "bshcb",
        titleProp: '',
@@ -85,7 +95,7 @@
            placeholder: "请输入案件名称",
            col: "3",
          },
-           {
+          {
            name: "案发地区划",
            id: "afddxzqh",
            type: "codeTreeDialog",
@@ -151,7 +161,7 @@
            codeOptions: [],
            codeTree: "CODE_QGUNIT",
          },
-         
+
          {
            name: "侦查阶段",
            id: "zcjddm",
@@ -241,13 +251,14 @@
            label: "立案单位",
            prop: "ladwGajgjgdm",
          },
+          // {
+          //   label: "物证",
+          //   prop: "wzbh",
+          // },
          {
-            label: "物证编号",
-            prop: "wzbh",
-          },
-          {
-            label: "物证名称",
+            label: "物证",
            prop: "wzMc",
+            width: "400"
          },
          {
            label: "简要案情",

--- a/src/views/index/kshData.vue
+++ b/src/views/index/kshData.vue
 <!--
 * @Author: your name
 * @Date: 2021-07-11 15:04:34
- * @LastEditTime: 2022-03-04 14:01:48
- * @LastEditors: LYS
+ * @LastEditTime: 2022-04-01 11:28:21
+ * @LastEditors: Please set LastEditors
 * @Description: In User Settings Edit
 * @FilePath: \founder_vue\src\views\index\kshData.vue
 -->
@@ -2508,12 +2508,12 @@ export default {
        } else {
          this.xzqh =
            this.provinceCodes[this.formData.asjfsddXzqhdm.slice(0, 2)];
-          this.Loading = this.$loading({
-            lock: true,
-            text: "正在查询...",
-            spinner: "el-icon-loading",
-            background: "rgba(255, 255, 255, 0.7)",
-          });
+          // this.Loading = this.$loading({
+          //   lock: true,
+          //   text: "正在查询...",
+          //   spinner: "el-icon-loading",
+          //   background: "rgba(255, 255, 255, 0.7)",
+          // });
          debugger;
          this.getEsLatsfxFpaQuery();
          // this.setMap(this.xzqh, this.points);

--- a/src/views/relationGraph/grahEcharts.vue
+++ b/src/views/relationGraph/grahEcharts.vue
--- a/vue.config.js
+++ b/vue.config.js
 /*
 * @Author: your name
 * @Date: 2021-07-13 10:11:15
- * @LastEditTime: 2022-02-23 09:38:15
- * @LastEditors: LYS
+ * @LastEditTime: 2022-04-01 11:35:44
+ * @LastEditors: Please set LastEditors
 * @Description: In User Settings Edit
 * @FilePath: \founder_vue\vue.config.js
 */
@@ -66,7 +66,8 @@ module.exports = {
      //   }
      // },
      "/api": {
-        target: "http://47.92.48.137:8762/", //me
+        target: "http://47.92.48.137:8762/", //me    
+        // target: "http://26.3.14.165:8762/", //me    
        ws: true,
        changeOrigin: true,
        pathRewrite: {