浏览代码

台账样式

lipenghui 4 月之前
父节点
当前提交
c3f5c74e9b

+ 3 - 1
src/api/pms/iotinfo/index.ts

@@ -18,7 +18,9 @@ export const IotInfoApi = {
   getIotInfoPage: async (params: any) => {
     return await request.get({ url: `/rq/iot-info/page`, params })
   },
-
+  getIotInfoFilePage: async (params: any) => {
+    return await request.get({ url: `/rq/iot-info/file/page`, params })
+  },
   // 查询资料详情
   getIotInfo: async (id: number) => {
     return await request.get({ url: `/rq/iot-info/get?id=` + id })

+ 31 - 25
src/views/pms/device/IotDeviceForm.vue

@@ -1,10 +1,10 @@
 <template>
   <ContentWrap v-loading="formLoading">
-    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="100px">
-      <div style="margin-bottom: 20px; margin-top: 10px; margin-left: 15px">
-        <el-button @click="baseInfoClick" style="font-size: 18px; border: none">
-          <Icon color="black" icon="ep:expand" :size="18" class="cursor-pointer" />
-          基本信息
+    <el-form ref="formRef" :model="formData" :rules="formRules" style="margin-right: 4em;margin-left: 0.5em" label-width="130px">
+      <div class="title-div">
+        <el-button @click="baseInfoClick" class="title-button">
+          <Icon color="black" icon="ep:set-up" :size="18" class="cursor-pointer first-icon" />
+          <span class="cursor-pointer">基本信息</span>
           <Icon
             color="black"
             :icon="baseIsExpanded ? 'fa-solid:angle-double-down' : 'fa-solid:angle-double-right'"
@@ -47,8 +47,6 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="6">
             <el-form-item label="资产类别" prop="assetClass">
               <el-tree-select
@@ -96,8 +94,6 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="6">
             <el-form-item label="图片" prop="picUrl">
               <UploadImg v-model="formData.picUrl" :disabled="isDetail" height="60px" />
@@ -110,10 +106,10 @@
           </el-col>
         </el-row>
       </div>
-      <div style="margin-bottom: 20px; margin-top: 10px; margin-left: 15px">
-        <el-button @click="zzInfoClick" style="font-size: 18px; border: none">
-          <Icon color="black" icon="ep:expand" :size="18" class="cursor-pointer" />
-          制造信息
+      <div class="title-div">
+        <el-button @click="zzInfoClick" class="title-button">
+          <Icon color="black" icon="ep:set-up" :size="18" class="cursor-pointer first-icon" />
+          <span class="cursor-pointer">制造信息</span>
           <Icon
             color="black"
             :icon="zzIsExpanded ? 'fa-solid:angle-double-down' : 'fa-solid:angle-double-right'"
@@ -160,8 +156,6 @@
               <el-input v-model="formData.nameplate" placeholder="请输入铭牌信息" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="6">
             <el-form-item label="质保到期" prop="expires">
               <el-date-picker
@@ -175,10 +169,10 @@
           </el-col>
         </el-row>
       </div>
-      <div style="margin-bottom: 20px; margin-top: 10px; margin-left: 15px">
-        <el-button @click="cwInfoClick" style="font-size: 18px; border: none">
-          <Icon color="black" icon="ep:expand" :size="18" class="cursor-pointer" />
-          财务信息
+      <div class="title-div">
+        <el-button @click="cwInfoClick" class="title-button">
+          <Icon color="black" icon="ep:set-up" :size="18" class="cursor-pointer first-icon" />
+          <span class="cursor-pointer">财务信息</span>
           <Icon
             color="black"
             :icon="cwIsExpanded ? 'fa-solid:angle-double-down' : 'fa-solid:angle-double-right'"
@@ -225,9 +219,6 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
           <el-col :span="6">
             <el-form-item label="已提折旧月数" prop="plMonthed">
               <el-input
@@ -257,9 +248,10 @@
           </el-col>
         </el-row>
       </div>
-      <div style="margin-bottom: 20px; margin-top: 10px; margin-left: 15px">
-        <el-button @click="qtInfoClick" style="font-size: 18px; border: none">
-          <Icon color="black" icon="ep:expand" :size="18" class="cursor-pointer" />其它信息
+      <div class="title-div">
+        <el-button @click="qtInfoClick" class="title-button">
+          <Icon color="black" icon="ep:set-up" :size="18" class="cursor-pointer first-icon" />
+          <span class="cursor-pointer">其它信息</span>
           <Icon
             color="black"
             :icon="qtIsExpanded ? 'fa-solid:angle-double-down' : 'fa-solid:angle-double-right'"
@@ -664,4 +656,18 @@ const resetForm = () => {
 .qt-expandable-content.is-expanded {
   max-height: 200px; /* 或者根据内容设定一个合适的最大高度 */
 }
+.title-button{
+  font-size: 18px;
+  border: none;
+}
+.title-div{
+  margin-bottom: 20px;
+  margin-top: 10px;
+}
+.cursor-pointer{
+  vertical-align: middle;
+}
+.first-icon{
+  margin-bottom: 2px;
+}
 </style>

+ 3 - 3
src/views/pms/device/index.vue

@@ -35,7 +35,9 @@
           class="!w-200px"
         />
       </el-form-item>
-      <el-form-item label="设备状态" prop="deviceStatus">
+
+
+      <el-form-item v-show="ifShow" label="设备状态" prop="deviceStatus">
         <el-select
           v-model="queryParams.deviceStatus"
           placeholder="设备状态"
@@ -51,8 +53,6 @@
         </el-select>
       </el-form-item>
 
-
-
       <el-form-item v-show="ifShow" label="资产性质" prop="assetProperty">
         <el-input
           v-model="queryParams.assetProperty"

+ 3 - 4
src/views/system/tree/PmsTree.vue

@@ -28,9 +28,9 @@
             <el-icon v-if="node.data.type==='file'" style="vertical-align: middle"><Folder /></el-icon>    <!-- 文件夹图标 -->
             <span style="vertical-align: middle;margin-left: 3px">{{ node.data.name}}</span>
           </div>
-          <div>
-            <icon style="vertical-align: middle" @click="handleRightClick" icon="ep:edit" />
-          </div>
+<!--          <div>-->
+<!--            <icon style="vertical-align: middle" @click="handleRightClick" icon="ep:edit" />-->
+<!--          </div>-->
         </div>
       </template>
     </el-tree>
@@ -203,7 +203,6 @@ const handleRightClick = (event, node, data) => {
 /** 获得部门树 */
 const getTreeInfo = async () => {
   const res = await IotTreeApi.getSimpleTreeList()
-  debugger
   treeList.value = []
   treeList.value.push(...handleTree(res))
 }

+ 1 - 1
src/views/system/tree/index.vue

@@ -212,7 +212,7 @@ const getList = async () => {
   loading.value = true
   try {
     queryParams.deviceId = deviceId.value
-    const data = await IotInfoApi.IotInfoApi.getIotInfoPage(queryParams)
+    const data = await IotInfoApi.IotInfoApi.getIotInfoFilePage(queryParams)
     list.value = data.list
     total.value = data.total
   } finally {