调整字段

src/api/device/index.ts

@@ -17,6 +17,9 @@ export interface DeviceVO {
   updateby: string // 更新人
   onlinetime: string // 最近上线时间
   restart: number // 是否重启
+  vipstarttime: string // 会员开始时间
+  vipendtime: string // 会员结束时间
+  isvip: number // 是否会员
 }
 
 // 设备分布地图数据 VO

src/views/devices/DetailsForm.vue

@@ -7,20 +7,20 @@
       label-width="100px"
       :disabled="!isEditing"
     >
-      <el-form-item label="设备ID">
+      <el-form-item label="设备ID：">
         <span>{{ formData.devicecode }}</span>
       </el-form-item>
-      <el-form-item label="设备名称">
+      <el-form-item label="设备名称：">
         <el-input v-if="isEditing" v-model="formData.devicename" />
         <span v-else>{{ formData.devicename }}</span>
       </el-form-item>
-      <el-form-item label="所属机构">
+      <el-form-item label="所属机构：">
         <span>{{ formData.orgname }}</span>
       </el-form-item>
-      <el-form-item label="设备类型">
+      <el-form-item label="设备类型：">
         <span>{{ getDeviceTypeName(formData.devicetype) }}</span>
       </el-form-item>
-      <el-form-item label="设备位置" class="location-form-item">
+      <el-form-item label="设备位置：" class="location-form-item">
         <template v-if="isEditing">
           <el-cascader
             v-model="selectedOptions"
@@ -39,12 +39,14 @@
         </template>
         <span v-else>{{ fullLocation }}</span>
       </el-form-item>
-      <el-form-item label="设备状态">
+      <el-form-item label="设备状态：">
         <span>{{ getDeviceStatusName(formData.devicestatus) }}</span>
       </el-form-item>
-      <el-form-item label="设备描述">
-        <el-input v-if="isEditing" v-model="formData.description" type="textarea" :rows="3" />
-        <span v-else>{{ formData.description }}</span>
+      <el-form-item label="是否会员：">
+        <span>{{ formData.isvip === 1 ? '是' : '否' }}</span>
+      </el-form-item>
+      <el-form-item label="到期时间：">
+        <span>{{ formData.vipendtime }}</span>
       </el-form-item>
     </el-form>
     <template #footer>
@@ -97,8 +99,9 @@ const formData = ref<DeviceVO>({
   devicestatus: 0,
   orgid: 0,
   orgname: '',
-  description: '',
-  createtime: new Date(),
+  vipendtime: '',
+  isvip: 0,
+  createtime: '',
   updatetime: new Date(),
   createby: '',
   updateby: ''
@@ -251,7 +254,8 @@ const resetForm = () => {
     devicestatus: 0,
     orgid: 0,
     orgname: '',
-    description: '',
+    vipendtime: '',
+    isvip: 0,
     createtime: new Date(),
     updatetime: new Date(),
     createby: '',

src/views/devices/DevFrom.vue

@@ -16,13 +16,13 @@
       :disabled="isDetail"
       class="device-form"
     >
-      <el-form-item label="设备ID" prop="devicecode">
+      <el-form-item label="设备ID：" prop="devicecode">
         <el-input v-model="formData.devicecode" placeholder="请输入设备ID" />
       </el-form-item>
-      <el-form-item label="设备名称" prop="devicename">
+      <el-form-item label="设备名称：" prop="devicename">
         <el-input v-model="formData.devicename" placeholder="请输入设备名称" />
       </el-form-item>
-      <el-form-item label="设备类型" prop="devicetype">
+      <el-form-item label="设备类型：" prop="devicetype">
         <el-select v-model="formData.devicetype" placeholder="请选择设备类型">
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.IOT_DEVICE_TYPE)"
@@ -32,7 +32,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="设备位置" prop="location" class="location-form-item" inline>
+      <el-form-item label="设备位置：" prop="location" class="location-form-item" inline>
         <el-cascader
           v-model="selectedOptions"
           :options="options"
@@ -48,16 +48,11 @@
           class="detail-address-input"
         />
       </el-form-item>
-      <el-form-item label="设备状态" prop="devicestatus">
+      <el-form-item label="设备状态：" prop="devicestatus">
         <span>待激活</span>
       </el-form-item>
-      <el-form-item label="设备描述" prop="description">
-        <el-input
-          v-model="formData.description"
-          type="textarea"
-          placeholder="请输入设备描述"
-          :rows="3"
-        />
+      <el-form-item label="到期时间：" prop="vipendtime">
+        <span>{{ formData.vipendtime }}</span>
       </el-form-item>
     </el-form>
     <template #footer>
@@ -95,7 +90,7 @@ const formData = ref<Partial<DeviceVO>>({
   devicestatus: 0,
   orgid: undefined,
   orgname: '',
-  description: '',
+  vipendtime: '',
   createby: '',
   updateby: ''
 })
@@ -173,7 +168,7 @@ const resetForm = () => {
     devicestatus: 0,
     orgid: undefined,
     orgname: '',
-    description: '',
+    vipendtime: '',
     createby: '',
     updateby: ''
   }

src/views/person/index.vue

@@ -101,7 +101,7 @@
             {{ (queryParams.pageNo - 1) * queryParams.pageSize + scope.$index + 1 }}
           </template>
         </el-table-column>
-        <!-- <el-table-column label="编号" align="center" key="id" prop="id" width="80" /> -->
+        <el-table-column label="用户ID" align="center" key="id" prop="id" width="80" />
         <el-table-column
           label="姓名"
           align="center"
@@ -111,8 +111,8 @@
         />
         <el-table-column label="性别" align="center" prop="gender" width="100">
           <template #default="scope">
-            <el-tag :type="scope.row.gender === 1 ? 'success' : 'info'">
-              {{ scope.row.gender === 1 ? '男' : '女' }}
+            <el-tag :type="scope.row.gender === 0 ? 'success' : 'info'">
+              {{ scope.row.gender === 0 ? '男' : scope.row.gender === 1 ? '女' : '未知' }}
             </el-tag>
           </template>
         </el-table-column>
@@ -238,10 +238,7 @@ const getList = async () => {
   try {
     //首先获取用户信息
     userProfile.value = await getUserProfile()
-    //如果机构ID不为0，则查询该机构下的所有人员
-    if(userProfile.value.dept.orgid!=0){
-      queryParams.orgid = userProfile.value.dept.orgid
-    }
+    queryParams.orgid = userProfile.value.dept.orgid
     const data = await PersonApi.getPersonPage(queryParams)
     list.value = data.list
     total.value = data.total

src/views/personarchive/index.vue

@@ -78,11 +78,13 @@
             {{ (queryParams.pageNo - 1) * queryParams.pageSize + $index + 1 }}
           </template>
         </el-table-column>
+        <el-table-column label="用户ID" align="center" key="id" prop="id" width="80" />
         <el-table-column label="姓名" align="center" prop="name" />
         <el-table-column label="性别" align="center" prop="gender">
           <template #default="scope">
-            <el-tag v-if="scope.row.gender === 1" type="success">男</el-tag>
-            <el-tag v-else type="danger">女</el-tag>
+            <el-tag v-if="scope.row.gender === 0" type="success">男</el-tag>
+            <el-tag v-else-if="scope.row.gender === 1" type="danger">女</el-tag>
+            <el-tag v-else type="warning">未知</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="身份证号" align="center" prop="idcard" />
@@ -198,10 +200,7 @@ const getList = async () => {
   try {
     //首先获取用户信息
     userProfile.value = await getUserProfile()
-    //如果机构ID不为0，则查询该机构下的所有人员
-    if(userProfile.value.dept.orgid!=0){
-      queryParams.orgid = userProfile.value.dept.orgid
-    }
+    queryParams.orgid = userProfile.value.dept.orgid
     const data = await PersonApi.getPersonPage(queryParams)
     list.value = data.list
     total.value = data.total

src/views/vip/index.vue

@@ -79,6 +79,7 @@
             {{ (queryParams.pageNo - 1) * queryParams.pageSize + $index + 1 }}
           </template>
         </el-table-column>
+        <el-table-column label="用户ID" align="center" key="id" prop="id" width="80" />
         <el-table-column label="姓名" align="center" prop="name"  width="100"/>
         <el-table-column label="手机号" align="center" prop="phone"  width="200"/>
         <el-table-column label="VIP状态" align="center" prop="isvip" width="100" >
@@ -233,13 +234,11 @@ const getList = async () => {
   try {
     //首先获取用户信息
     userProfile.value = await getUserProfile()
-    if(userProfile.value.dept.orgid!=0){
-      queryParams.orgid = userProfile.value.dept.orgid
-    }
+    queryParams.orgid = userProfile.value.dept.orgid
     const res = await PersonApi.getPersonPage({
       pageNo: queryParams.pageNo,
       pageSize: queryParams.pageSize,
-      orgid: queryParams.orgid
+      orgid: queryParams.orgid,
     })
     // 检查返回的数据结构
     if (res) {

src/views/vip/iphone/index.vue

@@ -76,6 +76,7 @@
             {{ (queryParams.pageNo - 1) * queryParams.pageSize + $index + 1 }}
           </template>
         </el-table-column>
+        <el-table-column label="用户ID" align="center" key="id" prop="id" width="80" />
         <el-table-column label="姓名" align="center" prop="name" width="100" />
         <el-table-column label="手机号" align="center" prop="phone" width="120" />
         <el-table-column label="地址" align="center" prop="address" min-width="100" />
@@ -86,7 +87,7 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160" fixed="right">
+        <el-table-column label="操作" align="center" width="200" fixed="right">
           <template #default="scope">
             <div class="operation-buttons">
               <el-button
@@ -158,7 +159,6 @@ const list = ref([]) // 列表数据
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  isvip: 1
 })
 
 const queryFormRef = ref()
@@ -186,9 +186,7 @@ const getList = async () => {
   try {
     //首先获取用户信息
     userProfile.value = await getUserProfile()
-    if(userProfile.value.dept.orgid!=0){
-      queryParams.orgid = userProfile.value.dept.orgid
-    }
+    queryParams.orgid = userProfile.value.dept.orgid
     const data = await PersonApi.getPersonPage(queryParams)
     list.value = data.list
     total.value = data.total