首页及所属区域修改

huaxin-admin/src/main/java/com/zehong/web/controller/checktask/TTaskController.java

@@ -136,11 +136,12 @@ public class TTaskController extends BaseController
      * @return
      */
     @GetMapping("/selectCurrentTaskByType")
-    public AjaxResult selectCurrentTaskByType(@RequestParam(value="type") Integer type,@RequestParam(value="checkType",required = false) Integer checkType,@RequestParam(value="taskType",required = false) Integer taskType){
+    public AjaxResult selectCurrentTaskByType(@RequestParam(value="type") Integer type,@RequestParam(value="checkType",required = false) Integer checkType,@RequestParam(value="taskType",required = false) Integer taskType,@RequestParam(value="userId") Long userId){
         Map<String,Object> param = new HashMap<>();
         param.put("type",type);
         param.put("checkType",checkType);
         param.put("taskType",taskType);
+        param.put("userId",userId);
         return AjaxResult.success(tTaskService.selectCurrentTaskByType(param));
      }
 

huaxin-web/src/views/baseinfo/jmuser/index.vue

@@ -280,7 +280,7 @@
         </el-row>
         <el-row>
           <el-form-item label="所属区域" prop="city">
-              <el-col :span="5">
+              <!--<el-col :span="5">
                   <el-select v-model="form.city" placeholder="所属市" @change="(id) =>getAreaList(id,2)">
                     <el-option
                       v-for="dict in oneAreaList"
@@ -300,7 +300,7 @@
                       :value="dict.id"
                     />
                   </el-select>
-              </el-col>
+              </el-col>-->
 
               <el-col :span="6" style="margin-left: 8px" >
                 <el-select v-model="form.street" placeholder="所属乡镇" @change="(id) =>getAreaList(id,4)">
@@ -757,7 +757,8 @@
         this.form = {
           id: null,
           usernum: null,
-          county: null,
+          city: 1,
+          county: 8,
           street: null,
           village: null,
           address: null,
@@ -800,6 +801,7 @@
       /** 新增按钮操作 */
       handleAdd() {
         this.reset();
+        this.getAreaListtwo(this.form.county,3);
         this.open = true;
         this.title = "添加居民用户";
       },

huaxin-web/src/views/checktask/task/index.vue

@@ -309,7 +309,7 @@
 
         <el-row>
           <el-form-item label="所属区域" prop="community">
-            <el-col :span="6">
+           <!-- <el-col :span="6">
               <el-select v-model="form.city" placeholder="请选择市" @change="proviceChange">
                 <el-option
                   v-for="item in proviceData"
@@ -329,7 +329,7 @@
                   :value="item.id"
                 />
               </el-select>
-            </el-col>
+            </el-col>-->
 
             <el-col :span="6" style="padding-left: 8px" >
               <el-select v-model="form.street" placeholder="所属乡镇" @change="steetChange">
@@ -343,7 +343,7 @@
             </el-col>
 
             <el-col :span="6" style="padding-left: 8px">
-              <el-select v-model="form.community" multiple @change="$forceUpdate()" placeholder="所属小区（村）">
+              <el-select v-model="form.community" multiple placeholder="所属小区（村）">
                 <el-option
                   v-for="item in communityData"
                   :key="item.id"
@@ -364,8 +364,8 @@
         <!--</el-form-item>-->
         <el-row>
           <el-col :span="24">
-            <el-form-item label="负责人" prop="responsiblePerson">
-              <el-select v-model="form.responsiblePerson" multiple @change="$forceUpdate()" placeholder="请选择负责人">
+            <el-form-item label="负责组" prop="responsiblePerson">
+              <el-select v-model="form.responsiblePerson" multiple @change="$forceUpdate()" placeholder="请选择负责组">
                 <el-option
                   v-for="group in groupList"
                   :key="group.groupId"
@@ -489,7 +489,7 @@ export default {
           { required: true, message: "请选择所属小区(村)", trigger: "blur" },
         ],
         responsiblePerson: [
-          { required: true, message: "请选择负责人", trigger: "blur" },
+          { required: true, message: "请选择负责组", trigger: "blur" },
         ]
       },
       inspectUserTypeOptions: [],
@@ -540,7 +540,11 @@ export default {
         remarks: null,
         community: [],
         responsiblePerson: [],
-        relationInfoList: []
+        relationInfoList: [],
+        city: 1,
+        county: 8,
+        street:null,
+        community: []
       };
       this.resetForm("form");
     },
@@ -564,7 +568,8 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.getProvinceInfo();
+      //this.getProvinceInfo();
+      this.getStreet();
       this.getGroupInfo();
       this.open = true;
       this.title = "添加入户安检任务";
@@ -575,10 +580,11 @@ export default {
       const id = row.id || this.ids;
       getTask(id).then((response) => {
         this.form = response.data;
+        this.getRelationInfo();
         // 获取省市
-        this.getProvinceInfo();
+        //this.getProvinceInfo();
         // 获取县区信息
-        this.getCounty();
+        //this.getCounty();
         // 获取街道信息
         this.getStreet();
         // 获取村镇信息
@@ -741,6 +747,7 @@ export default {
     //街道镇选择
     steetChange(){
       this.community = null;
+      this.form.community = [];
       this.communityData = [];
       this.getCommunityInfo();
     },
@@ -773,7 +780,7 @@ export default {
       communityList({street: this.form.street}).then(res =>{
         if(res.code == 200){
           this.communityData = res.data;
-          this.getRelationInfo();
+          if (!this.form.street) this.getRelationInfo();
         }
       })
     },

huaxin-web/src/views/index.vue

@@ -11,15 +11,15 @@
     <div class="top"></div>
     <div class="bottom"></div>
 
-    <Left @clickShow="clickShow"/>
+   <!-- <Left @clickShow="clickShow"/>
     <Right :show="show"/>
 
     <div class="mapChange">
       <div :class="{ active: mapStyle }" @click="mapChange(2)">全景地图</div>
       <div :class="{ active: !mapStyle }" @click="mapChange(1)">三维地图</div>
-    </div>
+    </div>-->
     <!-- 3d地图 -->
-    <Map3d :show="show" v-if="!mapStyle" />
+    <!--<Map3d :show="show" v-if="!mapStyle" />-->
     <!-- 高德地图 -->
     <GaodeMap :show="show" v-if="mapStyle" />
     <!-- 临检设备 -->

huaxin-web/src/views/indexcomponents/gaodemap/index.vue

 <template>
   <div class="gaode-wrapper">
-    <div class="typelist-div flex">
+    <!--<div class="typelist-div flex">
       <div class="flex">
         <div
           class="list flex bb"
@@ -12,7 +12,7 @@
           <img :src="item.imgurl" />
           {{ item.name }}
         </div>
-        <!-- 管线 -->
+        &lt;!&ndash; 管线 &ndash;&gt;
         <div
           class="list flex bb"
           key="line"
@@ -23,7 +23,7 @@
           管线
         </div>
       </div>
-    </div>
+    </div>-->
     <div id="gao-map-index" class="gao-map"></div>
     <LineTips :show="show" v-show="lineTipsShow"/>
   </div>
@@ -106,7 +106,7 @@ export default {
       this.gaoMap = new EditorMap(
         "gao-map-index",
         {
-          center: [118.09,39.48],
+          center: [118.168016,39.831679],
           // mapStyle: "amap://styles/806fa63f07c70b043867bd1f9a600981",
           mapStyle: "amap://styles/f71d3a3d73e14f5b2bf5508bf1411758",
           zoom: 10.5,
@@ -115,7 +115,7 @@ export default {
         },
         this
       );
-      this.initMapDeviceInfo();
+      //this.initMapDeviceInfo();
     },
     //设备上图
     initMapDeviceInfo() {