修改了专题数据查询分析

src/api/ztsjfx/ztsjfx.js

@@ -3,7 +3,7 @@ import base from "@/api/base";
 
 //统计图
 export const EsFpaZtfxQuery = params =>
-    post(`${base.alyIP}/ztsjFx/EsFpaZtfxQuery`, params);
+    post(`/api/ztsjFx/EsFpaZtfxQuery`, params);
 
 
 

src/components/bshChildrenQuery.vue

@@ -933,6 +933,7 @@ export default {
         // item.xszmc = `${item.cbajAjmc}(组号:${item.xszajbh})`
         post(this.cxUrl, formDatas).then((response) => {
           if (response.code == 200) {
+            if(self.pageBs != 'ztsjfxtj') {
             response.data.data.forEach((item) => {
               item.children = [];
               item.xszmc = `${item.cbajAjmc}`;
@@ -944,11 +945,38 @@ export default {
                 item.ryXm = nameArr[1];
               }
             });
-            self.tableData = response.data.data;
-            self.tableDataLength = response.data.iTotalRecords;
-            self.tPage = Math.ceil(
-              response.data.iTotalRecords / self.page_size
-            );
+
+              self.tableData = response.data.data;
+              self.tableDataLength = response.data.iTotalRecords;
+              self.tPage = Math.ceil(
+                      response.data.iTotalRecords / self.page_size
+              );
+            }else {
+              let xData = response.data.rows.map((i) => ({
+                name: i.name,
+                value: i.code,
+              }));
+              let data = []
+              data[0] = response.data.rows.map((i) => ({
+                name: i.name,
+                dm: i.code,
+                value: i.num,
+              }));
+              data[1] = response.data.rows.map((i) => ({
+                name: i.name,
+                dm: i.code,
+                value: i.numPa,
+              }));
+              data[2] = response.data.rows.map((i) => ({
+                name: i.name,
+                dm: i.code,
+                value: i.numWpa,
+              }));
+              //添加到histoy数组
+              this.$parent.historyArr.push({ x: xData, data: data });
+              //刷新图
+              this.$parent.getCharts(xData, data);
+            }
             self.closeLoading();
           } else {
             /*self.$message({

src/components/zdryGl/ptCxForm_components.vue

@@ -1234,6 +1234,12 @@
                 }}
               </el-tag> -->
             </div>
+
+            <div v-else-if="columnTitle.prop == 'ajlbdmMc/ajzlbMc/ajxzlbMc'">
+              <p v-if="scope.row.ajlbdmMc != ''">{{ scope.row.ajlbdmMc }}</p>
+              <p v-if="scope.row.ajlbdmMc == '' && scope.row.ajlbdmMc != ''">{{ scope.row.ajlbdmMc }}</p>
+              <p v-if="scope.row.ajlbdmMc != '' && scope.row.ajlbdmMc == ''">{{ scope.row.ajxzlbMc }}</p>
+            </div>
             <div v-else-if="columnTitle.prop == 'codeTxt'">
               <el-tag
                 type=""
@@ -1309,6 +1315,7 @@
           v-if="
             !(
               pageBs == 'ztsjfx' ||
+              pageBs == 'ztsjfxtj' ||
               pageBs == 'gnsyrz' ||
               pageBs == 'queryFzth' ||
               pageBs == 'queryDh' ||
@@ -4058,7 +4065,7 @@ export default {
         self.toggleZd = true;
       }
     });
-    if (self.pageBs != "dytj") {
+    if (self.pageBs != "dytj" && self.pageBs != "ztsjfxtj") {
       self.doQuery("yes");
     }
   },

src/views/ztsjfx/specialDataAnalyze.vue

@@ -189,22 +189,28 @@ export default {
     this.$store.commit("user/SET_Menu", this.Menu);
     this.$store.commit("user/SET_LeftMenu", this.leftMenus);
     this.$store.commit("user/SET_Breadcrumb", this.breadcrumbList);
-    this.getCode();
+    // this.getCode();
   },
-  mounted() {},
+  mounted() {
+		this.$set(
+      this.cxFormData,
+      "lasjRqsjKssj",
+      this.formatStartDate(new Date())
+    );
+    this.$set(this.cxFormData, "lasjRqsjJssj", this.formatDate(new Date()));
+	},
   methods: {
-    getCode() {
-      let arr = [];
-      getRybq().then((res) => {
-        res.data.rows.forEach((item) => {
-          arr.push({
-            id: item.code,
-            label: item.name,
-            disabled: false,
-          });
-        });
-      });
-      this.$set(this.cxQueryField[8], "codeOptions", arr);
+		formatDate(date) {
+      var y = date.getFullYear();
+      var m = date.getMonth() + 1;
+      m = m < 10 ? "0" + m : m;
+      var d = date.getDate();
+      d = d < 10 ? "0" + d : d;
+      return y + "-" + m + "-" + d;
+    },
+    formatStartDate(date) {
+      var y = date.getFullYear();
+      return y + "-01-01";
     },
   },
   watch: {},

src/views/ztsjfx/specialDataDyfx.vue

@@ -17,12 +17,11 @@
       >返回上层</el-button
     >
     <div v-show="type == 'map'">
-			<rightCont
+      <rightCont
       :pageBs="pageBs"
       :header="header"
       :cxFormData="cxFormData2"
       :cxQueryField="cxQueryField2"
-      :cxDefaultFormThead="cxDefaultFormThead2"
       :cxUrl="cxUrl2"
     ></rightCont>
       <div id="charts" ref="charts" v-loading="loading"></div>
@@ -276,7 +275,7 @@ export default {
           codeTree: "CODE_AJLB_bz",
         },
 		],
-		cxUrl2: "/ztsjFx/EsFpaZtfxQuery",
+		cxUrl2: "/api/ztsjFx/EsFpaZtfxQuery",
     };
   },
   methods: {
@@ -381,10 +380,32 @@ export default {
         },
         series: [
           {
-            name: "人员数",
+            name: "案件数",
             type: "bar",
-            data: data,
-            barWidth: "35px",
+            data: data[0],
+            barWidth: "10px",
+            itemStyle: {
+              normal: {
+                color: "#247FDC",
+              },
+            },
+          },
+          {
+            name: "破案数",
+            type: "bar",
+            data: data[1],
+            barWidth: "10px",
+            itemStyle: {
+              normal: {
+                color: "#247FDC",
+              },
+            },
+          },
+          {
+            name: "未破案数",
+            type: "bar",
+            data: data[2],
+            barWidth: "10px",
             itemStyle: {
               normal: {
                 color: "#247FDC",
@@ -424,23 +445,34 @@ export default {
     //下钻处理接口事件
     getChartsData(xzqhdm) {
       this.loading = true;
-      // let params = new Object();
-      // if (xzqhdm) params.xzqhdm = xzqhdm;
+      let params = new Object();
+      if (xzqhdm) params.asjfsddXzqhdm = xzqhdm;
 			// for(let item in cxFormData2) {
 			// 	params.append( item[key],cxFormData2[key])
 			// }
-      EsFpaZtfxQuery(this.cxFormData2).then((res) => {
+      EsFpaZtfxQuery(params).then((res) => {
         this.loading = false;
         if (res.success && res.code == 200) {
           if (res.data.rows.length > 0) {
             let xData = res.data.rows.map((i) => ({
-              name: i.xzqhmc,
-              value: i.xzqhdm,
+              name: i.name,
+              value: i.code,
+            }));
+            let data = []
+            data[0] = res.data.rows.map((i) => ({
+              name: i.name,
+              dm: i.code,
+              value: i.num,
+            }));
+            data[1] = res.data.rows.map((i) => ({
+              name: i.name,
+              dm: i.code,
+              value: i.numPa,
             }));
-            let data = res.data.rows.map((i) => ({
-              name: i.xzqhmc,
-              value: i.count,
-              dm: i.xzqhdm,
+            data[2] = res.data.rows.map((i) => ({
+              name: i.name,
+              dm: i.code,
+              value: i.numWpa,
             }));
             //添加到histoy数组
             this.historyArr.push({ x: xData, data: data });
@@ -455,26 +487,31 @@ export default {
     //表格内容接口
     getTableData(dm) {
       this.type = "table";
-      this.$set(this.cxFormData, "xzqhdm", dm);
+      this.$set(this.cxFormData, "asjfsdd_xzqhdm", dm);
       this.$refs.rightContent.doQuery("yes");
     },
-    // getCode() {
-    //   let arr = [];
-    //   getRybq().then((res) => {
-    //     res.data.rows.forEach((item) => {
-    //       arr.push({
-    //         id: item.code,
-    //         label: item.name,
-    //         disabled: false,
-    //       });
-    //     });
-    //   });
-    //   this.$set(this.cxQueryField[8], "codeOptions", arr);
-    // },
+		formatDate(date) {
+      var y = date.getFullYear();
+      var m = date.getMonth() + 1;
+      m = m < 10 ? "0" + m : m;
+      var d = date.getDate();
+      d = d < 10 ? "0" + d : d;
+      return y + "-" + m + "-" + d;
+    },
+    formatStartDate(date) {
+      var y = date.getFullYear();
+      return y + "-01-01";
+    },
   },
   mounted() {
     //初始化图形
-    this.getChartsData();
+    // this.getChartsData();
+		this.$set(
+      this.cxFormData,
+      "lasjRqsjKssj",
+      this.formatStartDate(new Date())
+    );
+    this.$set(this.cxFormData, "lasjRqsjJssj", this.formatDate(new Date()));
   },
   created() {
     this.$store.commit("user/SET_Menu", this.Menu);
@@ -483,20 +520,18 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-// .rightContent {
-//   width: 100%;
-//   height: 100vh;
-// }
+
 #dytj {
   width: 100%;
   height: calc(100vh - 48px);
   box-sizing: border-box;
   padding: 20px;
   position: relative;
+  z-index: 999;
   #charts {
     background-color: #fff;
-    width: 100%;
-    height: 100%;
+    width: 80vw;
+    height: 75vh;
   }
   #table {
     box-sizing: border-box;