李扬

master/src/main/java/com/ruoyi/common/utils/document/PDFTemplateUtil.java

@@ -127,7 +127,7 @@ public class PDFTemplateUtil {
                 file.mkdirs();
             }
             baos = createPDF(map, templateName, filePath2);
-            fileOutputStream = new FileOutputStream(filePath + "\\" + pdfName);
+            fileOutputStream = new FileOutputStream(filePath + "/" + pdfName);
             fileOutputStream.write(baos.toByteArray());
             baos.close();
             fileOutputStream.close();

master/src/main/java/com/ruoyi/common/utils/document/ZipUtil.java

@@ -28,7 +28,7 @@ public class ZipUtil {
         ByteArrayOutputStream baos = new ByteArrayOutputStream(1000);
         List<File> fileList = new ArrayList<>();
         for (String fileName : fileNames) {
-            File file = new File(filePath + "\\" + folder + "\\" + fileName);
+            File file = new File(filePath + "/" + folder + "/" + fileName);
             fileList.add(file);
         }
         String zip = filePath + folder + "/" + zipName;

master/src/main/java/com/ruoyi/project/sems/controller/TReportHiYlgdController.java

@@ -292,7 +292,7 @@ public class TReportHiYlgdController extends BaseController {
                 // 生成PDF文件
                 PDFTemplateUtil.createPdf("yearYlgdFMaker.ftl", pdfName,
                         RuoYiConfig.getProfile() + "/reportHi/" + now,
-                        "file:/" + RuoYiConfig.getProfile(), map, response);
+                        "file:" + RuoYiConfig.getProfile(), map, response);
                 list.add(pdfName);
             }
             ZipUtil.createZip(RuoYiConfig.getProfile() + "/reportHi/", now + "", year + "年压力管道年度检查历史报告.zip", list, response);

ui/src/common/flexible.js

@@ -91,6 +91,7 @@
     // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     var rem = width / 24;
     docEl.style.fontSize = rem + "px";
+    // docEl.style.fontSize = 14 + "px";
     flexible.rem = win.rem = rem;
   }
 
@@ -114,13 +115,15 @@
   );
 
   if (doc.readyState === "complete") {
-    doc.body.style.fontSize = 12 * dpr + "px";
+    // doc.body.style.fontSize = 12 * dpr + "px";
+    doc.body.style.fontSize = 11 + "px";
   } else {
     doc.addEventListener(
       "DOMContentLoaded",
       // eslint-disable-next-line no-unused-vars
       function(e) {
-        doc.body.style.fontSize = 12 * dpr + "px";
+        // doc.body.style.fontSize = 12 * dpr + "px";
+        doc.body.style.fontSize = 11 + "px";
       },
       false
     );

ui/src/views/index.vue

@@ -1,15 +1,14 @@
 <template>
-
-  <!--<bcchome v-if="homeType== 1"></bcchome>-->
   <homepage v-if="homeType== 1"></homepage>
   <semshome v-else-if="homeType == 2"></semshome>
+<!--  <homepage v-show="homeType== 1"></homepage>-->
+<!--  <semshome v-show="homeType == 2"></semshome>-->
 </template>
 
 <script>
   import bcchome from "./bccHome";
   import homepage from "./homepage";
   import semshome from "./sems/specanalysis/index";
-  import dayjs from "dayjs";
   import '@/common/flexible.js';
 
   export default {
@@ -27,10 +26,6 @@
       console.log(this.$store.state.user.homeType)
       this.homeType = this.$store.state.user.homeType
     },
-    beforeDestroy(){
-    },
-    methods: {
-    }
   };
 </script>
 

ui/src/views/sems/month/index.vue

@@ -777,7 +777,11 @@ export default {
       this.glWaterOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( ["0","7","8"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     let plantParams = {
       pType: 1

ui/src/views/sems/reportYlgd/index.vue

@@ -866,7 +866,11 @@ export default {
     this.getList();
     this.getTreeselect();
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( ["0","7","8"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("TEST_RESULT").then(response => {
       this.pj1Options = response.data;

ui/src/views/sems/reportYlrq/index.vue

@@ -1114,7 +1114,11 @@ export default {
     this.getList();
     this.getTreeselect();
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( ["0","7","8"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("TEST_RESULT").then(response => {
       this.pj1Options = response.data;

ui/src/views/sems/specCc/bf.vue

@@ -530,7 +530,11 @@ export default {
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("spec_cc_owner").then(response => {
       this.specCcOwnerOptions = response.data;

ui/src/views/sems/specCc/index.vue

@@ -591,7 +591,11 @@
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("spec_cc_owner").then(response => {
       this.specCcOwnerOptions = response.data;

ui/src/views/sems/specCc/ty.vue

@@ -582,7 +582,11 @@ export default {
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("spec_cc_owner").then(response => {
       this.specCcOwnerOptions = response.data;

ui/src/views/sems/specCc/zx.vue

@@ -531,7 +531,11 @@ export default {
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("spec_cc_owner").then(response => {
       this.specCcOwnerOptions = response.data;

ui/src/views/sems/specDt/bf.vue

@@ -456,7 +456,11 @@ export default {
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     let plantParams = {
       pType: 1

ui/src/views/sems/specDt/index.vue

@@ -522,7 +522,11 @@
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     let plantParams = {
       pType: 1

ui/src/views/sems/specDt/ty.vue

@@ -506,7 +506,11 @@ export default {
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     let plantParams = {
       pType: 1

ui/src/views/sems/specDt/zx.vue

@@ -456,7 +456,11 @@ export default {
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     let plantParams = {
       pType: 1

ui/src/views/sems/specDzsb/bf.vue

@@ -635,7 +635,11 @@ export default {
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("SPEC_PLANT_MAINT").then(response => {
       this.plantMaintOptions = response.data;

ui/src/views/sems/specDzsb/index.vue

@@ -703,7 +703,11 @@
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("SPEC_PLANT_MAINT").then(response => {
       this.plantMaintOptions = response.data;

ui/src/views/sems/specDzsb/ty.vue

@@ -687,7 +687,11 @@ export default {
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("SPEC_PLANT_MAINT").then(response => {
       this.plantMaintOptions = response.data;

ui/src/views/sems/specDzsb/zx.vue

@@ -637,7 +637,11 @@ export default {
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("SPEC_PLANT_MAINT").then(response => {
       this.plantMaintOptions = response.data;

ui/src/views/sems/specGl/bf.vue

@@ -623,7 +623,11 @@ export default {
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("SPEC_PLANT_MAINT").then(response => {
       this.plantMaintOptions = response.data;

ui/src/views/sems/specGl/index.vue

@@ -675,7 +675,11 @@
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("SPEC_PLANT_MAINT").then(response => {
       this.plantMaintOptions = response.data;

ui/src/views/sems/specGl/ty.vue

@@ -666,7 +666,11 @@ export default {
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("SPEC_PLANT_MAINT").then(response => {
       this.plantMaintOptions = response.data;

ui/src/views/sems/specGl/zx.vue

@@ -623,7 +623,11 @@ export default {
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("SPEC_PLANT_MAINT").then(response => {
       this.plantMaintOptions = response.data;

ui/src/views/sems/specYlgd/bf.vue

@@ -753,7 +753,11 @@ export default {
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("SPEC_PLANT_MAINT").then(response => {
       this.plantMaintOptions = response.data;

ui/src/views/sems/specYlgd/index.vue

@@ -814,7 +814,11 @@ export default {
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("SPEC_PLANT_MAINT").then(response => {
       this.plantMaintOptions = response.data;

ui/src/views/sems/specYlgd/ty.vue

@@ -804,7 +804,11 @@ export default {
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("SPEC_PLANT_MAINT").then(response => {
       this.plantMaintOptions = response.data;

ui/src/views/sems/specYlgd/zx.vue

@@ -753,7 +753,11 @@ export default {
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("SPEC_PLANT_MAINT").then(response => {
       this.plantMaintOptions = response.data;

ui/src/views/sems/specYlrq/bf.vue

@@ -615,7 +615,11 @@ export default {
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("SPEC_PLANT_MAINT").then(response => {
       this.plantMaintOptions = response.data;

ui/src/views/sems/specYlrq/index.vue

@@ -687,7 +687,11 @@
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("SPEC_PLANT_MAINT").then(response => {
       this.plantMaintOptions = response.data;

ui/src/views/sems/specYlrq/ty.vue

@@ -668,7 +668,11 @@ export default {
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("SPEC_PLANT_MAINT").then(response => {
       this.plantMaintOptions = response.data;

ui/src/views/sems/specYlrq/zx.vue

@@ -616,7 +616,11 @@ export default {
       this.statusOptions = response.data;
     });
     this.getDicts("spec_approve_status").then(response => {
-      this.approveStatusOptions = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){
+          this.approveStatusOptions.push(response.data[i])
+        }
+      }
     });
     this.getDicts("SPEC_PLANT_MAINT").then(response => {
       this.plantMaintOptions = response.data;