pref:修改按钮颜色

device-manager-ui/admin/src/assets/less/common.less

@@ -328,7 +328,7 @@
   text-align: right;
 }
 
-.addclass {
+.el-button--primary {
   background: linear-gradient(90deg, #5ab6ff 0%, #2e9aff 100%) !important;
   color: #fff !important;
 }

device-manager-ui/admin/src/views/device/list.vue

@@ -2,62 +2,145 @@
   <div class="page">
     <div class="page-header">
       <div>
-        <span style="font-size: 14px"><b>设备列表</b> （
+        <span style="font-size: 14px"
+          ><b>设备列表</b> （
           <span style="margin-right: 6px">{{ siteName }}</span> 站点编码：{{
             siteCode
           }}
-          ）</span>
-        <el-link style="margin-left: 10px" type="primary" class="addclass" @click="switchMap" :underline="false">地图模式
+          ）</span
+        >
+        <el-link
+          style="margin-left: 10px"
+          type="primary"
+          class="addclass"
+          @click="switchMap"
+          :underline="false"
+          >地图模式
         </el-link>
       </div>
-      <el-button style="margin-right: 10px" @click="$router.back()" size="small">返回上一级
+      <el-button style="margin-right: 10px" @click="$router.back()" size="small"
+        >返回上一级
       </el-button>
     </div>
     <el-divider></el-divider>
     <LayoutTable :data="tableData" :config="tableConfig">
-      <el-button slot="table-head-left2" style="margin-left: 10px" type="primary" class="addclass" size="mini" @click="handleImport">导入
+      <el-button
+        slot="table-head-left2"
+        style="margin-left: 10px"
+        type="primary"
+        class="addclass"
+        size="mini"
+        @click="handleImport"
+        >导入
       </el-button>
-      <el-button slot="table-head-left2" style="margin-left: 10px" type="primary" class="addclass" size="mini" @click="doExport"
-        :disabled="isExport">导出
+      <el-button
+        slot="table-head-left2"
+        style="margin-left: 10px"
+        type="primary"
+        class="addclass"
+        size="mini"
+        @click="doExport"
+        :disabled="isExport"
+        >导出
       </el-button>
 
-      <el-button slot="table-head-left2" style="margin-left: 10px" type="primary" class="addclass" size="mini"
-        @click="batchActiveDevice">批量激活
+      <el-button
+        slot="table-head-left2"
+        style="margin-left: 10px"
+        type="primary"
+        class="addclass"
+        size="mini"
+        @click="batchActiveDevice"
+        >批量激活
       </el-button>
 
-      <el-button slot="table-head-left2" style="margin-left: 10px" type="primary" class="addclass" size="mini"
-        @click="batchUpdateHall">更新大厅
+      <el-button
+        slot="table-head-left2"
+        style="margin-left: 10px"
+        type="primary"
+        class="addclass"
+        size="mini"
+        @click="batchUpdateHall"
+        >更新大厅
       </el-button>
 
-
-      <el-button slot="table-head-left2" style="margin-left: 10px" type="primary" class="addclass" size="mini"
-        @click="batchRestartApp">批量重启
+      <el-button
+        slot="table-head-left2"
+        style="margin-left: 10px"
+        type="primary"
+        class="addclass"
+        size="mini"
+        @click="batchRestartApp"
+        >批量重启
       </el-button>
-      <el-tag slot="table-body-head" size="mini" class="cursord" @click="changeStatAll()">设备总数：{{ tableData.totalCount }}台
+      <el-tag
+        slot="table-body-head"
+        size="mini"
+        class="cursord"
+        @click="changeStatAll()"
+        >设备总数：{{ tableData.totalCount }}台
       </el-tag>
 
-      <el-tag slot="table-body-head" size="mini" style="margin: 5px" type="success" class="cursord"
-        @click="changeStat(2)">在线：{{ tableData.onlineCount }}台
+      <el-tag
+        slot="table-body-head"
+        size="mini"
+        style="margin: 5px"
+        type="success"
+        class="cursord"
+        @click="changeStat(2)"
+        >在线：{{ tableData.onlineCount }}台
       </el-tag>
 
-      <el-tag slot="table-body-head" size="mini" style="margin: 5px" type="danger" class="cursord"
-        @click="changeStat(1)">离线：{{ tableData.offlineCount }}台
+      <el-tag
+        slot="table-body-head"
+        size="mini"
+        style="margin: 5px"
+        type="danger"
+        class="cursord"
+        @click="changeStat(1)"
+        >离线：{{ tableData.offlineCount }}台
       </el-tag>
 
-      <el-tag slot="table-body-head" size="mini" style="margin: 5px" type="danger" class="cursord"
-        @click="changeStatEnabled(0)">停用：{{ tableData.stopCount }}台
+      <el-tag
+        slot="table-body-head"
+        size="mini"
+        style="margin: 5px"
+        type="danger"
+        class="cursord"
+        @click="changeStatEnabled(0)"
+        >停用：{{ tableData.stopCount }}台
       </el-tag>
 
-      <el-tag slot="table-body-head" size="mini" style="margin: 5px" type="danger" class="cursord"
-        @click="changeStat(0)">未激活：{{ tableData.unActiveCount }}台
+      <el-tag
+        slot="table-body-head"
+        size="mini"
+        style="margin: 5px"
+        type="warning"
+        class="cursord"
+        @click="changeStat(0)"
+        >未激活：{{ tableData.unActiveCount }}台
       </el-tag>
     </LayoutTable>
 
     <!-- 设备导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-        :action="upload.url + '?siteId=' + siteId" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess" :auto-upload="false" drag>
+    <el-dialog
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?siteId=' + siteId"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">
           将文件拖到此处，或
@@ -66,7 +149,12 @@
         <div class="el-upload__tip" slot="tip">
           <el-checkbox v-model="upload.updateSupport" />
           是否更新已经存在的数据
-          <el-link type="primary" class="addclass" style="font-size: 14px" @click="downloadTemplate">下载模板
+          <el-link
+            type="primary"
+            class="addclass"
+            style="font-size: 14px"
+            @click="downloadTemplate"
+            >下载模板
           </el-link>
         </div>
         <div class="el-upload__tip" style="color: red" slot="tip">
@@ -74,46 +162,91 @@
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" class="addclass" @click="submitFileForm">确 定</el-button>
+        <el-button type="primary" class="addclass" @click="submitFileForm"
+          >确 定</el-button
+        >
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
 
     <!-- 站点修改对话框 -->
-    <el-dialog :title="tree.title" :visible.sync="tree.open" width="40%" append-to-body>
-      <span style="font-size: 13px"><b>当前站点:</b> (<el-link style="margin-left: 10px" type="primary" class="addclass"
-          :underline="false">{{ siteName }}</el-link>
-        站点编码：{{ siteCode }} )</span>
+    <el-dialog
+      :title="tree.title"
+      :visible.sync="tree.open"
+      width="40%"
+      append-to-body
+    >
+      <span style="font-size: 13px"
+        ><b>当前站点:</b> (<el-link
+          style="margin-left: 10px"
+          type="primary"
+          class="addclass"
+          :underline="false"
+          >{{ siteName }}</el-link
+        >
+        站点编码：{{ siteCode }} )</span
+      >
       <el-divider></el-divider>
       <el-scrollbar style="height: 100%">
-        <el-tree size="mini" ref="siteTree" :data="areaData" id="el-tree" node-key="id" indent="4" :props="treeProps"
-          :load="loadNode" highlight-current default-expand-all :expand-on-click-node="false"
-          :render-content="renderContent" @node-click="handleNodeClick">
+        <el-tree
+          size="mini"
+          ref="siteTree"
+          :data="areaData"
+          id="el-tree"
+          node-key="id"
+          indent="4"
+          :props="treeProps"
+          :load="loadNode"
+          highlight-current
+          default-expand-all
+          :expand-on-click-node="false"
+          :render-content="renderContent"
+          @node-click="handleNodeClick"
+        >
         </el-tree>
       </el-scrollbar>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" class="addclass" @click="updateSiteConform">确 定</el-button>
+        <el-button type="primary" class="addclass" @click="updateSiteConform"
+          >确 定</el-button
+        >
         <el-button @click="tree.open = false">取 消</el-button>
       </div>
     </el-dialog>
 
-
     <!-- 大厅修改对话框 -->
-    <el-dialog :title="hallDialog.title" :visible.sync="hallDialog.open" width="60%" append-to-body>
+    <el-dialog
+      :title="hallDialog.title"
+      :visible.sync="hallDialog.open"
+      width="60%"
+      append-to-body
+    >
       <el-form label-width="120px">
-
-        <Field label="站点大厅" v-model="hallId" type="radio" :enumData="tableData.dict.hallId" placeholder="请选择所属大厅" />
-
+        <Field
+          label="站点大厅"
+          v-model="hallId"
+          type="radio"
+          :enumData="tableData.dict.hallId"
+          placeholder="请选择所属大厅"
+        />
       </el-form>
 
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" class="addclass" @click="updateBatchHallConform">确 定</el-button>
+        <el-button
+          type="primary"
+          class="addclass"
+          @click="updateBatchHallConform"
+          >确 定</el-button
+        >
         <el-button @click="hallDialog.open = false">取 消</el-button>
       </div>
     </el-dialog>
 
     <!-- 查看二维码弹窗 -->
-    <el-dialog title="设备二维码" :visible.sync="qrCodeDialog.visible" width="350px">
+    <el-dialog
+      title="设备二维码"
+      :visible.sync="qrCodeDialog.visible"
+      width="350px"
+    >
       <img :src="qrCodeDialog.qrCode" />
       <p style="word-wrap: break-word">{{ qrCodeDialog.qrCodeUrl }}</p>
     </el-dialog>
@@ -170,8 +303,6 @@ export default {
       this.upload.open = true;
     },
 
-
-
     /** 下载模板操作 */
     downloadTemplate() {
       this.isExport = true;
@@ -241,12 +372,12 @@ export default {
     },
 
     changeStatAll() {
-      delete this.query["productId"]
-      delete this.query["deviceName"]
-      delete this.query["deviceCode"]
-      delete this.query["deviceStatus"]
+      delete this.query["productId"];
+      delete this.query["deviceName"];
+      delete this.query["deviceCode"];
+      delete this.query["deviceStatus"];
 
-      this.query["page"] = 1
+      this.query["page"] = 1;
       this.query = Object.assign(this.query, {
         //deviceStatusList: [1, 2],
         // enabled: 1,
@@ -257,7 +388,7 @@ export default {
 
     changeStatEnabled(enabled) {
       //去除其它条件
-      this.query["page"] = 1
+      this.query["page"] = 1;
       this.query = Object.assign(this.query, {
         // deviceStatusList: [1, 2],
         enabled: enabled,
@@ -270,13 +401,12 @@ export default {
       //去除其它条件
       // delete this.query["productId"]
       //delete this.query["deviceName"]
-      delete this.query["enabled"]
+      delete this.query["enabled"];
       this.query = Object.assign(this.query, { deviceStatus: val });
-      this.query["page"] = 1
+      this.query["page"] = 1;
       this.getData();
     },
 
-
     activeDevice(row) {
       this.$post("/device/active", {
         deviceCode: row.deviceCode,
@@ -307,28 +437,26 @@ export default {
         });
     },
 
-
     batchUpdateHall() {
       this.hallId = null;
-      this.hallName = ""
+      this.hallName = "";
       this.hallDialog.title = "设备所属大厅设置";
       this.hallDialog.open = true;
     },
 
-
     updateBatchHallConform(row) {
       this.hallName = this.tableData.dict.hallId[this.hallId];
       this.$post("/device/batchUpdateHall", {
         idList: this.selection,
         hallId: this.hallId,
-        hallName: this.hallName
+        hallName: this.hallName,
       })
         .then((res) => {
           if (res.code == 1) {
             this.$message.success("批量更新大厅设备成功！");
             this.hallDialog.open = false;
-            console.log(this.$refs)
-            this.selection = []
+            console.log(this.$refs);
+            this.selection = [];
             this.getData();
           }
         })
@@ -337,7 +465,6 @@ export default {
         });
     },
 
-
     batchRestartApp(row) {
       this.$post("/device/batchRestartApp", {
         idList: this.selection,