Преглед изворни кода

样式修改 隐藏目前暂时无用的功能

xiao547607 пре 5 година
родитељ
комит
c55240311e
2 измењених фајлова са 29 додато и 26 уклоњено
  1. 8 16
      src/views/base/deviceInfo-detail.vue
  2. 21 10
      src/views/base/deviceInfo-list.vue

+ 8 - 16
src/views/base/deviceInfo-detail.vue

@@ -70,10 +70,14 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="运行状态" prop="isOnline">
-              <el-select v-model="formModel.isOnline" filterable style="width:200px">
-                <el-option :key="true" label="在线" :value="true"></el-option>
-                <el-option :key="false" label="离线" :value="false"></el-option>
+            <el-form-item label="类型" prop="type">
+              <el-select v-model="formModel.type" filterable placeholder="请选择" style="width:200px">
+                <el-option
+                  v-for="result in typeData"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -88,18 +92,6 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="类型" prop="type">
-              <el-select v-model="formModel.type" filterable placeholder="请选择" style="width:200px">
-                <el-option
-                  v-for="result in typeData"
-                  :key="result.id"
-                  :label="result.name"
-                  :value="result.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="二维码地址" prop="codeAddress">
               <el-input v-model="formModel.codeAddress" placeholder="请输入二维码地址" style="width:200px"></el-input>

+ 21 - 10
src/views/base/deviceInfo-list.vue

@@ -74,21 +74,32 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="companyName" label="单位" width="280"></el-table-column>
+      <el-table-column prop="companyName" label="单位" width="280" show-overflow-tooltip></el-table-column>
       <el-table-column prop="deviceNo" label="设备编号" width="200" fixed="left"></el-table-column>
-      <el-table-column prop="aliasName" label="设备别名" width="150"></el-table-column>
-      <el-table-column prop="isOnlineN" label="运行状态" width="150"></el-table-column>
+      <el-table-column prop="aliasName" label="设备别名" width="250" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="isOnline" label="运行状态" width="150">
+        <template slot-scope="{row}">
+          <div
+            v-if="row.isOnline"
+            style="border-radius: 30px;background-color:#F56C6C;width:20px;height:20px;"
+          ></div>
+          <div
+            v-if="!row.isOnline"
+            style="border-radius: 30px;background-color:#67C23A;width:20px;height:20px;"
+          ></div>
+        </template>
+      </el-table-column>
       <el-table-column prop="ipAddress" label="ip地址" width="150"></el-table-column>
       <el-table-column prop="port" label="端口" width="80"></el-table-column>
-      <el-table-column prop="unlockPassword" label="开锁密码" width="150"></el-table-column>
-      <el-table-column prop="codeAddress" label="二维码地址" width="180"></el-table-column>
-      <el-table-column prop="typeN" label="类型" width="180"></el-table-column>
-      <el-table-column label="操作" width="450" fixed="right">
+      <!-- <el-table-column prop="unlockPassword" label="开锁密码" width="150"></el-table-column>
+      <el-table-column prop="codeAddress" label="二维码地址" width="180"></el-table-column>-->
+      <el-table-column prop="typeN" label="类型" width="80"></el-table-column>
+      <el-table-column label="操作" width="150">
         <template slot-scope="{row}">
           <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
-          <el-button size="mini" type="primary" @click="handleRestart(row)">重启</el-button>
+          <!-- <el-button size="mini" type="primary" @click="handleRestart(row)">重启</el-button>
           <el-button size="mini" type="primary" @click="handleClear(row)">清除人脸数据</el-button>
-          <el-button size="mini" type="primary" @click="handleQRcode(row)">二维码地址</el-button>
+          <el-button size="mini" type="primary" @click="handleQRcode(row)">二维码地址</el-button>-->
           <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
         </template>
       </el-table-column>
@@ -146,7 +157,7 @@ export default {
       businessKey: "",
       typeData: [],
       companyResult: "",
-      tableHeight:""
+      tableHeight: ""
     };
   },
   created() {