优化

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/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">