Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/qdtlui

# Conflicts:
#	src/components/HeaderDiv/index.vue

src/components/HeaderDiv/index.vue

@@ -54,16 +54,21 @@
         <div class="time">
             <img src="../../assets/images/图层 9@2x.png" /><span>{{ currenttime }}</span>
         </div>
-        <div class="logoutIcon">
-              <i class="el-icon-switch-button" style="width:6rem;color:white"  @click.native="logout"></i>
+
+        <div class="exit">
+             <i class="el-icon-switch-button" @click="logout"></i>
         </div>
     </div>
 </template>
 
 <script>
 import moment from "moment";
+import TopNav from '@/components/TopNav'
 
 export default {
+   components: {   
+      TopNav
+    },
   name: "HeaderDiv",
    props: {
       currentindexP:Number,
@@ -99,14 +104,14 @@ export default {
         }, 1000);
     },
   methods: {
-     async logout() {
+    async logout() {
       this.$confirm('确定注销并退出系统吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+          location.href = '#/login';
         })
       }).catch(() => {});
     },
@@ -196,7 +201,7 @@ export default {
     .time {
         position: absolute;
         top: 1.2rem;
-        right: 6.7rem;
+        right: 5.7rem;
         font-size: 1.6rem;
         color: #fff;
         img {
@@ -207,11 +212,13 @@ export default {
             margin-right: 1.6rem;
         }
     }
-    .logoutIcon {
+
+    .exit{
         position: absolute;
-        top: 0.8rem;
-        right: 0.1rem;
-         font-size: 2rem;
+        top: 0.6rem;
+        right: 2.2rem;
+        font-size: 2rem;
+        color: white;
     }
 }
 .bottombg{

src/views/new/index.vue

@@ -403,7 +403,7 @@ export default {
                             },
                             yAxis: {
                                 type: 'category',
-                                data: ['汇龙镇', '南阳镇', '海复镇', '王鲍镇', '北新镇', '吕四镇','东宇镇','近海镇'],
+                                data: ['汇龙镇', '南阳镇', '海复镇', '王鲍镇', '北新镇', '吕四镇'],
                                 axisLabel: {
                                                         show: true,
                                                         textStyle: {
@@ -415,12 +415,12 @@ export default {
                                 {
                                 name: '已处理预警',
                                 type: 'bar',
-                                data: [573, 289, 357, 405, 501, 286,471,421]
+                                data: [573, 289, 357, 405, 501, 286]
                                 },
                                 {
                                 name: '预警总数',
                                 type: 'bar',
-                                data: [582, 366, 391, 498, 577, 337, 483, 492]
+                                data: [582, 366, 391, 498, 577, 337]
                                 }
                             ]
                             };

src/views/qdtl/area/index.vue

@@ -2,16 +2,6 @@
   <div class="app-container">
      <div class="divtitle"><div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;">{{title}}</div></div>
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="10rem">
-<!--      <el-form-item label="编号" prop="areaCode">
-        <el-input
-          v-model="queryParams.areaCode"
-          placeholder="请输入编号"
-          clearable
-          size="small"
-          style="width:20rem"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item label="名称" prop="areaName">
         <el-input
           v-model="queryParams.areaName"
@@ -48,26 +38,6 @@
           @click="handleAdd"
         >新增</el-button>
       </el-col>
-<!--      <el-col :span="1.5">
-        <el-button
-          style="width:8rem;height:3.2rem;"
-          type="primary"
-          plain
-          icon="el-icon-edit"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          style="width:8rem;height:3.2rem;"
-          type="primary"
-          plain
-          icon="el-icon-delete"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
-      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -76,8 +46,7 @@
       :row-class-name="tableRowClassName"
       max-height="100rem"
       :header-cell-style="{background:'#24A3B3 50%',color: '#C5D0D4'}">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="编号" align="center" prop="areaCode" />
+      <el-table-column label="序号" type="index" width="55" align="center" />
       <el-table-column label="名称" align="center" prop="areaName" />
       <el-table-column label="区域类型" align="center" prop="areaType">
         <template slot-scope="scope">
@@ -103,7 +72,6 @@
           </template>
       </el-table-column>
 <!--      <el-table-column label="区域描述" align="center" prop="detail" />-->
-      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -147,9 +115,6 @@
       <div style="height:70rem">
       <div style="float:left;width:30rem">
       <el-form ref="form" :model="form" :rules="rules" label-width="8rem" >
-        <el-form-item label="区域编号" prop="areaCode" style="margin-top:2rem">
-          <el-input v-model="form.areaCode" placeholder="请输入编号" style="width:17rem"/>
-        </el-form-item>
         <el-form-item label="区域名称" prop="areaName" style="margin-top:6rem">
           <el-input v-model="form.areaName" placeholder="请输入名称" style="width:17rem"/>
         </el-form-item>
@@ -166,11 +131,8 @@
 <!--        <el-form-item label="区域描述" prop="detail" style="margin-top:6rem">
           <el-input v-model="form.detail" type="textarea" placeholder="请输入内容" style="width:17rem"/>
         </el-form-item>-->
-        <el-form-item label="备注" prop="remark" style="margin-top:6rem">
-          <el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注" style="width:17rem"/>
-        </el-form-item>
         <el-form-item label="电子围栏" prop="fence" style="margin-top:6rem">
-          <el-input v-model="form.fence" type="textarea" :rows="4" placeholder="请输入经纬度坐标" style="width:17rem"/>
+          <el-input v-model="form.fence" type="textarea" :rows="8" placeholder="请输入经纬度坐标" style="width:17rem"/>
         </el-form-item>
 <!--        <el-form-item label="经纬度" prop="lnglat" style="margin-top:6rem">
           <el-input v-model="form.lnglat" placeholder="请输入经纬度" style="width:17rem"/>
@@ -194,16 +156,9 @@
                   class="my_table"
                   :row-class-name="tableRowClassName"
                   :header-cell-style="{background:'#24A3B3 50%',color: '#C5D0D4'}">
-                  <el-table-column type="selection" width="55" align="center" />
+                  <el-table-column label="序号" type="index" width="55" align="center" />
                   <el-table-column label="设备编号" align="center" prop="deviceCode" />
                   <el-table-column label="设备名称" align="center" prop="deviceName" />
-                  <el-table-column label="设备类型" align="center" prop="deviceType">
-                    <template slot-scope="scope">
-                      <dict-tag :options="dict.type.tl_device_type" :value="scope.row.deviceType"/>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="经纬度" align="center" prop="lnglat" />
-                  <el-table-column label="备注" align="center" prop="remark" />
           </el-table>
       </div>
     </el-dialog>
@@ -214,13 +169,10 @@
                 class="my_table"
                 :row-class-name="tableRowClassName"
                 :header-cell-style="{background:'#24A3B3 50%',color: '#C5D0D4'}">
-                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column label="序号" type="index" width="55" align="center" />
                 <el-table-column label="编号" align="center" prop="locationCode" />
                 <el-table-column label="名称" align="center" prop="locationName" />
-                <el-table-column label="描述" align="center" prop="detail" />
-                <el-table-column label="巡检设备" align="center" prop="deviceIds" />
-                <el-table-column label="所属区域" align="center" prop="areaId" />
-                <el-table-column label="备注" align="center" prop="remark" />
+                <el-table-column label="所属区域" align="center" prop="areaName" />
             </el-table>
       </div>
     </el-dialog>
@@ -276,7 +228,6 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        areaCode: null,
         areaName: null,
         areaType: null,
       },
@@ -288,9 +239,6 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        areaCode: [
-          { required: true, message: "编号不能为空", trigger: "blur" }
-        ],
         areaName: [
           { required: true, message: "名称不能为空", trigger: "blur" }
         ],
@@ -359,7 +307,6 @@ export default {
       this.form = {
         id: null,
         parentId: null,
-        areaCode: null,
         areaName: null,
         areaType: null,
         detail: null,
@@ -460,8 +407,6 @@ export default {
                   this.form.fence = this.$refs.mapv.locations.join(',');
                   // this.form.fence = null;
             }
-            console.log(this.form.fence);
-            console.log(this.form.lnglat);
             addArea(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

src/views/qdtl/device/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="divtitle"><div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;">{{divtitle}}</div></div>
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备编号" prop="deviceCode">
+      <el-form-item label="编号" prop="deviceCode">
         <el-input
           v-model="queryParams.deviceCode"
           placeholder="请输入设备编号"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="设备名称" prop="deviceName">
+      <el-form-item label="名称" prop="deviceName">
         <el-input
           v-model="queryParams.deviceName"
           placeholder="请输入设备名称"
@@ -20,63 +20,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="设备类型" prop="deviceType">
-        <el-select v-model="queryParams.deviceType" placeholder="请选择设备类型" clearable size="small">
-          <el-option
-            v-for="dict in dict.type.tl_device_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item> -->
       <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-form-item>
     </el-form>
 
-    <!-- <el-row :gutter="10" class="mb8">
-     <el-col :span="1.5">
-        <el-button
-          style="width:8rem;height:3.2rem;"
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          @click="handleAdd"
-          v-hasPermi="['qdtl:device:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          style="width:8rem;height:3.2rem;"
-          type="primary"
-          plain
-          icon="el-icon-edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['qdtl:device:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          style="width:8rem;height:3.2rem;"
-          type="primary"
-          plain
-          icon="el-icon-delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['qdtl:device:remove']"
-        >删除</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row> -->
-
     <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange" stripe
       class="my_table"
       :row-class-name="tableRowClassName"
       :header-cell-style="{background:'#24A3B3 50%',color: '#C5D0D4'}">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" type="index" width="55" align="center" />
       <el-table-column label="设备编号" align="center" prop="deviceCode" />
       <el-table-column label="设备名称" align="center" prop="deviceName" />
       <!-- <el-table-column label="设备类型" align="center" prop="deviceType">
@@ -89,8 +43,7 @@
           <dict-tag :options="dict.type.tl_xun_area" :value="scope.row.areaId"/>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -99,15 +52,8 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['qdtl:device:edit']"
           >修改</el-button>
-          <!-- <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['qdtl:device:remove']"
-          >删除</el-button> -->
         </template>
-      </el-table-column>
+      </el-table-column>-->
     </el-table>
 
     <pagination

src/views/qdtl/incident/index.vue

@@ -55,7 +55,6 @@
                     </el-table-column>
                     <el-table-column label="事件名称" align="center" prop="name" />
                     <el-table-column label="事件描述" align="center" prop="detail" />
-                    <el-table-column label="相关图片" align="center" prop="detail" />
                     <el-table-column label="相关图片" align="center" class-name="small-padding fixed-width">
                                 <template slot-scope="scope">
                                       {{getCount(scope.row.pics)+getCount(scope.row.dealPics)}}
@@ -119,7 +118,7 @@
                                 <el-row type="flex" class="row-bg" style="margin-top:2rem">
                                     <el-col :span="5"><div style="float:right">状态:</div></el-col>
                                     <el-col :span="19">
-                                        <div style="padding-left:2rem"> 
+                                        <div style="padding-left:2rem">
                                                 <div>
                                                     {{getStatus(detailObj.status)}}
                                                 </div>
@@ -128,7 +127,7 @@
                                  <el-row type="flex" class="row-bg" style="margin-top:2rem">
                                     <el-col :span="5"><div style="float:right">事件等级:</div></el-col>
                                     <el-col :span="19">
-                                        <div style="padding-left:2rem"> 
+                                        <div style="padding-left:2rem">
                                                 <div :class='"color_"+detailObj.incLevel'>
                                                     {{getLevel(detailObj.incLevel)}}
                                                 </div>
@@ -167,7 +166,7 @@
                                     </div>
                                     <div v-if="detailObj.pics" style="display:flex; flex-direction: row;margin-top:3rem;padding-left:5rem">
                                                 <div v-for="(pic,index) in detailObj.picList.split(',')">
-                                                     <div :class='selectindex === index?"imgSelect":""' @click="selectImg(index)" style="margin-left:1rem">
+                                                     <div :class='selectindex === index?"imgSelect":""' v-if="pic !== ''" @click="selectImg(index)" style="margin-left:1rem">
                                                      <img :src='getImageUrl(pic)' style="width: 11.7rem;height: 8.7rem;"/>
                                                      </div>
                                                 </div>
@@ -204,7 +203,7 @@ export default {
   data() {
     return {
       pageList:[],
-     
+
       picImage:'',
 
       detailObj:{},
@@ -248,9 +247,9 @@ export default {
       // 表单参数
       form: {},
       selectindex:0,
-      
+
       formObj:{},
-      
+
       pointArry:{
         locations:'',
         type:''
@@ -298,7 +297,7 @@ export default {
             for(var index in this.dict.type.tl_xun_area){
                      if(this.dict.type.tl_xun_area[index].value == id){
                                     return this.dict.type.tl_xun_area[index].label
-                     }      
+                     }
             }
       },
       getImage (){
@@ -456,7 +455,7 @@ export default {
              return "success-row";
         }
     },
-   
+
   }
 };
 </script>

src/views/qdtl/location/index.vue

@@ -30,13 +30,12 @@
       class="my_table"
       :row-class-name="tableRowClassName"
       :header-cell-style="{background:'#24A3B3 50%',color: '#C5D0D4'}">
-
+      <el-table-column label="序号" type="index" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="locationCode" />
       <el-table-column label="名称" align="center" prop="locationName" />
 <!--      <el-table-column label="描述" align="center" prop="detail" />-->
 <!--      <el-table-column label="巡检设备" align="center" prop="deviceNamesText" />-->
       <el-table-column label="所属区域" align="center" prop="areaName" />
-      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -109,9 +108,6 @@
         <el-form-item label="经纬度" prop="lnglat" style="margin-top:6rem">
           <el-input type="textarea" v-model="form.lnglat" placeholder="请输入经纬度" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark" style="margin-top:6rem">
-          <el-input type="textarea" :rows="3" v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
       </el-form>
       </div>
       <div style="float:left;height:60rem;width:100rem;margin-left:10rem;margin-top:5rem">