yanghao 6 日 前
コミット
e25ce23d28

+ 1 - 1
.env.local

@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径  http://192.168.188.79:48080  https://iot.deepoil.cc  http://172.26.0.56:48080
-VITE_BASE_URL='https://iot.deepoil.cc'
+VITE_BASE_URL='http://192.168.188.79:48080'
 
 # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务
 VITE_UPLOAD_TYPE=server

+ 5 - 1
src/views/pms/qhse/certificate.vue

@@ -33,6 +33,10 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item label="所属人" prop="userName">
+            <el-input placeholder="输入所属人" v-model="queryParams.userName" />
+          </el-form-item>
+
           <el-form-item label="是否过期" prop="expired">
             <el-select
               v-model="queryParams.expired"
@@ -71,7 +75,7 @@
         <el-table
           v-loading="loading"
           :data="list"
-          height="calc(85vh - 203px)"
+          height="calc(80vh - 203px)"
           :show-overflow-tooltip="true"
           :row-style="tableRowStyle"
         >

+ 8 - 0
src/views/pms/qhse/index.vue

@@ -106,6 +106,14 @@
           </el-table-column>
           <el-table-column label="备注" align="center" prop="remark" />
 
+          <el-table-column label="检测信息" align="center">
+            <template #default="scope">
+              <div>
+                <el-button link type="primary" @click="handleEdit(scope.row)"> 查看 </el-button>
+              </div>
+            </template>
+          </el-table-column>
+
           <el-table-column
             :label="t('devicePerson.operation')"
             align="center"

+ 2 - 2
src/views/pms/qhse/socSummary/IotSocSummaryForm.vue

@@ -50,8 +50,8 @@
         <el-input v-model="formData.post" placeholder="请输入岗位" />
       </el-form-item>
 
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      <el-form-item label="详细描述" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入详细描述" />
       </el-form-item>
     </el-form>
     <template #footer>

+ 1 - 1
src/views/pms/qhse/socSummary/index.vue

@@ -83,7 +83,7 @@
           <el-table-column label="姓名" align="center" prop="userName" />
           <el-table-column label="岗位" align="center" prop="post" />
 
-          <el-table-column label="备注" align="center" prop="remark" />
+          <el-table-column label="详细描述" align="center" prop="remark" />
           <el-table-column
             label="创建时间"
             align="center"

+ 3 - 3
src/views/system/user/DeptTree2.vue

@@ -4,13 +4,13 @@
     :span="isCollapsed ? 0 : 4"
     :xs="24"
   >
-    <ContentWrap class="h-[85vh]">
+    <div class="h-[85vh] bg-white px-2 rounded-md">
       <div
         class="dept-tree"
         :class="{ 'is-collapsed': isCollapsed }"
         style="overflow-y: auto; overflow-x: auto"
       >
-        <div class="head-container" style="display: flex; flex-direction: row">
+        <div class="head-container" style="display: flex; flex-direction: row; padding-top: 10px">
           <el-input
             v-model="deptName"
             class="mb-18px"
@@ -50,7 +50,7 @@
           <li @click="handleMenuClick('delete')">删除</li>
         </ul>
       </div>
-    </ContentWrap>
+    </div>
   </el-col>
 
   <!-- 切换按钮移到外部,始终可见 -->