Merge branch 'qhse_fix' of shuzhihua/pms-iot-vue into master

.env.local

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

src/views/pms/qhse/factor/index.vue

@@ -70,26 +70,32 @@
         <el-table-column label="环境因素" prop="environmentElement" width="180" align="center" />
 
         <el-table-column label="时态" width="240" align="center">
-          <el-table-column label="过去" prop="timeBefore" width="80" align="center">
+          <el-table-column label="过去" prop="timeBefore" width="60" align="center">
             <template #default="{ row }">
               <el-button circle type="success" style="border: none" plain v-if="row.timeBefore">
-                {{ '✔' }}
+                <span class="text-[#259644]">
+                  {{ '✔' }}
+                </span>
               </el-button>
               <span v-else></span>
             </template>
           </el-table-column>
-          <el-table-column label="现在" prop="timeNow" width="80" align="center">
+          <el-table-column label="现在" prop="timeNow" width="60" align="center">
             <template #default="{ row }">
               <el-button circle type="success" style="border: none" plain v-if="row.timeNow">
-                {{ '✔' }}
+                <span class="text-[#259644]">
+                  {{ '✔' }}
+                </span>
               </el-button>
               <span v-else></span>
             </template>
           </el-table-column>
-          <el-table-column label="将来" prop="timeFuture" width="80" align="center">
+          <el-table-column label="将来" prop="timeFuture" width="60" align="center">
             <template #default="{ row }">
               <el-button circle type="success" style="border: none" plain v-if="row.timeFuture">
-                {{ '✔' }}
+                <span class="text-[#259644]">
+                  {{ '✔' }}
+                </span>
               </el-button>
               <span v-else></span>
             </template>
@@ -97,15 +103,17 @@
         </el-table-column>
 
         <el-table-column label="状态" width="240" align="center">
-          <el-table-column label="正常" prop="statusNormal" width="80" align="center">
+          <el-table-column label="正常" prop="statusNormal" width="60" align="center">
             <template #default="{ row }">
               <el-button circle type="success" style="border: none" plain v-if="row.statusNormal">
-                {{ '✔' }}
+                <span class="text-[#259644]">
+                  {{ '✔' }}
+                </span>
               </el-button>
               <span v-else></span>
             </template>
           </el-table-column>
-          <el-table-column label="异常" prop="statusException" width="80" align="center">
+          <el-table-column label="异常" prop="statusException" width="60" align="center">
             <template #default="{ row }">
               <el-button
                 circle
@@ -114,15 +122,19 @@
                 plain
                 v-if="row.statusException"
               >
-                {{ '✔' }}
+                <span class="text-[#259644]">
+                  {{ '✔' }}
+                </span>
               </el-button>
               <span v-else></span>
             </template>
           </el-table-column>
-          <el-table-column label="紧急" prop="statusDanger" width="80" align="center">
+          <el-table-column label="紧急" prop="statusDanger" width="60" align="center">
             <template #default="{ row }">
               <el-button circle type="success" style="border: none" plain v-if="row.statusDanger">
-                {{ '✔' }}
+                <span class="text-[#259644]">
+                  {{ '✔' }}
+                </span>
               </el-button>
               <span v-else></span>
             </template>
@@ -137,62 +149,76 @@
               </span> -->
 
               <el-button circle type="success" style="border: none" plain v-if="row.typeEnergy">
-                {{ '✔' }}
+                <span class="text-[#259644]">
+                  {{ '✔' }}
+                </span>
               </el-button>
               <span v-else></span>
             </template>
           </el-table-column>
-          <el-table-column label="水体" prop="typeWater" width="100" align="center">
+          <el-table-column label="水体" prop="typeWater" width="60" align="center">
             <template #default="{ row }">
               <!-- <span>
                 {{ row.typeWater ? '✔' : '' }}
               </span> -->
               <el-button circle type="success" style="border: none" plain v-if="row.typeWater">
-                {{ '✔' }}
+                <span class="text-[#259644]">
+                  {{ '✔' }}
+                </span>
               </el-button>
               <span v-else></span>
             </template>
           </el-table-column>
-          <el-table-column label="大气" prop="typeGas" width="100" align="center">
+          <el-table-column label="大气" prop="typeGas" width="60" align="center">
             <template #default="{ row }">
               <!-- <span>
                 {{ row.typeGas ? '✔' : '' }}
               </span> -->
 
               <el-button circle type="success" style="border: none" plain v-if="row.typeGas">
-                {{ '✔' }}
+                <span class="text-[#259644]">
+                  {{ '✔' }}
+                </span>
               </el-button>
               <span v-else></span>
             </template>
           </el-table-column>
-          <el-table-column label="噪音" prop="typeNoise" width="100" align="center">
+          <el-table-column label="噪音" prop="typeNoise" width="60" align="center">
             <template #default="{ row }">
               <el-button circle type="success" style="border: none" plain v-if="row.typeNoise">
-                {{ '✔' }}
+                <span class="text-[#259644]">
+                  {{ '✔' }}
+                </span>
               </el-button>
               <span v-else></span>
             </template>
           </el-table-column>
-          <el-table-column label="废弃物" prop="typeWaste" width="100" align="center">
+          <el-table-column label="废弃物" prop="typeWaste" width="60" align="center">
             <template #default="{ row }">
               <el-button circle type="success" style="border: none" plain v-if="row.typeWaste">
-                {{ '✔' }}
+                <span class="text-[#259644]">
+                  {{ '✔' }}
+                </span>
               </el-button>
               <span v-else></span>
             </template>
           </el-table-column>
-          <el-table-column label="土壤" prop="typeSoil" width="100" align="center">
+          <el-table-column label="土壤" prop="typeSoil" width="60" align="center">
             <template #default="{ row }">
               <el-button circle type="success" style="border: none" plain v-if="row.typeSoil">
-                {{ '✔' }}
+                <span class="text-[#259644]">
+                  {{ '✔' }}
+                </span>
               </el-button>
               <span v-else></span>
             </template>
           </el-table-column>
-          <el-table-column label="其他" prop="typeOther" width="100" align="center">
+          <el-table-column label="其他" prop="typeOther" width="60" align="center">
             <template #default="{ row }">
               <el-button circle type="success" style="border: none" plain v-if="row.typeOther">
-                {{ '✔' }}
+                <span class="text-[#259644]">
+                  {{ '✔' }}
+                </span>
               </el-button>
               <span v-else></span>
             </template>
@@ -629,7 +655,11 @@ onMounted(async () => {
 })
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+::v-deep .el-table__header th {
+  border: 0.5px solid #999;
+}
+
 .factor-matrix .toolbar {
   margin: 12px 0;
   display: flex;