feat 增加设备字段, 增加用户账号

Co-authored-by: Copilot <copilot@github.com>

.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
+VITE_APP_TITLE = 可视化电子围栏管理系统
 VITE_APP_LOGO_TITLE = RuoYi-Vue-Plus
 
 # 开发环境配置

.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
+VITE_APP_TITLE = 可视化电子围栏管理系统
 VITE_APP_LOGO_TITLE = RuoYi-Vue-Plus
 
 # 生产环境配置

.eslintrc-auto-import.json

@@ -5,10 +5,6 @@
     "ComputedRef": true,
     "DirectiveBinding": true,
     "EffectScope": true,
-    "ElLoading": true,
-    "ElMessage": true,
-    "ElMessageBox": true,
-    "ElNotification": true,
     "ExtractDefaultPropTypes": true,
     "ExtractPropTypes": true,
     "ExtractPublicPropTypes": true,

package.json

@@ -2,7 +2,7 @@
   "$schema": "https://json.schemastore.org/package",
   "name": "ruoyi-vue-plus",
   "version": "5.6.1-2.6.1",
-  "description": "RuoYi-Vue-Plus多租户管理系统",
+  "description": "可视化电子围栏管理系统",
   "author": "LionLi",
   "license": "MIT",
   "type": "module",

src/views/equipmentList/list.vue

@@ -17,6 +17,7 @@
               <el-select v-model="queryParams.status" placeholder="请选择设备状态" clearable style="width: 160px">
                 <el-option label="在线" :value="1" />
                 <el-option label="离线" :value="2" />
+                <el-option label="低帧" :value="3" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -56,20 +57,21 @@
         <el-table-column v-if="true" label="设备编号" align="center" prop="code" />
         <el-table-column label="设备名称" align="center" prop="name" />
         <el-table-column label="监控区域" align="center" prop="monitoringArea" />
-        <el-table-column label="设备状态" align="center" prop="status" width="100">
+        <el-table-column label="设备状态" align="center" prop="statusName" width="100">
-          <template #default="scope">
+          <!-- <template #default="scope">
             <el-tag v-if="scope.row.status === 1 || scope.row.status === '1'">在线</el-tag>
-            <el-tag v-else-if="scope.row.status === 2 || scope.row.status === '2'" type="info">离线</el-tag>
+            <el-tag v-else-if="scope.row.status === 2 || scope.row.status === '2'" type="warning">离线</el-tag>
+            <el-tag v-else-if="scope.row.status === 3 || scope.row.status === '3'" type="info">低帧</el-tag>
             <el-tag v-else>{{ scope.row.status ?? '-' }}</el-tag>
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column label="设备型号" align="center" prop="model" />
         <el-table-column label="固件版本" align="center" prop="id" />
         <el-table-column label="是否绘制区域" align="center" prop="isDrawArea">
           <template #default="scope">
-            <span v-if="scope.row.isDrawArea === 1 || scope.row.isDrawArea === '1'">是</span>
+            <el-tag v-if="scope.row.isDrawArea === 1 || scope.row.isDrawArea === '1'">是</el-tag>
-            <span v-else-if="scope.row.isDrawArea === 0 || scope.row.isDrawArea === '0'">否</span>
+            <el-tag v-else-if="scope.row.isDrawArea === 0 || scope.row.isDrawArea === '0'" type="info">否</el-tag>
-            <span v-else>{{ scope.row.isDrawArea ?? '-' }}</span>
+            <el-tag v-else>{{ scope.row.isDrawArea ?? '-' }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="绑定时间" align="center" prop="activateTime" />
@@ -77,8 +79,11 @@
         <el-table-column width="400" label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-button type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
-            <el-button type="primary" @click="handleSee(scope.row)">查看监控</el-button>
+            <el-button :disabled="scope.row.status == 2 && scope.row.status == '2'" type="primary" @click="handleSee(scope.row)">查看监控</el-button>
-            <el-button :disabled="scope.row.status === 1 || scope.row.status === '1'" type="primary" @click="handleActivate(scope.row)"
+            <el-button
+              :disabled="scope.row.status === 1 || scope.row.status === 2 || scope.row.status === '1' || scope.row.status === '2'"
+              type="primary"
+              @click="handleActivate(scope.row)"
               >唤醒设备</el-button
             >
             <el-button type="primary" @click="handleDelete(scope.row)">删除</el-button>

src/views/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container home">
     <el-row :gutter="20">
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>RuoYi-Vue-Plus多租户管理系统</h2>
+        <h2>可视化电子围栏管理系统</h2>
         <p>
           RuoYi-Vue-Plus 是基于 RuoYi-Vue 针对 分布式集群 场景升级(不兼容原框架)
           <br />

src/views/systemList/user/user.vue

@@ -96,7 +96,7 @@
 
           <el-table v-loading="loading" border :data="userList" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="50" align="center" />
-            <el-table-column v-if="columns[0].visible" key="userId" label="用户账号" align="center" prop="userId" />
+            <el-table-column key="userName" label="用户账号" align="center" prop="userName" />
             <el-table-column v-if="columns[1].visible" key="roleName" label="角色名称" align="center" prop="roleName" :show-overflow-tooltip="true" />
             <el-table-column v-if="columns[2].visible" key="nickName" label="操作人" align="center" prop="nickName" :show-overflow-tooltip="true" />
             <el-table-column