yanghao 4 өдөр өмнө
parent
commit
e7f271a7e0

+ 1 - 1
.env.local

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

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

@@ -244,7 +244,7 @@
     </div>
   </div>
 
-  <Dialog v-model="dialogFileView" title="附件" width="500">
+  <Dialog v-model="dialogFileView" title="附件">
     <div
       v-for="(file, index) in fileList"
       :key="index"

+ 4 - 7
src/views/pms/qhse/emergencyDrill/bookCheck/index.vue

@@ -132,13 +132,13 @@
     </div>
   </div>
 
-  <Dialog v-model="dialogFileView" title="附件" width="500">
+  <Dialog v-model="dialogFileView" title="附件">
     <div
       v-for="(file, index) in fileList"
       :key="index"
-      class="flex items-center justify-between mt-5">
+      class="flex items-center justify-between w-full mt-5 gap-5">
       <span class="file-name-text">{{ extractFileName(file) }}</span>
-      <div>
+      <div calss="flex gap-5 no-wrap">
         <el-button link type="primary" @click="viewFileInfo(file)">
           <Icon icon="ep:view" class="mr-2px" />查看
         </el-button>
@@ -316,11 +316,8 @@ onMounted(async () => {
 
 <style scoped>
 .file-name-text {
-  flex: 1;
+  white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  white-space: nowrap;
-  margin-right: 12px;
-  color: var(--el-text-color-primary);
 }
 </style>

+ 11 - 12
src/views/pms/qhse/hazard/index.vue

@@ -118,18 +118,17 @@
           <zm-table-column prop="charge" label="责任人" align="center" />
           <zm-table-column label="操作" width="150" align="center" fixed="right" action>
             <template #default="{ row }">
-              <div class="flex gap-3 justify-center">
-                <el-link
-                  :underline="false"
-                  size="small"
-                  type="primary"
-                  @click="openForm('edit', row)">
-                  编辑
-                </el-link>
-                <el-link :underline="false" size="small" type="danger" @click="deleteRow(row)">
-                  删除
-                </el-link>
-              </div>
+              <el-button
+                text
+                :underline="false"
+                size="small"
+                type="primary"
+                @click="openForm('edit', row)">
+                编辑
+              </el-button>
+              <el-button text :underline="false" size="small" type="danger" @click="deleteRow(row)">
+                删除
+              </el-button>
             </template>
           </zm-table-column>
         </zm-table>

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

@@ -432,7 +432,7 @@
     </div>
   </el-drawer>
 
-  <Dialog v-model="dialogFileView" title="附件" width="500">
+  <Dialog v-model="dialogFileView" title="附件">
     <div
       v-for="(file, index) in fileList"
       :key="index"

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

@@ -162,7 +162,7 @@
     </div>
   </div>
 
-  <Dialog v-model="dialogFileView" title="附件" width="500">
+  <Dialog v-model="dialogFileView" title="附件">
     <div
       v-for="(file, index) in fileList"
       :key="index"

+ 13 - 20
src/views/pms/qhse/jsa/index.vue

@@ -13,8 +13,7 @@
               placeholder="请输入序号"
               clearable
               @keyup.enter="handleQuery"
-              class="!w-150px"
-            />
+              class="!w-150px" />
           </el-form-item>
 
           <el-form-item label="工作负责人" prop="jobDuty">
@@ -23,8 +22,7 @@
               placeholder="请输入工作负责人"
               clearable
               @keyup.enter="handleQuery"
-              class="!w-150px"
-            />
+              class="!w-150px" />
           </el-form-item>
 
           <!-- <el-form-item label="工作地点" prop="jobAddress">
@@ -47,8 +45,7 @@
               type="primary"
               plain
               @click="openForm('create')"
-              v-hasPermi="['rq:qhse-jsa:create']"
-            >
+              v-hasPermi="['rq:qhse-jsa:create']">
               <Icon icon="ep:plus" class="mr-5px" /> 新增
             </el-button>
             <el-button
@@ -56,8 +53,7 @@
               plain
               @click="handleExport"
               :loading="exportLoading"
-              v-hasPermi="['rq:qhse-jsa:export']"
-            >
+              v-hasPermi="['rq:qhse-jsa:export']">
               <Icon icon="ep:download" class="mr-5px" /> 导出
             </el-button>
           </el-form-item>
@@ -89,13 +85,14 @@
 
           <zm-table-column label="附件" align="center" prop="jsaFile" min-width="90">
             <template #default="{ row }">
-              <el-link
+              <el-button
+                text
                 v-if="row.jsaFile"
                 :underline="false"
                 type="primary"
                 size="small"
                 @click="viewFile(row.jsaFile)"
-                >查看</el-link
+                >查看</el-button
               >
               <span v-else>-</span>
             </template>
@@ -116,16 +113,14 @@
                 link
                 type="primary"
                 @click="openForm('update', scope.row.id)"
-                v-hasPermi="['rq:qhse-jsa:update']"
-              >
+                v-hasPermi="['rq:qhse-jsa:update']">
                 编辑
               </el-button>
               <el-button
                 link
                 type="danger"
                 @click="handleDelete(scope.row.id)"
-                v-hasPermi="['rq:qhse-jsa:delete']"
-              >
+                v-hasPermi="['rq:qhse-jsa:delete']">
                 删除
               </el-button>
             </template>
@@ -136,16 +131,14 @@
           :total="total"
           v-model:page="queryParams.pageNo"
           v-model:limit="queryParams.pageSize"
-          @pagination="getList"
-        />
+          @pagination="getList" />
       </ContentWrap>
 
-      <el-dialog v-model="dialogFileView" title="附件" width="500">
+      <Dialog v-model="dialogFileView" title="附件">
         <div
           v-for="(file, index) in fileList"
           :key="index"
-          class="flex items-center justify-between mt-5"
-        >
+          class="flex items-center justify-between mt-5">
           <span class="file-name-text">{{ extractFileName(file) }}</span>
           <div>
             <el-button link type="primary" @click="viewFileInfo(file)">
@@ -162,7 +155,7 @@
             <el-button type="primary" @click="dialogFileView = false"> 确认 </el-button>
           </div>
         </template>
-      </el-dialog>
+      </Dialog>
     </el-col>
   </el-row>
 

+ 7 - 5
src/views/pms/qhse/ptw/index.vue

@@ -98,13 +98,14 @@
 
           <zm-table-column label="附件" align="center" min-width="90">
             <template #default="{ row }">
-              <el-link
+              <el-button
+                text
                 v-if="row.file"
                 :underline="false"
                 type="primary"
                 size="small"
                 @click="viewFile(row.file)"
-                >查看</el-link
+                >查看</el-button
               >
               <span v-else>-</span>
             </template>
@@ -303,7 +304,7 @@
   </Dialog>
 
   <!-- 文件查看对话框 -->
-  <Dialog v-model="dialogFileView" title="附件" width="500">
+  <Dialog v-model="dialogFileView" title="附件">
     <div
       v-for="(file, index) in fileList"
       :key="index"
@@ -485,13 +486,14 @@
 
         <el-table-column label="附件" align="center" prop="jsaFile">
           <template #default="{ row }">
-            <el-link
+            <el-button
+              text
               v-if="row.jsaFile"
               :underline="false"
               type="primary"
               size="small"
               @click="viewFile(row.jsaFile)"
-              >查看</el-link
+              >查看</el-button
             >
             <span v-else>-</span>
           </template>

+ 18 - 10
src/views/pms/qhse/safety/index.vue

@@ -148,13 +148,14 @@
 
           <zm-table-column label="附件" align="center" prop="hazardFile" min-width="90">
             <template #default="{ row }">
-              <el-link
+              <el-button
+                text
                 v-if="row.hazardFile"
                 :underline="false"
                 type="primary"
                 size="small"
                 @click="viewFile(row.hazardFile)"
-                >查看</el-link
+                >查看</el-button
               >
               <span v-else>-</span>
             </template>
@@ -166,13 +167,14 @@
 
           <zm-table-column label="整改附件" align="center" prop="rectifyFile" min-width="90">
             <template #default="{ row }">
-              <el-link
+              <el-button
+                text
                 v-if="row.rectifyFile"
                 :underline="false"
                 type="primary"
                 size="small"
                 @click="viewFile(row.rectifyFile)"
-                >查看</el-link
+                >查看</el-button
               >
               <span v-else>-</span>
             </template>
@@ -355,7 +357,7 @@
   </Dialog>
 
   <!-- 整改 -->
-  <el-dialog
+  <Dialog
     title="整改"
     v-model="fixdDialogVisible"
     width="600px"
@@ -389,15 +391,15 @@
       <el-button @click="closeDialog2">取 消</el-button>
       <el-button type="primary" @click="submitFix" :loading="submitLoading">确 定</el-button>
     </template>
-  </el-dialog>
+  </Dialog>
 
-  <el-dialog v-model="dialogFileView" title="附件" width="500">
+  <Dialog v-model="dialogFileView" title="附件">
     <div
       v-for="(file, index) in fileList"
       :key="index"
-      class="flex items-center justify-between mt-5">
+      class="flex items-center justify-between mt-5 gap-5">
       <span class="file-name-text">{{ extractFileName(file) }}</span>
-      <div>
+      <div class="flex gap-5 no-wrap">
         <el-button link type="primary" @click="viewFileInfo(file)">
           <Icon icon="ep:view" class="mr-2px" />查看</el-button
         >
@@ -412,7 +414,7 @@
         <el-button type="primary" @click="dialogFileView = false"> 确认 </el-button>
       </div>
     </template>
-  </el-dialog>
+  </Dialog>
 
   <FilePreviewDialog
     v-model="filePreviewVisible"
@@ -1129,4 +1131,10 @@ watch(
     min-height: 220px;
   }
 }
+
+.file-name-text {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>