Merge branch 'master' of http://111.61.77.35:9999/wanghao/zh-baseversion-project

zh-baseversion-admin/src/main/java/com/zehong/web/controller/system/SysLoginController.java

 package com.zehong.web.controller.system;
 
-import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import com.zehong.framework.systemsetting.SystemSetting;
-import com.zehong.framework.web.domain.server.Sys;
 import com.zehong.system.service.ISysPostService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -81,14 +80,17 @@ public class SysLoginController
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
-        HashMap hashMap=new HashMap();
+        //参数集合
+        Map<String, String> systemWebSetting = systemSetting.getSystemWebSetting();
+
+/*        HashMap hashMap=new HashMap();
        hashMap.put("map_center","[114.684979,38.038292]");//经开区
-        hashMap.put("prod_test","prod");
+        hashMap.put("prod_test","prod");*/
         AjaxResult ajax = AjaxResult.success();
         ajax.put("user", user);
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);
-        ajax.put("systemSetting",hashMap);
+        ajax.put("systemSetting",systemWebSetting);
         ajax.put("posts",iSysPostService.getPostListByUserId(user.getUserId()));
         return ajax;
     }

zh-baseversion-web/src/views/lpgRegulation/gasbottlefiles/index.vue

@@ -42,38 +42,38 @@
 
     <el-table v-loading="loading" :data="filesList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="阀类型名称" align="center" prop="fValveName" :show-overflow-tooltip="true" width="100"/>
-      <el-table-column label="钢瓶规格名称" align="center" prop="fBotSpecName" :show-overflow-tooltip="true"  width="100"/>
-      <el-table-column label="钢瓶型号" align="center" prop="fBottleType" :show-overflow-tooltip="true" width="100"/>
-      <el-table-column label="气瓶许可证号" align="center" prop="fPermitNo" :show-overflow-tooltip="true" width="100"/>
-      <el-table-column label="上检日期" align="center" prop="fPChkDate" width="100">
+      <el-table-column label="阀类型名称" align="center" prop="fValveName" :show-overflow-tooltip="true"/>
+      <el-table-column label="钢瓶规格名称" align="center" prop="fBotSpecName" :show-overflow-tooltip="true"/>
+      <el-table-column label="钢瓶型号" align="center" prop="fBottleType" :show-overflow-tooltip="true"/>
+      <el-table-column label="气瓶许可证号" align="center" prop="fPermitNo" :show-overflow-tooltip="true"/>
+      <el-table-column label="上检日期" align="center" prop="fPChkDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fPChkDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="下检日期" align="center" prop="fNChkDate" width="100">
+      <el-table-column label="下检日期" align="center" prop="fNChkDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fNChkDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="生产日期" align="center" prop="fProductDate" width="100">
+      <el-table-column label="生产日期" align="center" prop="fProductDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fProductDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="报废日期" align="center" prop="fDiscardDate" width="100">
+      <el-table-column label="报废日期" align="center" prop="fDiscardDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fDiscardDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="安全评定日期" align="center" prop="fSafeJudgeDate" width="100">
+      <el-table-column label="安全评定日期" align="center" prop="fSafeJudgeDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fSafeJudgeDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="已检验次数" align="center" prop="fInspectedTimes"  width="100"/>
-      <el-table-column label="状态" align="center"  prop="fState"  width="100" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+      <el-table-column label="已检验次数" align="center" prop="fInspectedTimes"/>
+      <el-table-column label="状态" align="center"  prop="fState"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

zh-baseversion-web/src/views/supplybalance/stop/components/DetailInfo.vue

@@ -116,13 +116,29 @@
         const path = eval(this.$store.state.user.systemSetting.map_center);
         const gaoMap = new EditorMap("areaInfo", {center:path}, this);
         if(this.detailInfo.fGasStopArea){
-          new AMap.Polygon({
+          if (this.detailInfo.fGasStopArea.includes("#")){
+            let areas = this.detailInfo.fGasStopArea.split("#");
+            for (let i = 0; i < areas.length;i++) { 
+                let areasItem = areas[i]; 
+                if (areasItem != null && areasItem != "") {   
+                    new AMap.Polygon({
+                      map: gaoMap.map,
+                      path: JSON.parse(areasItem),
+                      fillColor:'#00b0ff',
+                      strokeColor:'#80d8ff'
+                    }); 
+                }
+            }
+
+          } else {
+            new AMap.Polygon({
             map: gaoMap.map,
             path: JSON.parse(this.detailInfo.fGasStopArea),
             fillColor:'#00b0ff',
             strokeColor:'#80d8ff'
           });
           gaoMap.setCenter(JSON.parse(this.detailInfo.fGasStopArea)[0]);
+          }
           gaoMap.map.setZoom(12)
         }
       }

zh-baseversion-web/src/views/supplybalance/stop/index.vue

@@ -147,7 +147,7 @@
     />
 
     <!-- 添加或修改停气监管对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body destroy-on-close :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" v-if="open" width="1200px" append-to-body :close-on-click-modal="false">
       <el-form label-position="top" ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
@@ -224,7 +224,7 @@
 
           <el-col :span="12" style="padding-left: 10px">
             <el-form-item label="停气区域" prop="fGasStopArea">
-              <DrawArea class="area-change" v-model="path"/>
+              <DrawArea class="area-change" v-model="path" @update-path="handleUpdatePathFromParent"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -246,7 +246,9 @@
 
 <script>
 import { listSup, getSup, delSup, addSup, updateSup, exportSup } from "@/api/supplybalance/stop";
+// 如果只允许画一个，则用这个
 // import DrawArea from "@/components/DrawArea";
+// 如果需要画多个，则用这个
 import DrawArea from "@/components/GasShutDownDrawArea"
 import DetailInfo from "./components/DetailInfo";
 export default {
@@ -337,14 +339,36 @@ export default {
   watch:{
     path(newVal,oldVal){
       console.log("index.watch.path = " + newVal);
-      if(newVal.length == 0){
-        this.form.fGasStopArea = "";
-        return
-      }
-      this.form.fGasStopArea = JSON.stringify(newVal);
+      // 如果只允许画一个多边形，则用这个方法接收数据
+      // if(newVal.length == 0){
+      //   this.form.fGasStopArea = "";
+      //   return
+      // }
+      // this.form.fGasStopArea = JSON.stringify(newVal);
+
     }
   },
   methods: {
+    // 需要画多个 多边形时 需要正确使用 emit 接收 drawArea 发回来的数据
+    handleUpdatePathFromParent(data) {
+
+      // 如果需要画多个则，需要这样接数据
+      if(data.length === 0) {
+        this.form.fGasStopArea = "";
+        return
+      }
+
+      this.form.fGasStopArea = "";
+      for(let i = 0;i < data.length;i ++) {
+        let newValItem = data[i];
+        if (newValItem._opts) {
+          this.form.fGasStopArea += JSON.stringify(newValItem._opts.path) + "#";
+        } else {
+          this.form.fGasStopArea += JSON.stringify(newValItem) + "#";
+        }
+        console.log("this.form.fGasStopArea = " + this.form.fGasStopArea);
+      } 
+    },
     /** 查询停气监管列表 */
     getList() {
       this.loading = true;
@@ -420,8 +444,24 @@ export default {
       const fGasStopId = row.fGasStopId || this.ids
       getSup(fGasStopId).then(response => {
         this.form = response.data;
-        if(this.form.fGasStopArea){
-          this.path = JSON.parse(this.form.fGasStopArea);
+        if(this.form.fGasStopArea){ 
+          console.log("this.from.fGasStopArea = " + this.form.fGasStopArea);
+          let areasArr = [];
+          if (this.form.fGasStopArea.includes("#")){
+            let areas = this.form.fGasStopArea.split("#");
+            for (let i = 0; i < areas.length;i++) { 
+              console.log("i = " + i+  "item = " + areas[i]);
+              let areasItem = areas[i]; 
+              if (areasItem != null && areasItem != "") {   
+                areasArr.push(JSON.parse(areasItem))
+              }
+            }
+            this.path = areasArr;
+            console.log("this.path = " + this.path);
+          } else{
+            areasArr.push( this.form.fGasStopArea);
+            this.path = areasArr;
+          }
         }
         this.open = true;
         this.title = "修改停气监管";