Bug修改

public/config/widget.json

@@ -76,9 +76,9 @@
       "autoCenter": true,
       "windowOptions": {
         "position": {
-          "top": 50,
-          "bottom": 30,
-          "right": 10
+          "top": 230,
+          "bottom": 52,
+          "left": 457
         }
       },
       "css": {

public/lib/layer/theme/default/layer.css

@@ -31,7 +31,7 @@ html #layuicss-layer {
     background-color: #fff;
     -webkit-background-clip: content;
     border-radius: 2px;
-    box-shadow: 1px 1px 50px rgba(0, 0, 0, .3)
+    box-shadow: 1px 1px 50px rgba(0, 0, 0, .3);
 }
 
 .layui-layer-close {

public/widgets/toolBarRight/widget.js

@@ -16,7 +16,7 @@
       //此数据也可以放在widget.json的配置中，但是发现很多人容易引起同名误解，所以还是放在这里
       this.data = this.config.data || [
         // { name: "底图", icon: "fa fa-map", widget: "widgets/manageBasemaps/widget.js" },
-        { name: "图层", icon: "fa fa-tasks", widget: "widgets/manageLayers/widget.js" },
+        { name: "图层", icon: "fa fa-tasks", widget: "widgets/manageLayers/widget.js"},
         {
           name: "工具",
           icon: "fa fa-cubes",

src/App.vue

@@ -127,6 +127,11 @@ export default {
 
 user-select: none; /* 标准语法 */
 
+}
+#app{
+  width:100vw;
+  height:100vh;
+  overflow: hidden;
 }
 .flex {
   display: flex;

src/views/gridman/gridmanagement/index.vue

@@ -62,11 +62,6 @@
 
     <div class="map-container" id="mapContainer"></div>
     <div class="grider-list-container" v-if="userListContainer">
-      <div class="grid-info-contianer">
-        <p>名称：东蒙镇</p>
-        <p>名称：类型</p>
-        <p>督察长：徐景良</p>
-      </div>
       <div class="grid-list-box">
         <div
           class="grider-list-item"
@@ -86,10 +81,13 @@
               <el-input v-model="item.workunit"></el-input>
             </el-form-item>
             <el-form-item label="防火职务：" prop="households">
-              <el-input v-model="item.fireduties"></el-input>
+              <el-radio v-model="item.fireduties" label="县级包保领导">县级包保领导</el-radio>
+              <el-radio v-model="item.fireduties" label="">无</el-radio>
             </el-form-item>
             <el-form-item label="督察职务：" prop="households">
-              <el-input v-model="item.supervision"></el-input>
+              <el-radio v-model="item.supervision" label="督查长">督查长</el-radio>
+              <el-radio v-model="item.supervision" label="副督查长">副督查长</el-radio>
+              <el-radio v-model="item.supervision" label="">无</el-radio>
             </el-form-item>
           </el-form>
           <div style="height: 40px">
@@ -195,7 +193,7 @@ export default {
       );
     },
     deleteUser(id) {
-      postMethodCommon("/FireGrid/DeleteInspectors", { id: id }).then((res) => {
+      postMethodCommon("/FireGrid/DeleteInspectors?id="+id).then((res) => {
         if (res.code == 200) {
           this.$message({
             type: "success",
@@ -206,15 +204,21 @@ export default {
       });
     },
     saveUser(item) {
-      console.log("item", item);
-      item.id = 0;
+      let api_url = null;
+      if(!item.id){
+        item.id = 0;
+        api_url = "/FireGrid/AddInspector";
+      }else{
+        api_url="/FireGrid/EditInspectors";
+      }
       item.townid = [this.currentStreetId];
-      postMethodCommon("/FireGrid/AddInspector", item).then((res) => {
+      postMethodCommon(api_url, item).then((res) => {
         if (res.code == 200) {
           this.$message({
             type: "success",
-            message: "添加成功！",
+            message: "保存成功！",
           });
+          this.getUserlist(this.currentStreetId);
         }
       });
     },
@@ -441,7 +445,7 @@ export default {
 
 .grid-list-box {
   width: 100%;
-  height: calc(100% - 135px);
+  height: calc(100% - 15px);
   overflow: auto;
 }
 

src/views/home/index.vue

@@ -181,7 +181,7 @@
       ></goodsbox>
     </div>
     <!-- 水源 -->
-    <div class="goods-container" v-if="waterVisible" v-drag>
+    <div class="water-container" v-if="waterVisible" v-drag>
       <waterbox
         :waterCenter="waterCenter"
         :firePopup = "firePopupClosed"
@@ -1242,6 +1242,11 @@ export default {
 </script>
 
 <style scoped>
+.mapcontainer{
+  width:100vw;
+  height:100vh;
+  overflow: hidden;
+}
 .el-header {
   width: 100%;
   height: 90px;
@@ -1456,7 +1461,19 @@ export default {
   left: 20px;
   background-image: url(/img/goods.png);
   background-size: 100% 100%;
-  transform: translate(0, -50%);
+  transform: translate(0, 0);
+  z-index: 2000;
+}
+
+.water-container{
+  width: 603px;
+  height: 457px;
+  position: absolute;
+  top: 100px;
+  left: 20px;
+  background-image: url(/img/goods.png);
+  background-size: 100% 100%;
+  transform: translate(0, 0);
   z-index: 2000;
 }
 

src/views/home/widget/personnel.vue

@@ -10,7 +10,8 @@
           <div class="flex-1">
             <el-checkbox-group v-model="checkList" @change="checkChange">
               <el-checkbox label="护林员" value="1" style="margin-right:10px;"></el-checkbox>
-              <el-checkbox label="消防员" value="2"></el-checkbox>
+              <el-checkbox label="消防员" value="2" style="margin-right:10px;"></el-checkbox>
+              <el-checkbox label="网格员" value="3" ></el-checkbox>
             </el-checkbox-group>
           </div>
         </div>
@@ -18,10 +19,10 @@
           <span class="titlebox">距离：</span>
           <div>
             <el-radio-group v-model="distanceradio" @input="radioChange">
-              <el-radio :label="1" class="mr-1">小于1km</el-radio>
-              <el-radio :label="2" class="mr-1">1~5km</el-radio>
-              <el-radio :label="3" class="mr-1">5~10km</el-radio>
-              <el-radio :label="4" class="mr-1">大于10km</el-radio>
+              <el-radio :label="1" class="mr-1">1km内</el-radio>
+              <el-radio :label="2" class="mr-1">5Km内</el-radio>
+              <el-radio :label="3" class="mr-1">10km内</el-radio>
+              <el-radio :label="4" class="mr-1">20Km内</el-radio>
               <el-radio :label="5">全部</el-radio>
             </el-radio-group>
           </div>
@@ -80,11 +81,11 @@
       props:['globalmap','fireData'],
       data(){
           return{
-              checkList:['护林员','消防员'],
+              checkList:['护林员','消防员','网格员'],
               listData:[],
               allData:[],
               fireLngLat:'',
-              distanceradio: 3,
+              distanceradio: 5,
               personnelGraphicLayer: null,
               graphicLayerArr: [],
               areaName: localStorage.getItem("areaName"),