Merge remote-tracking branch 'origin/dev_xzeq' into dev_xzeq

src/components/RelationalGraph.vue

@@ -92,14 +92,14 @@
         <p>高危</p>
       </el-button>
     </div>
-    <div class="leftToolbar2" ref="leftToolbar" v-if="showTuanhuo">
+    <div class="leftToolbar" ref="leftToolbar" v-if="showTuanhuo">
       <el-button
         class="toolBarItem"
         @click.native="toTuanhuo"
         title="获取团伙信息"
       >
         <i class="el-icon-picture-outline-round"></i>
-        <p>团伙</p>
+        <p>主嫌</p>
       </el-button>
     </div>
     <div class="leftToolbar3" ref="leftToolbar" v-if="showNt">
@@ -538,32 +538,31 @@ export default {
       debugger;
       if (this.objSfhm.name) {
         debugger;
-        let params = {
-          id: this.objSfhm.zjhm,
-          type: 'person',
+        this.params = {
+          zjhm: this.objSfhm.name,
         };
-        let obj = {
-          childrenXhrStr: "/apialy/thyp/getAccompliceById",
-          photoXhrStr: null,
-          params: params,
-          nodedata: {
-            type: "person",
-            id: 0,
-            name: scope.row.zjhm,
-            children: true,
-          },
-          nodeClickBoo: true,
-        };
-        sessionStorage.setItem("key", JSON.stringify(obj));
-        this.$router.pushToTab({
-          path: "/ypEcharts",
-          // key: data.row.bfkh,
-          query: {
-            title: "嫌疑人分析",
-            type: "xyrfx",
-            // type: "argxfx",
-            types: "tonat",
-          },
+        let _this = this;
+      _this.photoLoading = true;
+      this.callApi("/apialy/thyp/getXyrByZjhm", this.params).then((res) => {
+        _this.photoLoading = false;
+        debugger
+        if (res.success && res.code == 200) {
+          this.$message.success("获取成功");
+          setTimeout(() => {
+            _this.activeIdArr = [];
+            _this.nodeArr = [];
+            _this.linkArr = [];
+            _this.linkAll = [];
+            _this.genData = [];
+            _this.setGraphData();
+          }, 200);
+        } else if (res.code == 207) {
+          this.$notify.info({
+            title: "提示",
+            message: res.message,
+            duration: 3000,
+          });
+        }
       });
       } else {
         this.$message.error("请选择嫌疑人!");

src/views/hbyprw/hbyptj/queryHbyptj.vue

@@ -504,7 +504,8 @@ export default {
         this.type = 1
       } else {
         this.form.type =  this.yhType ? this.yhType : 'dw'
-        this.form.unitcode = this.yhUnitcode ? this.yhUnitcode : ''
+        // this.form.unitcode = this.yhUnitcode ? this.yhUnitcode : ''
+        this.form.unitcode = this.yhUnitcode ? this.yhUnitcode : this.form.unitcode
         this.form.yhzh = this.yhZzhh ? this.yhZzhh : ''
       }
       this.showLoading()
@@ -534,6 +535,7 @@ export default {
       this.tableLoading = true;
     },
     resetQuery(dwdm) {
+      debugger
       this.form.unitcode = dwdm
       this.doQuery()
     },

src/views/ztyp/queryQtypfx.vue

@@ -243,13 +243,13 @@ export default {
     },
     // 可视化
     toKshfx(scope) {
-      //
       debugger;
       let params = {
-        zjhm: scope.row.zjhm,
+        id: scope.row.zjhm,
+        type: "person",
       };
       let obj = {
-        childrenXhrStr: "/apialy/thyp/getXyrByZjhm",
+        childrenXhrStr: "/apialy/thyp/getAccompliceById",
         photoXhrStr: null,
         params: params,
         nodedata: {
@@ -267,8 +267,7 @@ export default {
         query: {
           title: "群体发现分析",
           type: "qtfxfx",
-          // type: "argxfx",
-          types: "tonat",
+          types: 'tonat'
         },
       });
     },