合并代码

src/views/home/index.vue

@@ -582,32 +582,28 @@ export default {
     diaToggle() {
       if (this.callCenterVisible) {
         document.getElementById("diatoggleBtn").style.right = "25px";
-        document.getElementById("layercontainer").style.left = "50px";
+        document.getElementById("layercontainer").style.left = "500px";
         document.getElementById("shortcutbutton").style.right = "25px";
         document.getElementById("footer").style.right = "25px";
-        document.getElementById("toolBarRightTogg").style.right =
-          "25px !important";
-        document.getElementsByClassName(
-          "cesium-viewer-toolbar"
-        )[0].style.right = "25px !important";
-        widgetJson.openAtStart[1].css.right = "25px";
-        feixianConfigJson.map3d.control.compass.left = "25px";
+        document.getElementById("toolBarRightTogg").style.right = "25px !important";
+        document.getElementsByClassName("cesium-viewer-toolbar" )[0].style.right = "25px !important";
+        // widgetJson.openAtStart[1].css.right = "25px";
+        // feixianConfigJson.map3d.control.compass.left = "25px";
       } else {
         document.getElementById("diatoggleBtn").style.right = "462px";
-        document.getElementById("layercontainer").style.left = "500px";
+        document.getElementById("layercontainer").style.left = "25px";
         document.getElementById("shortcutbutton").style.right = "500px";
         document.getElementById("footer").style.right = "460px";
-        document.getElementById("toolBarRightTogg").style.right =
-          "500px !important";
-        widgetJson.openAtStart[1].css.right = "500px";
-        feixianConfigJson.map3d.control.compass.left = "500px";
+        document.getElementById("toolBarRightTogg").style.right = "500px !important";
+        // widgetJson.openAtStart[1].css.right = "500px";
+        // feixianConfigJson.map3d.control.compass.left = "500px";
       }
 
-      this.mars3d.widget.destroy();
-      this.mars3d.widget.init(window.globalmap, widgetJson, "/");
-      window.globalmap.options = feixianConfigJson.map3d;
+      // this.mars3d.widget.destroy();
+      // this.mars3d.widget.init(window.globalmap, widgetJson, "/");
+      // window.globalmap.options = feixianConfigJson.map3d;
 
-      this.callCenterVisible = !this.rightDiaVisible;
+      this.callCenterVisible = !this.callCenterVisible;
       this.rightDiaVisible = !this.rightDiaVisible;
       this.toolsShow = !this.toolsShow;
     },
@@ -757,6 +753,8 @@ export default {
       this.HKmonitorboxShow = true;
     },
     renyuan(item) {
+      this.currentInfo.lng = item[0];
+     this.currentInfo.lat = item[1];
       this.personVisible = !this.personVisible;
     },
     // 水源

src/views/home/widget/callcenter.vue

@@ -41,7 +41,7 @@
               <span class="fz-14 fw-b fc-w">督查长</span>
             </div>
             <div class="flex-1 fz-14 fc-w" style="line-height: 28px">
-              {{ item.dcz }}
+               <span v-for="(it,idx) in item.dcz" :key="idx">{{it.name}}</span>
             </div>
           </div>
           <div class="content-li flex">
@@ -50,7 +50,7 @@
               <span class="fz-14 fw-b fc-w">副督查长</span>
             </div>
             <div class="flex-1 fz-14 fc-w" style="line-height: 28px">
-              {{ item.fdcz }}
+              <span v-for="(it,idx) in item.fdcz" :key="idx">{{it.name}}</span>
             </div>
           </div>
 
@@ -60,7 +60,8 @@
               <span class="fz-14 fw-b fc-w">县级包保领导</span>
             </div>
             <div class="flex-1 fz-14 fc-w" style="line-height: 28px">
-             {{item.dcz}} {{ item.fdcz }}
+                 <span v-for="(it,idx) in item.dcz" :key="idx">{{it.name}}</span>
+                  <span v-for="(it,idx) in item.fdcz" :key="idx">{{it.name}}</span>
             </div>
           </div>
           
@@ -107,12 +108,9 @@ export default {
   },
   methods: {
     getBannerArr() {
-      getMethodCommon("/FireGrid/GetTowInfo", {
-        pageindex: 1,
-        pagesize: 20,
-      }).then((res) => {
+      getMethodCommon("/FireGrid/GetTownInfos").then((res) => {
         if (res.code == 200) {
-          this.BannersArr = res.data;
+          this.BannersArr = res.result;
         }
       });
     },

src/views/home/widget/mergebox.vue

@@ -68,8 +68,8 @@
               this.checkNumber[index].selected = true;
   
               let obj = this.checkNumber[index]
-              this.formData.lng = obj.lng;
-              this.formData.lat = obj.lat;
+              this.formData.lng = parseFloat(obj.lng).toFixed(6);
+              this.formData.lat = parseFloat(obj.lat).toFixed(6);
               this.formData.address = obj.address
   
               console.log("formData",this.formData);

src/views/home/widget/onebuttoncall.vue

@@ -7,18 +7,18 @@
               <el-checkbox label="消防员" value="2"></el-checkbox>
             </el-checkbox-group>
 
-            <el-input clearable size="mini" prefix-icon="el-icon-search" style="width: 200px;margin-bottom: 0;margin:0px 12px;" class="filter-item" :placeholder="'人员姓名'"
+            <el-input clearable size="mini" v-model="listQuery.name" prefix-icon="el-icon-search" style="width: 200px;margin-bottom: 0;margin:0px 12px;" class="filter-item" :placeholder="'人员姓名'"
             >
             </el-input>
     
-            <el-button type="default" size="mini" >重置</el-button>
-            <el-button type="primary" size="mini" >搜索</el-button>
+            <el-button type="default" size="mini" @click="listQuery.name=null;getListData();">重置</el-button>
+            <el-button type="primary" size="mini" @click="getListData">搜索</el-button>
 
       </div>
         <div class="call-text-container" v-if="callTextShow">
             <div class="call-title">呼叫内容</div>
             <div style="padding:15px;">
-                 <el-input placeholder="请输入呼叫内容" v-model="callText"></el-input>
+                 <el-input placeholder="请输入呼叫内容" type="textarea" :rows="7" v-model="callText"></el-input>
                  <p>&nbsp;</p>
                 <el-button type="default" size="small" @click="callTextShow = false;">取消</el-button>
                 <el-button type="primary" size="small"  @click="callPhone">呼叫</el-button>
@@ -65,6 +65,7 @@ import { getMethodCommon, postMethodCommon } from '../../../api/common';
                
             ],
             listQuery:{
+                name:null,
                 pageIndex:1,
                 pageSize:12
             },

src/views/home/widget/personnel.vue

@@ -77,7 +77,7 @@
   import axios from "axios";
     export default {
       name: 'monitorbox',
-      props:['fireData'],
+      props:['globalmap','fireData'],
       data(){
           return{
               checkList:['护林员','消防员'],
@@ -141,7 +141,7 @@
         flyToPosition(item){
             console.log('ii',item)
             let lngLat = [item.lng,item.lat]
-            window.globalmap.flyToPoint(lngLat,{radius:1000,"pitch":-90});
+            this.globalmap.flyToPoint(lngLat,{radius:1000,"pitch":-90});
         },
         radioChange(e){
           let arr = this.allData
@@ -207,7 +207,7 @@
         handleGraphic(){
           if(this.personnelGraphicLayer == null){
               this.personnelGraphicLayer = new mars3d.layer.GraphicLayer();
-              window.globalmap.addLayer(this.personnelGraphicLayer);
+              this.globalmap.addLayer(this.personnelGraphicLayer);
           }
           this.graphicLayerArr.forEach(item =>{
             this.personnelGraphicLayer.removeGraphic(item)
@@ -315,6 +315,8 @@
             address:this.fireData.address,
             work:this.callText
           }
+
+          
           postMethodCommon('/FireCodePC/EventAssign',param).then(res =>{
             if(res.code == 200){
               this.$message({
@@ -341,7 +343,12 @@
 
           this.personnelGraphicLayer = null
 
-          postMethodCommon("/FireCodePC/GetForestRangers?areaname="+this.areaName,arr).then(res =>{
+          let query = {
+            areaname:this.areaName,
+            lng:this.fireData.lng,
+            lat:this.fireData.lat
+          }
+          postMethodCommon("/FireCodePC/GetForestRangers?areaname="+this.areaName+"&lng="+this.fireData.lng+"&lat="+this.fireData.lat,[1,2]).then(res =>{
             let rel = res.data
             // let rel = []
             // res.data.forEach((item,index) =>{

src/views/home/widget/reportlist.vue

@@ -6,6 +6,9 @@
       </div> -->
     <div class="box-container">
       <div class="draw" v-show="active == 1">
+          <div style="width:100%;padding-top:20px;text-align:center;" v-if="list.length<=0">
+              <img src="/img/homeimg/empty.png" alt="">
+          </div>
         <div class="news" v-for="(item, index) in list" :key="index">
           <div
             class="checkbox-container"

src/views/home/widget/uavbox.vue

@@ -67,7 +67,7 @@ export default {
       if (!isJson(evt.detail.data)) return;
       let obj = JSON.parse(evt.detail.data);
       if (obj != "close") {
-        if (obj != "") {
+        if (obj != "" && obj.ip) {
           _this.list = [obj];
           _this.drawUavPoint();
         } else {