修改

src/components/HeaderDiv/index.vue

@@ -42,9 +42,9 @@
             
            
             <div :class='currentindex==3?"active":""' @click="goTarget(3)" v-show="showMenu == 0">治理态势</div>
-             <div :class='currentindex==6?"active":""' @click="goTarget(6)" v-show="showMenu == 0">综合管理</div>
-            <!-- <div :class='currentindex==4?"active":""' @click="goTarget(4)" v-show="showMenu == 0">安全态势</div> -->
             <div :class='currentindex==5?"active":""' @click="goTarget(5)" v-show="showMenu == 0">公众服务</div>
+            <div :class='currentindex==6?"active":""' @click="goTarget(6)" v-show="showMenu == 0">综合管理</div>
+            <!-- <div :class='currentindex==4?"active":""' @click="goTarget(4)" v-show="showMenu == 0">安全态势</div> -->
         </div>
 <!-- 
         <div class="menu-dropDown">
@@ -149,7 +149,7 @@ export default {
         left: 30%;
         >div {
             display: inline-block;
-            margin-right: 7.9rem;
+            margin-right: 4.9rem;
             cursor: pointer;
         }
         .active {

src/components/map/index.vue

@@ -316,7 +316,7 @@ export default {
                           if(tadata.type == 'car'){
 
                                 var event = window.event;
-                                var x = event.screenX/10+5;
+                                var x = event.screenX/10;
                                 var y = event.screenY/10-20;
                                 that.carStyle='top:'+y+'rem;left:'+x+'rem'
                                 that.clickObj = tadata.data
@@ -1252,7 +1252,7 @@ img{
 .carDiv{
     position: absolute;
     top: 10rem;
-    right: 50rem;
+    /* right: 100rem; */
     width: 34rem;
     height: 26rem;
     background: url("../../assets/images/弹窗bg@2x.png");

src/views/electri/index.vue

@@ -2,7 +2,7 @@
 <div style="width:100%;height:100%;position:relative">
   <headerdiv ref="headerDiv" :currentindexP = currentindexNew ></headerdiv>
   <div style="display: inline-flex;width:100%">
-  <div style="width:25%;height:100%;">
+  <div style="width:15%;height:100%;">
        <div style="width:100%">
               <div class='droneleftTree'>
             <!-- <el-input
@@ -35,7 +35,7 @@
       <mapdiv ref="mapdiv" style=""></mapdiv>
   </div>
 
-  <div style="width:25%;height:100%;">
+  <div style="width:35%;height:100%;">
         <div style="width:100%;padding-left:1rem">
         <div class="publicTitle" style="margin-top:1.5rem">
            <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
@@ -60,6 +60,7 @@
                     <el-form-item>
                       <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
                       <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                       <el-button type="primary" icon="el-icon-search" size="mini" @click="exportQuery">导出</el-button>
                     </el-form-item>
 
                        <el-form-item label="区域" prop="areaName">
@@ -301,6 +302,11 @@ export default {
         // this.queryLocationRecord()();
     },
     methods:{
+        exportQuery(){
+                this.download('/qdtl/electricLocation/export', {
+                  ...this.queryParams
+                }, `巡逻车_${new Date().getTime()}.xlsx`)
+        },
         getAllElectricDetail(){
             getAllElectricDetail().then(response =>{
                      this.carStaticCount.totalCar = response.data.totalCar
@@ -430,7 +436,7 @@ export default {
                           view.setCenter(this.carArryData[index].fence.split(','));
                           this.$refs.mapdiv.clickObj = this.carArryData[index]
                           this.$refs.mapdiv.isShowCar = true
-                          this.$refs.mapdiv.carStyle = 'left:95rem;top:35rem'
+                          this.$refs.mapdiv.carStyle = 'left:80rem;top:35rem'
                     }
              }
          },
@@ -442,13 +448,15 @@ export default {
                 queryLocationRecord(this.queryParams).then(response =>{
                      console.log(response);
                      this.carRecordList = response.data
-                     for(var index in carRecordList){
-                            var obj = carRecordList[index]
+                     for(var index in this.carRecordList){
+                            var obj = this.carRecordList[index]
+                            // console.log(obj.mileage);
                             if(obj.mileage != null){
-                                  obj.mileage = obj.mileage/1000
+                                  obj.mileage = (obj.mileage/1000).toFixed(2)
+                                  //  console.log(obj.mileage);
                             }
                              if(obj.dayMileage != null){
-                                  obj.dayMileage = obj.dayMileage/1000
+                                  obj.dayMileage = (obj.dayMileage/1000).toFixed(2)
                             }
 
                      }
@@ -563,7 +571,7 @@ export default {
   width: 85.1rem;
   height: 16.3rem;
   bottom: 0;
-  left: 50%;
+  left: 40%;
   transform: translate(-50%,-0%);
   display: flex;
   flex-direction: row;
@@ -607,7 +615,7 @@ export default {
       width: 50%;
       height: 16.3rem;
       top:8rem;
-      left: 25%;
+      left: 15%;
       background-color: rgba(0, 0, 0, 0.47);
       // transform: translate(-50%,-0%);
       display: flex;

src/views/keepWatch/index.vue

@@ -82,6 +82,7 @@
                             <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
                             <el-button type="primary" icon="el-icon-search" size="mini" :disabled="buttonDisabled" @click="getTrail">轨迹</el-button>
                             <el-button type="primary" icon="el-icon-refresh" size="mini">重置</el-button>
+                            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="exportQuery">导出</el-button>
                         </el-form-item>
                         </el-form>
                  </div>
@@ -261,6 +262,11 @@ export default {
     beforeDestroy(){
     },
     methods:{
+        exportQuery(){
+                this.download('/qdtl/log/export', {
+                  ...this.queryForm
+                }, `巡检监测_${new Date().getTime()}.xlsx`)
+        },
         getTableHeight(){
                  var h = document.body.clientHeight;
                  this.tableHeight = h*0.6

src/views/new/index.vue

@@ -586,6 +586,9 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
+ .el-table__empty-block{
+        background-color: #112832    
+ }
  .publicTitle{
           background: url("~@/assets/images/title@2x.png") no-repeat;
           background-size: 100% 100%;

src/views/qdtl/area/index.vue

@@ -123,7 +123,7 @@
       </el-table-column>
     </el-table>
 
-    <pagination
+    <!-- <pagination
       style=" position:fixed;top:90rem;right:5rem;"
       v-show="total>0"
       :total="total"
@@ -131,6 +131,15 @@
       :limit.sync="queryParams.pageSize"
       :layout="layout"
       @pagination="getList"
+    /> -->
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      :layout="layout"
+      @pagination="getList"
     />
 
     <!-- 添加或修改区域管理对话框 -->

src/views/trouble/comic.vue

@@ -38,7 +38,16 @@
                                                   text-align:center;margin-top:10vh">小程序安全隐患处理流程示意图</div>
                                         <img src='~@/assets/images/manhua/weixin.png' style="margin-top:5vh"></img>
                               </div>
-                             <div style="padding-left:25rem;padding-top:15vh" v-show='current == 2'><img src='~@/assets/images/manhua/manhua1.png'></img></div>
+                              <div  v-show='current == 2' height="80rem">
+                                                   <el-carousel height="80rem" :interval="2000" indicator-position="outside">
+                                                          <el-carousel-item v-for="item in mapArrary" :key="item">
+                                                                  <div style="padding-left:25rem;padding-top:15vh">
+                                                                    <img :src='item' style="width:100rem;height:60rem"/>
+                                                                  </div>
+                                                          </el-carousel-item>
+                                                    </el-carousel>
+                              </div>
+                             <!-- <div style="padding-left:25rem;padding-top:15vh" v-show='current == 2'><img src='~@/assets/images/manhua/manhua1.png'></img></div>
                               <div style="padding-left:25rem;padding-top:15vh" v-show='current == 3'><img src='~@/assets/images/manhua/manhua2.png'></img></div>
                                <div style="padding-left:25rem;padding-top:15vh" v-show='current == 4'><img src='~@/assets/images/manhua/manhua3.png'></img></div>
                                 <div style="padding-left:25rem;padding-top:15vh" v-show='current == 5'><img src='~@/assets/images/manhua/manhua4.png'></img></div>
@@ -46,7 +55,7 @@
                                   <div style="padding-left:25rem;padding-top:15vh" v-show='current == 7'><img src='~@/assets/images/manhua/manhua6.png'></img></div>
                                    <div style="padding-left:25rem;padding-top:15vh" v-show='current == 8'><img src='~@/assets/images/manhua/manhua7.png'></img></div>
                                     <div style="padding-left:25rem;padding-top:15vh" v-show='current == 9'><img src='~@/assets/images/manhua/manhua8.png'></img></div>
-                                     <div style="padding-left:25rem;padding-top:15vh" v-show='current == 10'><img src='~@/assets/images/manhua/manhua9.png'></img></div>
+                                     <div style="padding-left:25rem;padding-top:15vh" v-show='current == 10'><img src='~@/assets/images/manhua/manhua9.png'></img></div> -->
                       </el-col>
                       <el-col :span='3'>
                            <div style="padding-top:30vh" @click="nextPage"><img src='~@/assets/images/bg/下一页.png'></img></div>
@@ -68,17 +77,34 @@ export default {
         title:'小程序安全隐患处理流程示意图',
         isShow:true,
         current:0,
+        mapArrary:[
+          require('../../assets/images/manhua/manhua1.png'),
+          require('../../assets/images/manhua/manhua2.png'),
+          require('../../assets/images/manhua/manhua3.png'),
+          require('../../assets/images/manhua/manhua4.png'),
+          require('../../assets/images/manhua/manhua5.png'),
+          require('../../assets/images/manhua/manhua6.png'),
+          require('../../assets/images/manhua/manhua7.png'),
+          require('../../assets/images/manhua/manhua8.png'),
+          require('../../assets/images/manhua/manhua9.png'),
+        ]
     };
   },
    components:{
       mapdiv
     },
   created() {
-         this.timer = setInterval(() => {
-                this.nextPage();
-      }, 6000);
+      //    this.timer = setInterval(() => {
+      //           this.nextPage();
+      // }, 6000);
   },
   methods: {
+          getManhua(i){
+                 i++;  
+                 var image = '~@/assets/images/manhua/manhua'+i+'.png'
+                 console.log(image);
+                 return image
+          },
           previousPage(){
             //       if(this.current  == 0){
             //       this.title = '铁路安全隐患处理流程示意图'
@@ -88,7 +114,7 @@ export default {
             //       this.title = '小程序安全隐患处理流程示意图'
             //  }
              if(this.current == 0){
-                    this.current  = 9
+                    this.current  = 2
              }else{
                  this.current --
              }
@@ -101,7 +127,7 @@ export default {
             //  }else if(this.current == 2){
             //       this.title = '小程序安全隐患处理流程示意图'
             //  }
-             if(this.current == 9){
+             if(this.current == 2){
                     this.current  = 0
              }else{
                  this.current ++