修改阵地

src/api/zdxx/zdjyhd.js

@@ -25,7 +25,7 @@ export const infoZdjyhd = params =>
 //统计图表
 //交易活动场所统计
 export const getZdcsResult = params =>
-  post(`${base.alyIP}/zdjyhdxx/getZdcsResult`, params);
+postform(`${base.alyIP}/zdjyhdxx/getZdcsResult`, params);
 
 
 //人员学历统计

src/utils/params.js

@@ -135,7 +135,7 @@ const zdjbxx = [
     col: "2",
   },
   {
-    name: "阵地半径范围:",
+    name: "阵地半径范围",
     id: "zdbjfw",
     type: "text",
     value: "",

src/views/zdxx/zdjyhd/addZdjyhd.vue

@@ -853,7 +853,7 @@ export default {
             isShowDialog: true,
           },
           {
-            label: "是否损失物品",
+            label: "是否重点物品",
             prop: "sfzdwp",
           },
         ],
@@ -890,7 +890,7 @@ export default {
             isShowDialog: true,
           },
           {
-            label: "是否损失物品",
+            label: "是否重点物品",
             prop: "sfzdwp",
           },
         ],
@@ -931,7 +931,7 @@ export default {
             isShowDialog: true,
           },
           {
-            label: "是否损失物品",
+            label: "是否重点物品",
             prop: "sfzdwp",
           },
         ],
@@ -972,7 +972,7 @@ export default {
             isShowDialog: true,
           },
           {
-            label: "是否损失物品",
+            label: "是否重点物品",
             prop: "sfzdwp",
           },
         ],
@@ -1013,7 +1013,7 @@ export default {
             isShowDialog: true,
           },
           {
-            label: "是否损失物品",
+            label: "是否重点物品",
             prop: "sfzdwp",
           },
         ],
@@ -1050,7 +1050,7 @@ export default {
             isShowDialog: true,
           },
           {
-            label: "是否损失物品",
+            label: "是否重点物品",
             prop: "sfzdwp",
           },
         ],
@@ -1087,7 +1087,7 @@ export default {
             isShowDialog: true,
           },
           {
-            label: "是否损失物品",
+            label: "是否重点物品",
             prop: "sfzdwp",
           },
         ],
@@ -1128,7 +1128,7 @@ export default {
             isShowDialog: true,
           },
           {
-            label: "是否损失物品",
+            label: "是否重点物品",
             prop: "sfzdwp",
           },
         ],
@@ -1169,7 +1169,7 @@ export default {
             isShowDialog: true,
           },
           {
-            label: "是否损失物品",
+            label: "是否重点物品",
             prop: "sfzdwp",
           },
         ],

src/views/zdxx/zdjyhd/detailZdjyhd.vue

@@ -546,7 +546,7 @@ export default {
             isShowDialog: true,
           },
           {
-            label: "是否损失物品",
+            label: "是否重点物品",
             prop: "sfzdwp",
           },
         ],
@@ -583,7 +583,7 @@ export default {
             isShowDialog: true,
           },
           {
-            label: "是否损失物品",
+            label: "是否重点物品",
             prop: "sfzdwp",
           },
         ],
@@ -624,7 +624,7 @@ export default {
             isShowDialog: true,
           },
           {
-            label: "是否损失物品",
+            label: "是否重点物品",
             prop: "sfzdwp",
           },
         ],
@@ -665,7 +665,7 @@ export default {
             isShowDialog: true,
           },
           {
-            label: "是否损失物品",
+            label: "是否重点物品",
             prop: "sfzdwp",
           },
         ],
@@ -706,7 +706,7 @@ export default {
             isShowDialog: true,
           },
           {
-            label: "是否损失物品",
+            label: "是否重点物品",
             prop: "sfzdwp",
           },
         ],
@@ -743,7 +743,7 @@ export default {
             isShowDialog: true,
           },
           {
-            label: "是否损失物品",
+            label: "是否重点物品",
             prop: "sfzdwp",
           },
         ],
@@ -780,7 +780,7 @@ export default {
             isShowDialog: true,
           },
           {
-            label: "是否损失物品",
+            label: "是否重点物品",
             prop: "sfzdwp",
           },
         ],
@@ -821,7 +821,7 @@ export default {
             isShowDialog: true,
           },
           {
-            label: "是否损失物品",
+            label: "是否重点物品",
             prop: "sfzdwp",
           },
         ],
@@ -862,7 +862,7 @@ export default {
             isShowDialog: true,
           },
           {
-            label: "是否损失物品",
+            label: "是否重点物品",
             prop: "sfzdwp",
           },
         ],

src/views/zdxx/zdjyhd/zdfxcdtj.vue

@@ -14,7 +14,7 @@
               align="right"
               unlink-panels
               suffix-icon="el-icon-date"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -31,7 +31,7 @@
               align="right"
               unlink-panels
               suffix-icon="el-icon-date"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -321,7 +321,16 @@ export default {
   created() {
     // this.$store.commit("user/SET_Menu", this.Menu);
   },
-  watch: {},
+  watch: {
+    "formData.djsjStart"(val) {
+      this.$echarts.init(document.getElementById('charts')).dispose();
+      this.getCode();
+    },
+    "formData.djsjEnd"(val) {
+      this.$echarts.init(document.getElementById('charts')).dispose();
+      this.getCode();
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/zdxx/zdjyhd/zdglryhyhftj.vue

@@ -14,7 +14,7 @@
               align="right"
               unlink-panels
               suffix-icon="el-icon-date"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -31,7 +31,7 @@
               align="right"
               unlink-panels
               suffix-icon="el-icon-date"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -357,7 +357,16 @@ export default {
   created() {
     // this.$store.commit("user/SET_Menu", this.Menu);
   },
-  watch: {},
+  watch: {
+    "formData.djsjStart"(val) {
+      this.$echarts.init(document.getElementById('charts')).dispose();
+      this.getCode();
+    },
+    "formData.djsjEnd"(val) {
+      this.$echarts.init(document.getElementById('charts')).dispose();
+      this.getCode();
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/zdxx/zdjyhd/zdgmtj.vue

@@ -14,7 +14,7 @@
               align="right"
               unlink-panels
               suffix-icon="el-icon-date"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -31,7 +31,7 @@
               align="right"
               unlink-panels
               suffix-icon="el-icon-date"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -321,7 +321,16 @@ export default {
   created() {
     // this.$store.commit("user/SET_Menu", this.Menu);
   },
-  watch: {},
+  watch: {
+    "formData.djsjStart"(val) {
+      this.$echarts.init(document.getElementById('charts')).dispose();
+      this.getCode();
+    },
+    "formData.djsjEnd"(val) {
+      this.$echarts.init(document.getElementById('charts')).dispose();
+      this.getCode();
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/zdxx/zdjyhd/zdgzrytjt.vue

@@ -14,7 +14,7 @@
               align="right"
               unlink-panels
               suffix-icon="el-icon-date"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -31,7 +31,7 @@
               align="right"
               unlink-panels
               suffix-icon="el-icon-date"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -357,7 +357,16 @@ export default {
   created() {
     // this.$store.commit("user/SET_Menu", this.Menu);
   },
-  watch: {},
+  watch: {
+    "formData.djsjStart"(val) {
+      this.$echarts.init(document.getElementById('charts')).dispose();
+      this.getCode();
+    },
+    "formData.djsjEnd"(val) {
+      this.$echarts.init(document.getElementById('charts')).dispose();
+      this.getCode();
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/zdxx/zdjyhd/zdjycstj.vue

@@ -14,7 +14,7 @@
               align="right"
               unlink-panels
               suffix-icon="el-icon-date"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -31,7 +31,7 @@
               align="right"
               unlink-panels
               suffix-icon="el-icon-date"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -328,9 +328,10 @@ export default {
     // },
     getCode() {
       let obj = {};
-      var arr = []
+      var arr = [];
       console.log(this.formData.djsjStart);
-      var params = new FormData();
+      console.log(this.formData.djsjEnd);
+      var params = new FormData()
       params.append("djsjStart", this.formData.djsjStart);
       params.append("djsjEnd", this.formData.djsjEnd);
       getZdcsResult(params).then((res) => {
@@ -344,15 +345,25 @@ export default {
           });
         }
         console.log(this.pieEchartsDate);
-        this.pieEchartsDate.map((v,index) => {
-          if( v.value != 0) {
-            arr.push(v)
+        this.pieEchartsDate.map((v, index) => {
+          if (v.value != 0) {
+            arr.push(v);
           }
-        })
+        });
         this.startMyEcharts(arr);
       });
     },
   },
+  watch: {
+    "formData.djsjStart"(val) {
+      this.$echarts.init(document.getElementById('charts')).dispose();
+      this.getCode();
+    },
+    "formData.djsjEnd"(val) {
+      this.$echarts.init(document.getElementById('charts')).dispose();
+      this.getCode();
+    },
+  },
   mounted() {
     //初始化图形
     // this.getChartsData();
@@ -361,7 +372,6 @@ export default {
   created() {
     // this.$store.commit("user/SET_Menu", this.Menu);
   },
-  watch: {},
 };
 </script>
 <style lang="scss" scoped>

src/views/zdxx/zdjyhd/zdjywptjt.vue

@@ -313,19 +313,19 @@ export default {
           },
         ],
       });
-      myChart.on("click", pieConsole);
-      function pieConsole(val) {
-        console.log(val);
-        console.log(val.data);
-        self.getTableData()
-      }
+      // myChart.on("click", pieConsole);
+      // function pieConsole(val) {
+      //   console.log(val);
+      //   console.log(val.data);
+      //   self.getTableData()
+      // }
     },
     //表格内容接口
-    getTableData(dm) {
-      this.type = "table";
-      // this.$set(this.cxFormData, "xzqhdm", dm);
-      this.$refs.rightContent.doQuery("yes");
-    },
+    // getTableData(dm) {
+    //   this.type = "table";
+    //   // this.$set(this.cxFormData, "xzqhdm", dm);
+    //   this.$refs.rightContent.doQuery("yes");
+    // },
     getCode() {
       let arr = [];
       console.log(this.formData.djsjStart);
@@ -339,7 +339,7 @@ export default {
         arr.map((i) => {
           if(i.count != 0) {
             this.pieEchartsDate.push({
-                name: i.hyhfdmStr,
+                name: i.jywplxStr,
                 value: i.count,
             })
           }
@@ -357,7 +357,16 @@ export default {
   created() {
     // this.$store.commit("user/SET_Menu", this.Menu);
   },
-  watch: {},
+  watch: {
+    "formData.djsjStart"(val) {
+      this.$echarts.init(document.getElementById('charts')).dispose();
+      this.getCode();
+    },
+    "formData.djsjEnd"(val) {
+      this.$echarts.init(document.getElementById('charts')).dispose();
+      this.getCode();
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/zdxx/zdxxgl/queryZdxxgl.vue

@@ -125,7 +125,7 @@ export default {
           col: "3",
         },
         {
-          name: "阵地半径范围:",
+          name: "阵地半径范围",
           id: "zdbjfw",
           type: "text",
           value: "",

src/views/zdxx/zdxxgl/sswp/ssjdc/addZdssjdc.vue

@@ -73,6 +73,7 @@ export default {
       window.opener.location.reload();
     },
     addSubmit(params, loading) {
+      params.append("gljyhdxxzjbh", this.gljyhdxxzjbh);
       params.append("glzdxxzjbh", this.glzdxxzjbh);
       insertSsjdcwp(params).then((res) => {
         if (res.success && res.code == 200) {
@@ -92,7 +93,7 @@ export default {
     },
     editSubmit(params, loading) {
       params.append("xxzjbh", this.xxzjbh);
-      params.append("gljyhdxxzjbh", this.gljyhdxxzjbh);
+      
       updateJdcxx(params).then((res) => {
         if (res.success && res.code == 200) {
           this.$alert("保存成功!", "提示", {

src/views/zdxx/zdxxgl/zdxxtj.vue

@@ -64,6 +64,14 @@ export default {
           className: "iconfont icongongnengfuwu",
           disabled: false,
         },
+        {
+          id: "zdjywptjt",
+          label: "阵地交易物品统计",
+          index: "zdjywptjt",
+          auth: "M0102",
+          className: "iconfont icongongnengfuwu",
+          disabled: false,
+        },
         // {
         //   id: "zdsfhgtjt",
         //   label: "是否换岗统计",

src/views/zdxx/zdxxgl/zdym/queryZdxx111.vue

@@ -122,7 +122,7 @@ export default {
           col: "3",
         },
         {
-          name: "阵地半径范围:",
+          name: "阵地半径范围",
           id: "zdbjfw",
           type: "text",
           value: "",

src/views/zdxx/zdxxgl/zdym/queryZdxxs25.vue

@@ -122,7 +122,7 @@ export default {
           col: "3",
         },
         {
-          name: "阵地半径范围:",
+          name: "阵地半径范围",
           id: "zdbjfw",
           type: "text",
           value: "",

src/views/zdxx/zdxxgl/zdym/queryZdxxs3.vue

@@ -122,7 +122,7 @@ export default {
           col: "3",
         },
         {
-          name: "阵地半径范围:",
+          name: "阵地半径范围",
           id: "zdbjfw",
           type: "text",
           value: "",

src/views/zdxx/zdxxgl/zdym/queryZdxxs34.vue

@@ -122,7 +122,7 @@ export default {
           col: "3",
         },
         {
-          name: "阵地半径范围:",
+          name: "阵地半径范围",
           id: "zdbjfw",
           type: "text",
           value: "",