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

src/api/rlqbxs.js

@@ -73,5 +73,9 @@ export const getRlqbxxtj = params =>
   postform(`${base.alyIP}/rlqb/getRlqbxxtj`, params);  
 //人力情报统计弹框
 export const getAjTjtsg = params =>
-  postform(`${base.alyIP}/rlqb/getAjTjtsg`, params);  
+  postform(`${base.alyIP}/rlqb/getAjTjtsgn`, params);  
+//人力情报统计弹框(后二)
+export const getAjTjGlajxx = params =>
+  postform(`${base.alyIP}/rlqb/getAjTjGlajxx`, params);   
+
   
\ No newline at end of file

src/utils/params.js

@@ -24,11 +24,11 @@ const zdjbxx = [
   {
     name: "阵地基本情况:",
     id: "zdjbqk",
-    type: "text",
+    type: "textarea",
     disabled: false,
     value: "",
     placeholder: "请输入",
-    col: "2",
+    col: "18",
   },
   {
     name: "管控要求:",

src/views/rlqbxsxx/rlqbtj.vue

@@ -62,7 +62,7 @@
         width="100%"
         size="small"
         :header-cell-style="{ background: '#f9f9f9' }"
-				border
+        border
       >
         <el-table-column
           label="单位名称"
@@ -140,7 +140,7 @@
           :page-size="pagesize"
           :page-sizes="[10, 20, 50, 100]"
           layout="sizes,prev, pager, next"
-          :total="tableDataGLength"
+          :total="tableDataLength"
           v-if="pageShow"
         >
         </el-pagination>
@@ -154,7 +154,7 @@
 <script>
 import rightContent from "@c/ptCxForm_components.vue";
 import SelectTreeDialog from "@c/treeCode_components.vue";
-import { getRlqbxxtj, getAjTjtsg } from "@/api/rlqbxs.js";
+import { getRlqbxxtj, getAjTjtsg, getAjTjGlajxx } from "@/api/rlqbxs.js";
 export default {
   components: {
     rightContent,
@@ -245,19 +245,19 @@ export default {
         cxDefaultFormThead: [
           {
             label: "情报线索名称",
-            prop: "asjbh",
+            prop: "qbxsmc",
           },
           {
             label: "登记时间",
-            prop: "ajmc",
+            prop: "djsj",
           },
           {
             label: "新报线索分类名称",
-            prop: "ajlbdm",
+            prop: "kyxsbshlxStr",
           },
           {
             label: "人力情报线索类型",
-            prop: "larq",
+            prop: "qbxsflmc",
           },
         ],
       },
@@ -271,34 +271,57 @@ export default {
   },
   methods: {
     showDialog(dwcode, label) {
+      // let loading = this.$loading({
+      //   lock: true,
+      //   text: "正在查询...",
+      //   spinner: "el-icon-loading",
+      //   background: "rgba(255, 255, 255, 0.7)",
+      // });
       console.log(dwcode);
       console.log(label);
       let params = new FormData();
       params.append("page", 1);
       params.append("limit", 10);
       params.append("unitcode", dwcode);
-      if (label == "诈骗") {
-        params.append("xslx", "01");
-      } else if (label == "抢劫") {
-        params.append("xslx", "02");
-      } else if (label == "涉毒") {
-        params.append("xslx", "03");
-      } else if (label == "涉黑") {
-        params.append("xslx", "04");
-      } else if (label == "盗窃") {
-        params.append("xslx", "05");
-      } else if (label == "其他") {
-        params.append("xslx", "06");
-      }
       params.append("djsjStart", this.formData.djsjkssj);
       params.append("djsjEnd", this.formData.djsjjssj);
-      getAjTjtsg(params).then((res) => {
-        if (res.success && res.code == 200) {
-          self.tableData = res.data.rows;
-          this.dialogG = true;
-          loading.close();
+      if (label == "关联省内线索" || label == "关联全国线索") {
+        if (label == "关联省内线索") {
+          params.append("xslx", "sheng");
+        } else if (label == "关联全国线索") {
+          params.append("xslx", "guo");
         }
-      });
+        getAjTjGlajxx(params).then((res) => {
+          if (res.success && res.code == 200) {
+            this.tableData = res.data.rows;
+            this.tableDataLength = res.data.total;
+            this.dialogG = true;
+            // loading.close();
+          }
+        });
+      } else {
+        if (label == "诈骗") {
+          params.append("xslx", "01");
+        } else if (label == "抢劫") {
+          params.append("xslx", "02");
+        } else if (label == "涉毒") {
+          params.append("xslx", "03");
+        } else if (label == "涉黑") {
+          params.append("xslx", "04");
+        } else if (label == "盗窃") {
+          params.append("xslx", "05");
+        } else if (label == "其他") {
+          params.append("xslx", "06");
+        }
+        getAjTjtsg(params).then((res) => {
+          if (res.success && res.code == 200) {
+            this.tableData = res.data.rows;
+            this.tableDataLength = res.data.total;
+            this.dialogG = true;
+            // loading.close();
+          }
+        });
+      }
     },
     xtt(scope) {
       this.formData.xsfbdw = scope.row.unitcode;
@@ -313,10 +336,10 @@ export default {
       });
       var self = this;
       // let cxFormDataCopy = JSON.parse(JSON.stringify(self.cxFormData));
-			console.log(this.formData.djsjkssj);
-			console.log(this.formData.djsjjssj);
+      console.log(this.formData.djsjkssj);
+      console.log(this.formData.djsjjssj);
       var params = new FormData();
-			if (this.formData.djsjkssj == null) {
+      if (this.formData.djsjkssj == null) {
         params.append("djsjkssj", "");
       } else {
         params.append("djsjkssj", this.formData.djsjkssj);
@@ -326,20 +349,9 @@ export default {
       } else {
         params.append("djsjjssj", this.formData.djsjjssj);
       }
-      // params.append("djsjkssj", this.formData.djsjkssj);
-      // params.append("djsjjssj", this.formData.djsjjssj);
       params.append("xsfbdw", this.formData.xsfbdw);
       getRlqbxxtj(params).then((res) => {
         if (res.success && res.code == 200) {
-          // let hData1 = [];
-          // let zData1 = [];
-          // if (res.data.rows.length > 0) {
-          // res.data.rows.forEach((el, index) => {
-          // hData1.push(el.name);
-          // zData1.push(el.fqcs);
-          // });
-          // this.startMyEcharts2(hData1, zData1);
-          // }
           self.tableLineData = res.data.rows;
           loading.close();
         }

src/views/zdxx/zdxsxx/adjustZdxsxx.vue

@@ -32,7 +32,7 @@ export default {
             {
               name: "线索简要情况:",
               id: "jyqk",
-              type: "text",
+              type: "textarea",
               value: "",
               placeholder: "请输入",
               col: "2",

src/views/zdxx/zdxx.vue

@@ -30,12 +30,12 @@ export default {
             {
               name: "阵地基本情况:",
               id: "zdjbqk",
-              type: "text",
+              type: "textarea",
               disabled: false,
               prop: "checkEmpty",
               value: "",
               placeholder: "请输入案件编号",
-              col: "2",
+              col: "18",
             },
             {
               name: "管控要求:",

src/views/zdxx/zdxxgl/detailZdxx.vue

@@ -39,7 +39,7 @@ export default {
             {
               label: "阵地基本情况:",
               prop: "zdjbqk",
-              col: "3",
+              col: "10",
             },
             {
               label: "管控要求:",