页面bug

danger-manage-web/src/views/system/statistics/index.vue

@@ -75,8 +75,8 @@
 
     <el-table v-loading="loading" :data="settingList" @selection-change="handleSelectionChange">
       <el-table-column  width="250" label="巡检地点" align="center" prop="patrolAddress" />
-      <el-table-column  width="250" label="巡检区域" align="center" prop="dictLabel" />
-      <el-table-column width="650"  label="巡检内容" align="center" prop="patrolComent" >
+      <el-table-column  width="200" label="巡检区域" align="center" prop="dictLabel" />
+      <el-table-column width="600"  label="巡检内容" align="center" prop="patrolComent" >
         <span slot-scope="scope" v-if="scope.row.patrolComent">{{scope.row.patrolComent}}</span>
         <span v-else>-</span>
       </el-table-column>
@@ -84,12 +84,12 @@
         <span slot-scope="scope" v-if="scope.row.patrolFrequency">{{scope.row.patrolFrequency}}</span>
         <span v-else>-</span>
       </el-table-column>
-      <el-table-column width="150" label="上报人" align="center" prop="nickName" />
-      <el-table-column width="200"  label="是否正常" align="center" prop="isNormal">
+      <el-table-column width="120" label="上报人" align="center" prop="nickName" />
+      <el-table-column width="100"  label="巡检结果" align="center" prop="isNormal">
         <span slot-scope="scope" style="color: red" v-if="scope.row.isNormal==0">异常</span>
         <span slot-scope="scope" v-else-if="scope.row.isNormal==1">正常</span>
       </el-table-column>
-      <el-table-column label="上报时间" align="center" prop="createTime" />
+      <el-table-column label="上报时间" align="center" prop="createTime" width="150"/>
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->

danger-manage-web/src/views/system/tNfcSetting/index.vue

@@ -84,14 +84,14 @@
 
     <el-table v-loading="loading" :data="settingList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="排序"   width="150" align="center" prop="patrolSort" />
+      <el-table-column label="排序"   width="60" align="center" prop="patrolSort" />
+      <el-table-column label="巡检区域" width="150" align="center" prop="nickName" />
       <el-table-column label="巡检地点" width="200" align="center" prop="patrolAddress" />
-      <el-table-column label="巡检区域" width="200" align="center" prop="nickName" />
       <el-table-column label="巡检内容" width="750" align="center" prop="patrolComent" >
         <span slot-scope="scope" v-if="scope.row.patrolComent">{{scope.row.patrolComent}}</span>
         <span v-else>-</span>
       </el-table-column>
-      <el-table-column label="巡检频次"  width="250" align="center" prop="patrolFrequency" >
+      <el-table-column label="巡检频次"  width="150" align="center" prop="patrolFrequency" >
         <span slot-scope="scope" v-if="scope.row.patrolFrequency">{{scope.row.patrolFrequency}}</span>
         <span v-else>-</span>
       </el-table-column>
@@ -152,8 +152,8 @@
         <el-form-item label="nfc编号" prop="nfcNum">
           <el-input v-model="form.nfcNum" placeholder="请输入nfc编号" />
         </el-form-item>
-        <el-form-item label="巡检内容" prop="patrolComent">
-          <el-input v-model="form.patrolComent" type="textarea" placeholder="请输入内容" />
+        <el-form-item label="巡检内容" prop="patrolComent" >
+          <el-input v-model="form.patrolComent" type="textarea" placeholder="请输入内容" height="100px"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">