no message

src/components/GanttChart/index.vue

@@ -13,7 +13,7 @@
       </el-select>
     </el-form-item>
     <el-form-item style="float:right">
-      <el-button type="primary" icon="Plus" @click="getDetail()">新增预设</el-button>
+      <el-button type="primary" plain icon="Plus" @click="getDetail()">新增预设</el-button>
     </el-form-item>
   </el-form>
   <div class="timer">
@@ -194,7 +194,6 @@ watch(() => props.date, (val) => {
 
 // 拖拽内容
 function onMove(params) {
-  console.log(1);
   if (params.to.childElementCount < 1) {
     return true
   } else {
@@ -204,7 +203,6 @@ function onMove(params) {
 
 // 拖拽结束
 function onEnd(params) {
-  console.log(2);
   if (params.from.className === 'contentList' &&
     params.to.className === 'label_box' ||
     params.from.className === 'label_box' &&
@@ -336,7 +334,6 @@ const storeName = (val) => {
 }
 
 .popper {
-
   .title,
   .main {
     line-height: 35px;
@@ -357,6 +354,6 @@ const storeName = (val) => {
 }
 
 .search {
-  padding-left: 70px;
+  padding-left: 100px;
 }
 </style>

src/views/business/class/index.vue

@@ -2,7 +2,7 @@
   <div class='app-container'>
     <el-form>
       <el-form-item>
-        <el-button type="primary" icon="Plus" @click="getDialog()">新增行业</el-button>
+        <el-button type="primary" plain icon="Plus" @click="getDialog()">新增行业</el-button>
       </el-form-item>
     </el-form>
     <el-table :data="data.tableData" v-loading="loading">

src/views/content/class/index.vue

@@ -2,7 +2,7 @@
   <div class='app-container'>
     <el-form>
       <el-form-item>
-        <el-button type="primary" icon="Plus" @click="getDialog()">新增分类</el-button>
+        <el-button type="primary" plain icon="Plus" @click="getDialog()">新增分类</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->

src/views/content/scene/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class='app-container'>
     <div class="left">
-      <el-button type="primary" icon="Plus" @click="getDialog()">新增场景</el-button>
+      <el-button type="primary" plain icon="Plus" @click="getDialog()">新增场景</el-button>
       <el-input class="search" v-model="data.form.takeName" placeholder="搜索场景名称" clearable>
         <template #append>
           <el-button icon="Search" @click="getSearch" />

src/views/content/setting/index.vue

@@ -39,7 +39,7 @@
                 </template>
               </draggable>
             </el-scrollbar>
-            <el-pagination v-show="audioData.total > 10" layout="prev,pager,next" :total="audioData.total"
+            <el-pagination v-show="audioData.total > 0" layout="prev,pager,next" :total="audioData.total"
               @current-change="handleChangeCurrent" />
           </el-tab-pane>
         </el-tabs>

src/views/store/devices/index.vue

@@ -2,7 +2,7 @@
   <div class='app-container'>
     <el-form inline>
       <el-form-item label="设备名称：">
-        <el-input v-model="data.form.name" placeholder="请输入设备名称" />
+        <el-input v-model="data.form.name" placeholder="请输入设备名称" clearable />
       </el-form-item>
       <!-- <el-form-item label="设备分类：">
         <el-select v-model="data.form.deviceCategoryId" placeholder="请选择设备分类">
@@ -10,12 +10,17 @@
         </el-select>
       </el-form-item> -->
       <el-form-item label="所属企业：">
-        <el-select v-model="data.form.tenantId" placeholder="请选择所属企业">
+        <el-select v-model="data.form.tenantId" placeholder="请选择所属企业" clearable>
           <el-option v-for="item in businessData.options" :key="item.id" :value="item.id" :label="item.name" />
         </el-select>
       </el-form-item>
-      <el-form-item label="当前状态：">
-        <el-select v-model="data.form.status" placeholder="请选择当前状态">
+      <el-form-item label="设备状态：">
+        <el-select v-model="data.form.deviceStatus" placeholder="请选择当前状态" clearable>
+          <el-option v-for="item in dev_change_status" :key="item.value" :value="item.value" :label="item.label" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="绑定状态：">
+        <el-select v-model="data.form.status" placeholder="请选择当前状态" clearable>
           <el-option v-for="item in sys_change_status" :key="item.value" :value="item.value" :label="item.label" />
         </el-select>
       </el-form-item>
@@ -24,22 +29,23 @@
         <el-button icon="Refresh" @click="getRefresh">重置</el-button>
         <el-button type="primary" plain icon="Plus" @click="getDialog()">关联设备</el-button>
       </el-form-item>
-      <el-form-item>
-        <el-button icon="Expand" @click="grid = false" />
-        <el-button icon="Grid" @click="grid = true" />
-      </el-form-item>
+      <!-- <el-form-item>
+        <el-button icon="Grid" title="九宫格" @click="grid = true" />
+        <el-button icon="Expand" title="列表" @click="grid = false" />
+      </el-form-item> -->
     </el-form>
     <!-- 列表 -->
-    <el-table v-if="!grid" :data="data.tableData" v-loading="loading">
-      <el-table-column label="设备名称" prop="deviceName" align="center"></el-table-column>
-      <el-table-column label="设备型号" prop="clientType" align="center"></el-table-column>
+    <el-table :data="data.tableData" v-loading="loading">
+      <el-table-column label="设备名称" prop="deviceName" align="center" />
+      <el-table-column label="设备型号" prop="clientType" align="center" />
+      <el-table-column label="设备Mac" prop="deviceMac" align="center" />
       <el-table-column label="设备图片" align="center" width="100px">
         <template #default="scope">
           <el-image :src="scope.row.devicePic" />
         </template>
       </el-table-column>
-      <el-table-column label="设备分类" prop="deviceCategoryName" align="center"></el-table-column>
-      <el-table-column label="所属门店" prop="storeName" align="center"></el-table-column>
+      <el-table-column label="设备分类" prop="deviceCategoryName" align="center" />
+      <el-table-column label="所属门店" prop="storeName" align="center" />
       <el-table-column label="所属城市" align="center">
         <template #default="scope">
           <span>{{ scope.row.provinceName }}</span>
@@ -47,7 +53,12 @@
           <span v-if="scope.row.areaName"> - {{ scope.row.areaName }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="当前状态" prop="status" align="center">
+      <el-table-column label="设备状态" prop="status" align="center">
+        <template #default="scope">
+          <dict-tag :options="dev_change_status" :value="scope.row.deviceStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="绑定状态" prop="status" align="center">
         <template #default="scope">
           <dict-tag :options="sys_change_status" :value="scope.row.status" />
         </template>
@@ -62,10 +73,10 @@
         </template>
       </el-table-column>
     </el-table>
-    <div v-else class="card_box">
+    <!-- <div v-else class="card_box">
       <div class="card" v-for="item in data.tableData" :key="item">
         <div class="card-header">
-          <i class="state" />
+          <i class="state" :style="{ 'backgroundColor': item.deviceStatus === 0 ? '#8aff5b' : '#ff0000' }" />
           <el-dropdown>
             <el-icon>
               <MoreFilled />
@@ -81,10 +92,11 @@
             </template>
           </el-dropdown>
         </div>
-        <el-image class="icon" src="" />
-        <span class="name">猫王音响·Mate X1</span>
+        <span class="name">{{ item.deviceName }}</span>
+        <el-image class="icon" :src="item.devicePic" />
+        
       </div>
-    </div>
+    </div> -->
     <pagination v-show="total > 0" :total="total" v-model:page="data.form.pageNum" v-model:limit="data.form.pageSize"
       @pagination="getList" />
 
@@ -132,7 +144,7 @@ const { deviceOptions } = useDeviceList()
 
 const { proxy } = getCurrentInstance()
 
-const { sys_change_status } = proxy.useDict("sys_change_status");
+const { sys_change_status, dev_change_status } = proxy.useDict("sys_change_status", "dev_change_status");
 // 遮罩层
 const loading = ref(false)
 
@@ -165,7 +177,7 @@ const data = reactive({
 
 const total = ref(0)
 
-const grid = ref(false)
+const grid = ref(true)
 
 // 列表
 const getList = () => {
@@ -306,15 +318,15 @@ watch(() => data.dialogForm.tenantId, (val) => {
     .state {
       width: 10px;
       height: 10px;
-      background-color: #8aff5b;
       border-radius: 50%;
       display: inline-block;
     }
   }
 
   .icon {
+    width: 180px;
+    height: 140px;
     padding: 0 20px;
-    height: 110px;
     margin: 15px 0;
   }
 

src/views/store/list/index.vue

@@ -6,7 +6,7 @@
       </el-form-item>
       <el-form-item label="门店分组：">
         <el-select v-model="data.form.groupId" placeholder="请选择门店分组" filterable remote :remote-method="groupRemote"
-          remote-show-suffix>
+          remote-show-suffix clearable>
           <el-option v-for="item in groupData.options" :key="item.id" :value="item.id" :label="item.name" />
         </el-select>
       </el-form-item>