Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/views/LandConsolidation/components/organize.vue

@@ -2,7 +2,7 @@
   <div class="OrganizeCon">
     <div class="tdTitle">试点目标</div>
     <div class="echars">
-      <pie unit="亩" class="pie_echart" ref="echartRef0"></pie>
+      <pie unit="亩" class="pie_echart" ref="echartRef0"  @echartClickTitle="(name) => echartClickTitle(name)"></pie>
     </div>
     <div class="content">
       <div class="item" v-for="(sd, index) in orgnList" :key="index">
@@ -163,6 +163,9 @@ export default {
     this.initEcharts();
   },
   methods: {
+    echartClickTitle(name){
+      // console.log(name,'-------------------------');
+    },
     changeData(name, updata) {
       this[name] = updata;
     },

src/views/cockpit/tdsy.vue

@@ -263,62 +263,13 @@ export default {
 
       that.wccchy = data.data[0].sj_mj;
       that.wcccxm = data.data[0].sj_number;
-      // dial_watch_info: {
-      //   lt: {
-      //     key: '计划供应',
-      //       value: 0,
-      //         unit: "公顷",
-      //   }, lb: {
-      //     key: "完成供应",
-      //       value: 0,
-      //         unit: "公顷",
-      //   }, rt: {
-      //     key: "计划供应项目",
-      //       value: 0,
-      //         unit: "个",
-      //   }, rb: {
-      //     key: "完成供应项目",
-      //       value: 0,
-      //         unit: "个",
-      //   },
-      // },
-      // that.dial_watch_info = {
-      //   lt: {
-      //     key: '计划供应',
-      //     value: data.data[0].jh_mj,
-      //     unit: "公顷",
-      //   }, lb: {
-      //     key: "完成供应",
-      //     value: data.data[0].sj_mj,
-      //     unit: "公顷",
-      //   }, rt: {
-      //     key: "计划供应项目",
-      //     value: data.data[0].jh_number,
-      //     unit: "个",
-      //   }, rb: {
-      //     key: "完成供应项目",
-      //     value: data.data[0].sj_number,
-      //     unit: "个",
-      //   },
-      // }
-      // that.wccchy = that.dial_watch_info.lb.value
-      // that.wcccxm = that.dial_watch_info.rb.value
-      // let echart_data = 0;
-      // if (data.data[0].sj_mj == 0) {
-      //   echart_data = 0
-      // } else if (data.data[0].jh_mj == 0 && data.data[0].sj_mj > 0) {
-      //   echart_data = 100
-      // } else {
-      //   echart_data = (data.data[0].sj_mj / data.data[0].jh_mj * 100).toFixed(2)
-      // }
-      // that.$refs.hysy_dial_watch.init_dial_watch(echart_data);
-      // store.state.cockpit_hysy.info = data.data[0]
     },
     async init_tdgy_gy_jg(params) {
       const that = this;
       let obj = {
         jscType: "jsc_tdgy_gy_ztsh",
         id: params ? params.id : "4602",
+        val0: params ? params.beginTime : store.state.cockpit_date[0],
       };
       let data = await QueryList(obj);
 

src/views/farmlandProtection/components/fzjcyp.vue

@@ -88,7 +88,7 @@ export default {
       },
       //分析模型列表
       anaModels: [],
-      anaModelsCopy:[],//用于存放分析模型初始数据
+      anaModelsCopy: [], //用于存放分析模型初始数据
       templateYZ: [], //用地性质模版因子
       editData: {}, //编辑的对象
       multipleSelection: [],
@@ -139,7 +139,7 @@ export default {
         xzmj: 0,
         xmmc: "耕地保护项目_" + this.getCurrentDateTime(),
       };
-      this.anaModels = this.anaModelsCopy
+      this.anaModels = this.anaModelsCopy;
       this.$refs.ruleForm.resetFields();
       this.$refs.multipleTable.clearSelection();
       this.$refs.range.reset();
@@ -154,40 +154,43 @@ export default {
             Message.warning("请绘制或导入选址范围!");
             return;
           }
-          let obj = {
-            xzfw: this.$refs.range.fileDataID,
-            xmmc: this.ruleForm.xmmc,
-            mxlist: this.multipleSelection,
-          };
+          if (this.multipleSelection.length) {
+            let obj = {
+              xzfw: this.$refs.range.fileDataID,
+              xmmc: this.ruleForm.xmmc,
+              mxlist: this.multipleSelection,
+            };
 
-          const loading = this.$loading({
-            lock: true,
-            text: "分析中",
-            spinner: "el-icon-loading",
-            background: "rgba(0, 0, 0, 0.7)",
-          });
-          setTimeout(() => {
-            loading.close();
-            this.activeTabs = "lsju";
-            this.$emit("updateParent", "activeTabs", "lsju");
-            this.$refs.multipleTable.clearSelection();
-          }, 1000);
-          AddGdbh(obj)
-            .then((res) => {
-              loading.close();
-              this.activeTabs = "lsju";
-              this.$emit("updateParent", "activeTabs", "lsju");
-              this.$refs.multipleTable.clearSelection();
-              this.$message({
-                message: res.message,
-                type: res.success ? "success" : "warning",
+            const loading = this.$loading({
+              lock: true,
+              text: "分析中",
+              spinner: "el-icon-loading",
+              background: "rgba(0, 0, 0, 0.7)",
+            });
+            AddGdbh(obj)
+              .then((res) => {
+                // setTimeout(() => {
+                this.activeTabs = "lsju";
+                this.$emit("updateParent", "activeTabs", "lsju");
+                this.$refs.multipleTable.clearSelection();
+                this.$message({
+                  message: res.message,
+                  type: res.success ? "success" : "warning",
+                });
+                this.reset();
+                loading.close();
+              // }, 2000);
+              })
+              .catch((error) => {
+                loading.close();
+                Message.error(error);
               });
-              this.reset();
-            })
-            .catch((error) => {
-              loading.close();
-              Message.error(error);
+          } else {
+            this.$message({
+              message: "至少选择一个分析模型",
+              type: "warning",
             });
+          }
         } else {
           loading.close();
           console.log("error submit!!");
@@ -199,7 +202,7 @@ export default {
       GetMxList()
         .then((res) => {
           this.anaModels = res.data;
-          this.anaModelsCopy = JSON.parse(JSON.stringify(res.data))
+          this.anaModelsCopy = JSON.parse(JSON.stringify(res.data));
         })
         .catch((erro) => {
           console.log(erro);

src/views/shareResources/components/ServiceDetails.vue

@@ -174,7 +174,7 @@
     </el-dialog>
 
     <el-dialog
-      title="提示"
+      title="申请记录"
       :visible.sync="dialogVisible2"
       width="50%"
       :before-close="handleClose2"
@@ -228,9 +228,6 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible2 = false">取 消</el-button>
-        <el-button type="primary" @click="dialogVisible2 = false"
-          >确 定</el-button
-        >
       </span>
     </el-dialog>
   </div>
@@ -356,6 +353,7 @@ export default {
     },
     //申请记录
     applicationRecord() {
+      //唯一标识为this.detailObj.id
       this.dialogVisible2 = true;
       this.getList();
     },
@@ -402,7 +400,7 @@ export default {
       this.reset();
     },
     handleClose2(done) {
-      this.dialogVisible = false;
+      this.dialogVisible2 = false;
       this.pageNum = 1;
       this.pageSize = 10;
       // this.reset();