From a1ea659c241d3aa323d028304a712a04174e60a8 Mon Sep 17 00:00:00 2001
From: zhaohongyu <aosodo_4812@163.com>
Date: Thu, 5 Dec 2024 09:22:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?20241205=20=E9=80=82=E9=85=8D=E9=9A=90?=
 =?UTF-8?q?=E6=82=A3=E6=9D=A5=E6=BA=90=E5=A2=9E=E5=8A=A0=E7=82=B9=E6=A3=80?=
 =?UTF-8?q?=E9=9A=90=E6=82=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../branch_hazard_assessment/components/evaluation.vue      | 4 ++++
 .../branch_hazard_assessment/components/hidden_info.vue     | 3 +++
 .../personnel_evaluation_status/components/hidden_info.vue  | 3 +++
 .../personnel_evaluation_status/components/hidden_list.vue  | 4 ++++
 src/views/hidden/commonly/commonly/components/Print.vue     | 2 ++
 .../hidden/commonly/commonly/components/companiesList.vue   | 2 ++
 src/views/hidden/commonly/commonly/components/info.vue      | 3 +++
 .../hidden/commonly/ignore/components/companiesList.vue     | 2 ++
 src/views/hidden/commonly/ignore/components/info.vue        | 3 +++
 .../hidden/commonly/special/components/companiesList.vue    | 2 ++
 src/views/hidden/commonly/special/components/info.vue       | 3 +++
 src/views/hidden/major/checkandaccept/components/detail.vue | 3 +++
 src/views/hidden/major/checkandaccept/components/list.vue   | 4 +++-
 src/views/hidden/major/components/companiesList.vue         | 2 ++
 src/views/hidden/major/components/info.vue                  | 3 +++
 .../hidden/major/corpmajornum/components/companiesList.vue  | 2 ++
 src/views/hidden/major/corpmajornum/components/info.vue     | 3 +++
 src/views/hidden/major/corpverify/components/detail.vue     | 3 +++
 src/views/hidden/major/corpverify/components/list.vue       | 4 +++-
 .../hidden/major/majormanagement/components/detail.vue      | 3 +++
 src/views/hidden/major/majormanagement/components/list.vue  | 4 +++-
 src/views/hidden/normal/components/info.vue                 | 3 +++
 src/views/hidden/normal/components/list.vue                 | 3 +++
 src/views/hidden/zczb/components/hidden.vue                 | 3 +++
 src/views/hiddenUtil/information.vue                        | 3 +++
 .../branch_hazard_assessment/components/evaluation.vue      | 4 ++++
 .../personnel_evaluation_status/components/hidden_list.vue  | 4 ++++
 src/views/keyprojects/hidden/components/list.vue            | 6 ++++--
 src/views/keyprojects/relevantunits/components/edit.vue     | 3 +++
 src/views/safetyenvironmental/archive/components/accept.vue | 3 +++
 src/views/safetyenvironmental/assess/components/info.vue    | 3 +++
 static/qrcode/views/bsbw/part-detail.html                   | 3 +++
 static/qrcode/views/fxfb/part-detail.html                   | 3 +++
 33 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue b/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue
index 49734de..7ed678b 100644
--- a/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue
+++ b/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue
@@ -16,6 +16,7 @@
               <el-option value="4" label="安全环保检查(监管端)"/>
               <el-option value="5" label="安全环保检查(企业端)"/>
               <el-option value="6" label="消防点检"/>
+              <el-option value="8" label="点检隐患"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -134,6 +135,9 @@
           <span v-else-if="row.SOURCE=='6'">
             消防点检
           </span>
+          <span v-else-if="row.SOURCE=='8'">
+            点检隐患
+          </span>
         </template>
       </el-table-column>
       <el-table-column prop="HIDDENDESCR" label="隐患描述"/>
diff --git a/src/views/evaluation/branch_hazard_assessment/components/hidden_info.vue b/src/views/evaluation/branch_hazard_assessment/components/hidden_info.vue
index 03ca396..510ff07 100644
--- a/src/views/evaluation/branch_hazard_assessment/components/hidden_info.vue
+++ b/src/views/evaluation/branch_hazard_assessment/components/hidden_info.vue
@@ -23,6 +23,9 @@
             <template v-else-if="pd.SOURCE=='5'">
               <td colspan="3">安全环保检查(企业端)</td>
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              <td colspan="3">点检隐患</td>
+            </template>
           </tr>
           <!--<tr>
             <td class="tbg">检查内容</td>
diff --git a/src/views/evaluation/personnel_evaluation_status/components/hidden_info.vue b/src/views/evaluation/personnel_evaluation_status/components/hidden_info.vue
index 2cbea49..cd99eb3 100644
--- a/src/views/evaluation/personnel_evaluation_status/components/hidden_info.vue
+++ b/src/views/evaluation/personnel_evaluation_status/components/hidden_info.vue
@@ -22,6 +22,9 @@
           <template v-else-if="pd.SOURCE=='5'">
             <td colspan="3">安全环保检查(企业端)</td>
           </template>
+          <template v-else-if="pd.SOURCE=='8'">
+            <td colspan="3">点检隐患</td>
+          </template>
         </tr>
         <!--<tr>
           <td class="tbg">检查内容</td>
diff --git a/src/views/evaluation/personnel_evaluation_status/components/hidden_list.vue b/src/views/evaluation/personnel_evaluation_status/components/hidden_list.vue
index 2e11935..65975a8 100644
--- a/src/views/evaluation/personnel_evaluation_status/components/hidden_list.vue
+++ b/src/views/evaluation/personnel_evaluation_status/components/hidden_list.vue
@@ -11,6 +11,7 @@
               <el-option value="4" label="安全环保检查(监管端)"/>
               <el-option value="5" label="安全环保检查(企业端)"/>
               <el-option value="6" label="消防点检"/>
+              <el-option value="8" label="点检隐患"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -97,6 +98,9 @@
           <span v-else-if="row.SOURCE=='6'">
             消防点检
           </span>
+          <span v-else-if="row.SOURCE=='8'">
+            点检隐患
+          </span>
         </template>
       </el-table-column>
       <el-table-column prop="HIDDENDESCR" label="隐患描述"/>
diff --git a/src/views/hidden/commonly/commonly/components/Print.vue b/src/views/hidden/commonly/commonly/components/Print.vue
index 41492ab..cb34124 100644
--- a/src/views/hidden/commonly/commonly/components/Print.vue
+++ b/src/views/hidden/commonly/commonly/components/Print.vue
@@ -18,6 +18,7 @@
             <span v-else-if="row.SOURCE == 2">清单排查</span>
             <span v-else-if="row.SOURCE == 4">安全环保检查(监管端)</span>
             <span v-else-if="row.SOURCE == 5">安全环保检查(企业端)</span>
+            <span v-else-if="row.SOURCE == 8">点检隐患</span>
           </template>
         </el-table-column>
         <el-table-column prop="HIDDENDESCR" label="隐患描述"/>
@@ -72,6 +73,7 @@
               <template v-if="item.SOURCE == 2">清单排查</template>
               <template v-if="item.SOURCE == 4">安全环保检查(监管端) </template>
               <template v-if="item.SOURCE == 5">安全环保检查(企业端) </template>
+              <template v-if="item.SOURCE == 8">点检隐患</template>
             </td>
             <td>{{ item.HIDDENDESCR }}</td>
             <td>{{ item.FINDUSER }}</td>
diff --git a/src/views/hidden/commonly/commonly/components/companiesList.vue b/src/views/hidden/commonly/commonly/components/companiesList.vue
index 026c5a1..e8767e3 100644
--- a/src/views/hidden/commonly/commonly/components/companiesList.vue
+++ b/src/views/hidden/commonly/commonly/components/companiesList.vue
@@ -11,6 +11,7 @@
                 <el-option :value="4" label="安全环保检查(监管端)"/>
                 <el-option :value="5" label="安全环保检查(企业端)"/>
                 <el-option :value="6" label="消防检查"/>
+                <el-option :value="8" label="点检隐患"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -158,6 +159,7 @@
           <template v-else-if="row.SOURCE=='4'">安全环保检查(监管端) </template>
           <template v-else-if="row.SOURCE=='5'">安全环保检查(企业端) </template>
           <template v-else-if="row.SOURCE=='6'">消防检查 </template>
+          <template v-else-if="row.SOURCE=='8'">点检隐患 </template>
         </template>
       </el-table-column>
       <el-table-column prop="HIDDENDESCR" label="隐患描述"/>
diff --git a/src/views/hidden/commonly/commonly/components/info.vue b/src/views/hidden/commonly/commonly/components/info.vue
index c3902f6..da60202 100644
--- a/src/views/hidden/commonly/commonly/components/info.vue
+++ b/src/views/hidden/commonly/commonly/components/info.vue
@@ -25,6 +25,9 @@
           <template v-else-if="pd.SOURCE=='6'">
             <td colspan="3">消防检查</td>
           </template>
+          <template v-else-if="pd.SOURCE=='8'">
+            <td colspan="3">点检隐患</td>
+          </template>
         </tr>
         <!--<tr>
           <td class="tbg">检查内容</td>
diff --git a/src/views/hidden/commonly/ignore/components/companiesList.vue b/src/views/hidden/commonly/ignore/components/companiesList.vue
index 236bdef..d244785 100644
--- a/src/views/hidden/commonly/ignore/components/companiesList.vue
+++ b/src/views/hidden/commonly/ignore/components/companiesList.vue
@@ -9,6 +9,7 @@
               <el-option :value="2" label="清单排查"/>
               <el-option :value="4" label="安全环保检查(监管端)"/>
               <el-option :value="5" label="安全环保检查(企业端)"/>
+              <el-option :value="8" label="点检隐患"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -117,6 +118,7 @@
           <span v-if="row.SOURCE == 1">隐患快报</span>
           <span v-else-if="row.SOURCE == 4">安全环保检查(监管端)</span>
           <span v-else-if="row.SOURCE == 5">安全环保检查(企业端)</span>
+          <span v-else-if="row.SOURCE == 8">点检隐患</span>
           <span v-else>清单排查</span>
         </template>
       </el-table-column>
diff --git a/src/views/hidden/commonly/ignore/components/info.vue b/src/views/hidden/commonly/ignore/components/info.vue
index 1c8a1ee..26913cd 100644
--- a/src/views/hidden/commonly/ignore/components/info.vue
+++ b/src/views/hidden/commonly/ignore/components/info.vue
@@ -23,6 +23,9 @@
             <template v-else-if="pd.SOURCE=='5'">
               安全环保检查(企业端)
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              点检隐患
+            </template>
           </td>
         </tr>
         <tr>
diff --git a/src/views/hidden/commonly/special/components/companiesList.vue b/src/views/hidden/commonly/special/components/companiesList.vue
index 2ee923e..0206d3f 100644
--- a/src/views/hidden/commonly/special/components/companiesList.vue
+++ b/src/views/hidden/commonly/special/components/companiesList.vue
@@ -9,6 +9,7 @@
               <el-option :value="2" label="清单排查"/>
               <el-option :value="4" label="安全环保检查(监管端)"/>
               <el-option :value="5" label="安全环保检查(企业端)"/>
+              <el-option :value="8" label="点检隐患"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -82,6 +83,7 @@
           <span v-if="row.SOURCE == 1">隐患快报</span>
           <span v-else-if="row.SOURCE == 4">安全环保检查(监管端)</span>
           <span v-else-if="row.SOURCE == 5">安全环保检查(企业端)</span>
+          <span v-else-if="row.SOURCE == 8">点检隐患</span>
           <span v-else>清单排查</span>
         </template>
       </el-table-column>
diff --git a/src/views/hidden/commonly/special/components/info.vue b/src/views/hidden/commonly/special/components/info.vue
index 66d2ceb..9590d4a 100644
--- a/src/views/hidden/commonly/special/components/info.vue
+++ b/src/views/hidden/commonly/special/components/info.vue
@@ -23,6 +23,9 @@
             <template v-else-if="pd.SOURCE=='5'">
               安全环保检查(企业端)
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              点检隐患
+            </template>
           </td>
         </tr>
         <tr>
diff --git a/src/views/hidden/major/checkandaccept/components/detail.vue b/src/views/hidden/major/checkandaccept/components/detail.vue
index 96c50bb..5300933 100644
--- a/src/views/hidden/major/checkandaccept/components/detail.vue
+++ b/src/views/hidden/major/checkandaccept/components/detail.vue
@@ -20,6 +20,9 @@
             <template v-else-if="pd.SOURCE=='6'">
               <td>消防检查</td>
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              <td>点检隐患</td>
+            </template>
           </tr>
           <tr>
             <td class="tbg">隐患描述</td>
diff --git a/src/views/hidden/major/checkandaccept/components/list.vue b/src/views/hidden/major/checkandaccept/components/list.vue
index 2b52439..8dc8079 100644
--- a/src/views/hidden/major/checkandaccept/components/list.vue
+++ b/src/views/hidden/major/checkandaccept/components/list.vue
@@ -107,6 +107,7 @@
           <template v-if="row.SOURCE =='2'">清单排查</template>
           <template v-if="row.SOURCE =='3'">清单排查</template>
           <template v-if="row.SOURCE =='6'">消防检查</template>
+          <template v-if="row.SOURCE =='8'">点检隐患</template>
         </template>
       </el-table-column>
       <el-table-column label="隐患描述" prop="HIDDENDESCR" >
@@ -181,7 +182,8 @@ export default {
       varList: [],
       hiddenSourceList: [ // 隐患来源  1-隐患快报  2-清单排查
         { value: '1', label: '隐患快报' },
-        { value: '2', label: '清单排查' }
+        { value: '2', label: '清单排查' },
+        { value: '8', label: '点检隐患' }
       ],
       statusList: [
         { ID: '14', NAME: '待验收' },
diff --git a/src/views/hidden/major/components/companiesList.vue b/src/views/hidden/major/components/companiesList.vue
index 7a3f36b..bfce02c 100644
--- a/src/views/hidden/major/components/companiesList.vue
+++ b/src/views/hidden/major/components/companiesList.vue
@@ -7,6 +7,7 @@
             <el-select v-model="form.SOURCE" placeholder="隐患来源" clearable style="width: 100%" class="filter-item">
               <el-option :value="1" label="隐患快报"/>
               <el-option :value="2" label="清单排查"/>
+              <el-option :value="8" label="点检隐患"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -139,6 +140,7 @@
       <el-table-column prop="SOURCE" label="隐患来源">
         <template slot-scope="{row}">
           <span v-if="row.SOURCE == 1">隐患快报</span>
+          <span v-else-if="row.SOURCE == 8">点检隐患</span>
           <span v-else>清单排查</span>
         </template>
       </el-table-column>
diff --git a/src/views/hidden/major/components/info.vue b/src/views/hidden/major/components/info.vue
index c8e286b..3392e98 100644
--- a/src/views/hidden/major/components/info.vue
+++ b/src/views/hidden/major/components/info.vue
@@ -17,6 +17,9 @@
             <template v-else-if="pd.SOURCE=='3'">
               清单排查
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              点检隐患
+            </template>
           </td>
         </tr>
         <tr v-if="pd.SOURCE=='2'">
diff --git a/src/views/hidden/major/corpmajornum/components/companiesList.vue b/src/views/hidden/major/corpmajornum/components/companiesList.vue
index 8387892..242268b 100644
--- a/src/views/hidden/major/corpmajornum/components/companiesList.vue
+++ b/src/views/hidden/major/corpmajornum/components/companiesList.vue
@@ -9,6 +9,7 @@
               <el-option :value="2" label="清单排查"/>
               <el-option :value="2" label="清单排查"/>
               <el-option :value="6" label="消防检查"/>
+              <el-option :value="8" label="点检隐患"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -66,6 +67,7 @@
           <span v-if="row.SOURCE == 2">清单排查</span>
           <span v-if="row.SOURCE == 3">清单排查</span>
           <span v-if="row.SOURCE == 6">消防检查</span>
+          <span v-if="row.SOURCE == 8">点检隐患</span>
         </template>
       </el-table-column>
       <el-table-column prop="CREATORNAME" label="隐患发现人"/>
diff --git a/src/views/hidden/major/corpmajornum/components/info.vue b/src/views/hidden/major/corpmajornum/components/info.vue
index d11c22d..e963464 100644
--- a/src/views/hidden/major/corpmajornum/components/info.vue
+++ b/src/views/hidden/major/corpmajornum/components/info.vue
@@ -20,6 +20,9 @@
             <template v-else-if="pd.SOURCE=='6'">
               消防检查
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              点检隐患
+            </template>
           </td>
         </tr>
         <tr>
diff --git a/src/views/hidden/major/corpverify/components/detail.vue b/src/views/hidden/major/corpverify/components/detail.vue
index 9cb5ac9..a65da6c 100644
--- a/src/views/hidden/major/corpverify/components/detail.vue
+++ b/src/views/hidden/major/corpverify/components/detail.vue
@@ -20,6 +20,9 @@
             <template v-else-if="pd.SOURCE=='6'">
               <td>消防检查</td>
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              <td>点检隐患</td>
+            </template>
           </tr>
           <tr>
             <td class="tbg">隐患描述</td>
diff --git a/src/views/hidden/major/corpverify/components/list.vue b/src/views/hidden/major/corpverify/components/list.vue
index 6f7b37c..a800968 100644
--- a/src/views/hidden/major/corpverify/components/list.vue
+++ b/src/views/hidden/major/corpverify/components/list.vue
@@ -107,6 +107,7 @@
           <template v-if="row.SOURCE =='2'">清单排查</template>
           <template v-if="row.SOURCE =='3'">清单排查</template>
           <template v-if="row.SOURCE =='6'">消防检查</template>
+          <template v-if="row.SOURCE =='8'">点检隐患</template>
         </template>
       </el-table-column>
       <el-table-column label="隐患描述" prop="HIDDENDESCR" >
@@ -178,7 +179,8 @@ export default {
       varList: [],
       hiddenSourceList: [ // 隐患来源  1-隐患快报  2-清单排查
         { value: '1', label: '隐患快报' },
-        { value: '2', label: '清单排查' }
+        { value: '2', label: '清单排查' },
+        { value: '8', label: '点检隐患' }
       ],
       statusList: [
         { ID: '-2', NAME: '待确认' },
diff --git a/src/views/hidden/major/majormanagement/components/detail.vue b/src/views/hidden/major/majormanagement/components/detail.vue
index af0e3c9..5d01445 100644
--- a/src/views/hidden/major/majormanagement/components/detail.vue
+++ b/src/views/hidden/major/majormanagement/components/detail.vue
@@ -17,6 +17,9 @@
             <template v-else-if="pd.SOURCE=='3'">
               <td>清单排查</td>
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              <td>点检隐患</td>
+            </template>
           </tr>
           <tr>
             <td class="tbg">隐患描述</td>
diff --git a/src/views/hidden/major/majormanagement/components/list.vue b/src/views/hidden/major/majormanagement/components/list.vue
index f65ddee..7bdd169 100644
--- a/src/views/hidden/major/majormanagement/components/list.vue
+++ b/src/views/hidden/major/majormanagement/components/list.vue
@@ -106,6 +106,7 @@
           <template v-if="row.SOURCE =='1'">隐患快报</template>
           <template v-if="row.SOURCE =='2'">清单排查</template>
           <template v-if="row.SOURCE =='3'">清单排查</template>
+          <template v-if="row.SOURCE =='8'">点检隐患</template>
         </template>
       </el-table-column>
       <el-table-column label="隐患描述" prop="HIDDENDESCR" >
@@ -181,7 +182,8 @@ export default {
       varList: [],
       hiddenSourceList: [ // 隐患来源  1-隐患快报  2-清单排查
         { value: '1', label: '隐患快报' },
-        { value: '2', label: '清单排查' }
+        { value: '2', label: '清单排查' },
+        { value: '8', label: '点检隐患' }
       ],
       statusList: [
         { ID: '13', NAME: '待整改' },
diff --git a/src/views/hidden/normal/components/info.vue b/src/views/hidden/normal/components/info.vue
index 2918f50..b885df3 100644
--- a/src/views/hidden/normal/components/info.vue
+++ b/src/views/hidden/normal/components/info.vue
@@ -19,6 +19,9 @@
                 <template v-else-if="pd.SOURCE=='3'">
                   清单排查
                 </template>
+                <template v-else-if="pd.SOURCE=='8'">
+                  点检隐患
+                </template>
               </td>
             </tr>
             <tr v-if="pd.SOURCE=='2'">
diff --git a/src/views/hidden/normal/components/list.vue b/src/views/hidden/normal/components/list.vue
index 45a2145..8a5888d 100644
--- a/src/views/hidden/normal/components/list.vue
+++ b/src/views/hidden/normal/components/list.vue
@@ -72,6 +72,9 @@
           <template v-else-if="row.SOURCE=='3'">
             <span class="label label-info">清单排查</span>
           </template>
+          <template v-else-if="row.SOURCE=='8'">
+            <span class="label label-info">点检隐患</span>
+          </template>
         </template>
       </el-table-column>
       <!--      <el-table-column prop="TYPE_NAME" label="企业类型" />-->
diff --git a/src/views/hidden/zczb/components/hidden.vue b/src/views/hidden/zczb/components/hidden.vue
index 02b1c91..b65b7cc 100644
--- a/src/views/hidden/zczb/components/hidden.vue
+++ b/src/views/hidden/zczb/components/hidden.vue
@@ -19,6 +19,9 @@
                 <template v-else-if="pd.SOURCE=='3'">
                   清单排查
                 </template>
+                <template v-else-if="pd.SOURCE=='8'">
+                  点检隐患
+                </template>
               </td>
             </tr>
             <tr>
diff --git a/src/views/hiddenUtil/information.vue b/src/views/hiddenUtil/information.vue
index 46bd6ba..c4bd98e 100644
--- a/src/views/hiddenUtil/information.vue
+++ b/src/views/hiddenUtil/information.vue
@@ -28,6 +28,9 @@
               <template v-else-if="pd.SOURCE=='5'">
                 <td>安全环保检查(企业端)</td>
               </template>
+              <template v-else-if="pd.SOURCE=='8'">
+                <td>点检隐患</td>
+              </template>
             </tr>
             <tr>
               <td class="tbg">隐患描述</td>
diff --git a/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue b/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue
index 4c7fb05..48939a9 100644
--- a/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue
+++ b/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue
@@ -14,6 +14,7 @@
               <!--              <el-option value="3" label="清单排查"/>-->
               <el-option value="4" label="安全环保检查(监管端)"/>
               <el-option value="5" label="安全环保检查(企业端)"/>
+              <el-option value="8" label="点检隐患"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -111,6 +112,9 @@
           <span v-else-if="row.SOURCE=='5'">
             安全环保检查(企业端)
           </span>
+          <span v-else-if="row.SOURCE=='8'">
+            点检隐患
+          </span>
         </template>
       </el-table-column>
       <el-table-column prop="HIDDENDESCR" label="隐患描述"/>
diff --git a/src/views/keyproject_evaluation/personnel_evaluation_status/components/hidden_list.vue b/src/views/keyproject_evaluation/personnel_evaluation_status/components/hidden_list.vue
index fb50645..d3589fb 100644
--- a/src/views/keyproject_evaluation/personnel_evaluation_status/components/hidden_list.vue
+++ b/src/views/keyproject_evaluation/personnel_evaluation_status/components/hidden_list.vue
@@ -9,6 +9,7 @@
               <!--              <el-option value="3" label="清单排查"/>-->
               <el-option value="4" label="安全环保检查(监管端)"/>
               <el-option value="5" label="安全环保检查(企业端)"/>
+              <el-option value="8" label="点检隐患"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -87,6 +88,9 @@
           <span v-else-if="row.SOURCE=='5'">
             安全环保检查(企业端)
           </span>
+          <span v-else-if="row.SOURCE=='8'">
+            点检隐患
+          </span>
         </template>
       </el-table-column>
       <el-table-column prop="HIDDENDESCR" label="隐患描述"/>
diff --git a/src/views/keyprojects/hidden/components/list.vue b/src/views/keyprojects/hidden/components/list.vue
index 1d02246..6fe19fe 100644
--- a/src/views/keyprojects/hidden/components/list.vue
+++ b/src/views/keyprojects/hidden/components/list.vue
@@ -151,7 +151,8 @@ export default {
       sourceState: {
         1: 'AI报警',
         4: '安全环保检查(监管端)',
-        5: '安全环保检查(企业端)'
+        5: '安全环保检查(企业端)',
+        8: '点检隐患'
       },
       state: {
         1: '未整改',
@@ -161,7 +162,8 @@ export default {
       SOURCEList: [
         { ID: '1', NAME: 'AI报警' },
         { ID: '4', NAME: '安全环保检查(监管端)' },
-        { ID: '5', NAME: '安全环保检查(企业端)' }
+        { ID: '5', NAME: '安全环保检查(企业端)' },
+        { ID: '8', NAME: '点检隐患' }
       ],
       zList: [
         { ID: '1', NAME: '未整改' },
diff --git a/src/views/keyprojects/relevantunits/components/edit.vue b/src/views/keyprojects/relevantunits/components/edit.vue
index e3a1021..7e811bd 100644
--- a/src/views/keyprojects/relevantunits/components/edit.vue
+++ b/src/views/keyprojects/relevantunits/components/edit.vue
@@ -27,6 +27,9 @@
             <template v-else-if="pd.SOURCE=='6'">
               <td>消防检查</td>
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              <td>点检隐患</td>
+            </template>
           </tr>
           <tr>
             <td class="tbg">隐患描述</td>
diff --git a/src/views/safetyenvironmental/archive/components/accept.vue b/src/views/safetyenvironmental/archive/components/accept.vue
index f76c6ec..f3f01e8 100644
--- a/src/views/safetyenvironmental/archive/components/accept.vue
+++ b/src/views/safetyenvironmental/archive/components/accept.vue
@@ -23,6 +23,9 @@
             <template v-else-if="pd.SOURCE=='5'">
               <td>安全环保检查（企业端）</td>
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              <td>点检隐患</td>
+            </template>
           </tr>
           <tr>
             <td class="tbg">隐患描述</td>
diff --git a/src/views/safetyenvironmental/assess/components/info.vue b/src/views/safetyenvironmental/assess/components/info.vue
index b5dff48..0adca99 100644
--- a/src/views/safetyenvironmental/assess/components/info.vue
+++ b/src/views/safetyenvironmental/assess/components/info.vue
@@ -14,6 +14,9 @@
             <template v-else-if="pd.SOURCE=='5'">
               <td>安全环保检查(企业端)</td>
             </template>
+            <template v-else-if="pd.SOURCE=='8'">
+              <td>点检隐患</td>
+            </template>
           </tr>
           <tr>
             <td class="tbg">位置</td>
diff --git a/static/qrcode/views/bsbw/part-detail.html b/static/qrcode/views/bsbw/part-detail.html
index 45edca7..f4745d3 100644
--- a/static/qrcode/views/bsbw/part-detail.html
+++ b/static/qrcode/views/bsbw/part-detail.html
@@ -29,6 +29,9 @@
 						<template v-else-if="pd.SOURCE=='3'">
               清单排查
 						</template>
+						<template v-else-if="pd.SOURCE=='8'">
+							点检隐患
+						</template>
 			        </div>
 			    </div>
 				<div  v-if="pd.SOURCE=='2'" class="base-cell">
diff --git a/static/qrcode/views/fxfb/part-detail.html b/static/qrcode/views/fxfb/part-detail.html
index 29fed8b..7a00308 100644
--- a/static/qrcode/views/fxfb/part-detail.html
+++ b/static/qrcode/views/fxfb/part-detail.html
@@ -29,6 +29,9 @@
 						<template v-else-if="pd.SOURCE=='3'">
               清单排查
 						</template>
+						<template v-else-if="pd.SOURCE=='8'">
+							点检隐患
+						</template>
 			        </div>
 			    </div>
 				<div  v-if="pd.SOURCE=='2'" class="base-cell">
-- 
2.42.0.windows.1


From 5dd676016966f9b066dea57bfbe19cea1a36166f Mon Sep 17 00:00:00 2001
From: huangyuxuan <huangyuxuan@zcloudchina.com>
Date: Fri, 27 Dec 2024 14:26:43 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD](pet)?=
 =?UTF-8?q?:=20=20-=20=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E7=9B=91=E7=AE=A1=E7=AB=AF=E5=AE=A1?=
 =?UTF-8?q?=E6=9F=A5=20=E6=96=B0=E5=A2=9E=E8=AF=81=E4=BB=B6=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=E5=92=8C=E8=AF=81?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=A1=E6=81=AF=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow_warden/components/list.vue | 2 ++
 src/views/xgf/peopleList/components/list.vue  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/views/xgf/flow_warden/components/list.vue b/src/views/xgf/flow_warden/components/list.vue
index f8638e7..71e87b7 100644
--- a/src/views/xgf/flow_warden/components/list.vue
+++ b/src/views/xgf/flow_warden/components/list.vue
@@ -42,6 +42,8 @@
       <el-table-column prop="USERNAME" label="用户名" align="center"/>
       <el-table-column prop="NAME" label="姓名" align="center"/>
       <el-table-column prop="BELONG_TO_CORP_NAME" label="外派公司名称" align="center"/>
+      <el-table-column prop="VALIDITY_PERIOD_START" label="培训有效期开始时间" align="center"/>
+      <el-table-column prop="VALIDITY_PERIOD_END" label="培训有效期结束时间" align="center"/>
       <el-table-column label="操作" align="center" width="300">
         <template slot-scope="{row}">
           <el-row>
diff --git a/src/views/xgf/peopleList/components/list.vue b/src/views/xgf/peopleList/components/list.vue
index d8a0450..0ca3ac7 100644
--- a/src/views/xgf/peopleList/components/list.vue
+++ b/src/views/xgf/peopleList/components/list.vue
@@ -59,6 +59,8 @@
       <el-table-column prop="BELONG_TO_CORP_NAME" label="外派公司名称" align="center"/>
       <el-table-column prop="STUDY_STATUS_NAME" label="培训状态" align="center"/>
       <el-table-column prop="CHECK_STATUS_NAME" label="审核状态" align="center"/>
+      <el-table-column prop="VALIDITY_PERIOD_START" label="培训有效期开始时间" align="center"/>
+      <el-table-column prop="VALIDITY_PERIOD_END" label="培训有效期结束时间" align="center"/>
       <el-table-column label="操作" align="center" width="350">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
-- 
2.42.0.windows.1


From 29b7f71737f273be190e04ebb02eb0d5e2467125 Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Mon, 30 Dec 2024 14:07:59 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1.=E5=AE=89=E7=9B=91=E9=83=A8=E4=BD=93?=
 =?UTF-8?q?=E7=B3=BB=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ajMfolder/index.vue | 625 ++++++++++++++++++++++++++++++++++
 1 file changed, 625 insertions(+)
 create mode 100644 src/views/ajMfolder/index.vue

diff --git a/src/views/ajMfolder/index.vue b/src/views/ajMfolder/index.vue
new file mode 100644
index 0000000..b6ad154
--- /dev/null
+++ b/src/views/ajMfolder/index.vue
@@ -0,0 +1,625 @@
+<template>
+  <div class="app-container">
+    <el-container>
+      <el-aside width="300px" style="background-color:#fff">
+        <el-tree v-loading="treeLoading" ref="tree" :data="treeData" :props="defaultProps" :filter-node-method="filterNode" class="filter-tree" accordion @node-click="handleNodeClick" />
+      </el-aside>
+      <el-main>
+        <div class="filter-container">
+          <el-button v-show="MFOLDER_ID != '0'" icon="el-icon-arrow-left" @click="getList(PARENT_ID)">返回</el-button>
+        </div>
+        <el-table v-loading="listLoading" ref="multipleTable" :data="varList" :row-key="getRowKey" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
+          <el-table-column :reserve-selection="true" type="selection" width="55" align="center" />
+          <el-table-column type="index" label="序号" width="50" align="center" />
+          <el-table-column v-if="MFOLDER_ID =='0'" label="目录名" width="220">
+            <template slot-scope="{row}">
+              <div class="link-type" @click="getList(row.MFOLDER_ID)">
+                <svg-icon :icon-class="row.NAME" class-name="disabled" />{{ row.NAME }}<i class="el-icon-arrow-right" />
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="MFOLDER_ID !='0'" label="文件名">
+            <template slot-scope="{row}">
+              {{ row.NAME }}
+              <a v-show="row.extension_name == '.txt'" style="color: #1e9fff" @click="goViewTxt(row.FILEPATH)">[预览]</a>
+              <a v-show="row.extension_name == '.pdf'" style="color: #1e9fff" @click="goViewPdf(row.FILEPATH)">[预览]</a>
+              <a v-show="row.extension_name == '.mp4'" style="color: #1e9fff" @click="goViewVideo(row.FILEPATH)">[预览]</a>
+              <a v-show="row.extension_name == '.doc' || row.extension_name == '.xls' || row.extension_name == '.ppt' || row.extension_name == '.docx' || row.extension_name == '.xlsx' || row.extension_name == '.pptx'" style="color: #1e9fff" @click="goOffice(row.FILEPATH)">[下載]</a>
+
+            </template>
+          </el-table-column>
+          <!--          <el-table-column prop="FILESIZE" label="文件大小" />-->
+          <el-table-column v-if="MFOLDER_ID !='0'" label="文件大小">
+            <template slot-scope="{row}">
+              {{ row.FILESIZE > 1024 ? ((((row.FILESIZE)/1024)+'').substring(0,(((row.FILESIZE)/1024)+'').lastIndexOf('.')+3))+' MB' : row.FILESIZE + ' KB' }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="CTIME" label="上传时间" />
+          <el-table-column prop="UNAME" label="上传者" />
+          <!--          <el-table-column label="是否共享">-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <span v-if="row.SHARE=='no'">私有文件</span>-->
+          <!--              <span v-else>公共文件</span>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column prop="REMARKS" label="备注说明" show-overflow-tooltip />
+          <el-table-column label="操作" align="center" width="200">
+            <template slot-scope="{row}">
+              <el-button v-show="del && row.UNAME!='init'" type="danger" icon="el-icon-delete" plain @click="handleDelete(row.MFOLDER_ID,row.FILEPATH)">删除</el-button>
+              <el-button v-show="MFOLDER_ID !='0'" type="primary" icon="el-icon-edit" size="mini" style="color: white" @click="downloadFile(row.MFOLDER_ID)">下载</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="page-btn-group">
+          <div class="btn-only">
+            <el-button v-show="MFOLDER_ID == '0' && add" type="primary" icon="el-icon-plus" @click="handleAdd">新建文件夹</el-button>
+            <el-button v-show="MFOLDER_ID != '0' && add" type="primary" icon="el-icon-plus" @click="handleUpload">上传文件</el-button>
+            <el-button v-show="MFOLDER_ID != '0' && add" type="primary" icon="el-icon-plus" @click="handleBatchUpload">批量上传</el-button>
+          </div>
+          <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList(MFOLDER_ID)" />
+        </div>
+      </el-main>
+    </el-container>
+
+    <el-dialog :visible.sync="dialogForm" title="新建文件夹" width="600px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px" style="width: 500px;">
+        <el-form-item label="文件夹名" prop="NAME">
+          <el-input v-model="form.NAME" placeholder="这里输入文件夹名..." />
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input :rows="3" v-model="form.REMARKS" type="textarea" placeholder="这里输入备注..." />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogForm = false">取 消</el-button>
+        <el-button type="primary" @click="confirm">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogFormUpload" title="上传文件" width="600px">
+      <el-form ref="uploadForm" :model="form" :rules="rules" label-width="110px" style="width: 500px;">
+        <el-form-item label="文件名" prop="NAME">
+          <el-input v-model="form.NAME" placeholder="这里输入名称..." />
+        </el-form-item>
+        <el-form-item label="附件">
+          <span v-if="form.FFILE">{{ form.FFILE.name }}</span>
+          <el-upload
+            :before-upload="beforeFileUpload"
+            :on-change="handleChangePDF"
+            :auto-upload="false"
+            class="avatar-uploader"
+            action="#">
+            <el-button type="primary">上传</el-button>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input :rows="3" v-model="form.REMARKS" type="textarea" placeholder="这里输入备注..." />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormUpload = false">取 消</el-button>
+        <el-button type="primary" @click="upload">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogBatchUpload" title="批量上传文件" width="600px">
+      <el-form ref="batchUploadForm" :model="form" label-width="110px" style="width: 500px;">
+
+        <el-form-item label="附件">
+
+          <el-upload
+            ref="batchUpload"
+            :on-preview="handlePreview"
+            :on-remove="handleRemove"
+            :on-change="handleChangePDF2"
+            :before-upload = "beforeFileUpload2"
+            :auto-upload="false"
+            class="upload-demo"
+            action="#">
+            <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+          </el-upload>
+          <!--          <el-upload :before-upload="beforeFileUpload" class="avatar-uploader" action="#">
+            <el-button type="primary">上传</el-button>
+          </el-upload>-->
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogBatchUpload = false">取 消</el-button>
+        <el-button type="primary" @click="batchUpload">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :visible.sync="dialogViewTxt" title="文本文档" width="600px">
+      <el-input :rows="30" v-model="txtPre" readonly type="textarea" placeholder=""/>
+    </el-dialog>
+    <el-dialog :visible.sync="dialogViewPdf" title="文档">
+      <div>
+
+        <pdf
+          :page="pageNum"
+          :src="pdfUrl"
+          @progress="loadedRatio = $event"
+          @num-pages="pageTotalNum=$event"
+        />
+        <div style="text-align: center">
+          <div style="color: #409EFF;">{{ pageNum }} / {{ pageTotalNum }}</div>
+          <el-button-group style="padding-top: 10px;">
+            <el-button type="primary" icon="el-icon-arrow-left" size="mini" @click="prePage">上一页</el-button>
+            <el-button type="primary" size="mini" @click="nextPage">下一页<i class="el-icon-arrow-right el-icon--right"/></el-button>
+          </el-button-group>
+        </div>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogViewVideo" title="视频" width="600px">
+      <div>
+        <video-player
+          ref="videoPlayer"
+          :playsinline="true"
+          :options="playerOptions"
+          class="video-player vjs-custom-skin"/>
+      </div>
+    </el-dialog>
+
+  </div>
+
+</template>
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive  src/utils/src/utils/.js.js
+import { upload } from '@/utils/upload'
+import pdf from 'vue-pdf'
+import { Message } from 'element-ui'
+import { videoPlayer } from 'vue-video-player'
+import 'video.js/dist/video-js.css'
+export default {
+  components: { Pagination, pdf, videoPlayer },
+  directives: { waves },
+  data() {
+    return {
+      txtPre: '',
+      dialogFormUpload: false,
+      dialogForm: false,
+      listLoading: true,
+      treeLoading: false,
+      dialogBatchUpload: false,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      pd: [],
+      form: {
+        NAME: '', //
+        FFILE: [],
+        REMARKS: ''
+      },
+      multipleSelectionAll: [], // 所有选中的数据包含跨页数据
+      multipleSelection: [], // 当前页选中的数据
+      dialogFormEdit: false,
+      rules: {
+        NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }]
+      },
+      corpInfoId: '',
+      SHARE: 'no',
+      treeData: [],
+      defaultProps: {
+        children: 'nodes',
+        label: 'name'
+      },
+      MFOLDER_ID: '0',			// 主键ID
+      PARENT_ID: '0',				// 上级ID
+      serverurl: config.fileUrl,
+      dialogViewTxt: false,
+      dialogViewVideo: false,
+      dialogViewPdf: false,
+      dialogViewUrl: '',
+      // pdf预览
+      pdfUrl: '',
+      pageNum: 1,
+      pageTotalNum: 1, // 总页数
+      loadedRatio: 0, // 当前页面的加载进度，范围是0-1 ，等于1的时候代表当前页已经完全加载完成了
+      playerOptions: {
+        playbackRates: [0.5, 1.0, 1.5, 2.0], // 可选的播放速度
+        autoplay: false, // 如果为true,浏览器准备好时开始回放。
+        muted: false, // 默认情况下将会消除任何音频。
+        loop: false, // 是否视频一结束就重新开始。
+        preload: 'auto', // 建议浏览器在<video>加载元素后是否应该开始下载视频数据。auto浏览器选择最佳行为,立即开始加载视频（如果浏览器支持）
+        language: 'zh-CN',
+        aspectRatio: '16:9', // 将播放器置于流畅模式，并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字（例如"16:9"或"4:3"）
+        fluid: true, // 当true时，Video.js player将拥有流体大小。换句话说，它将按比例缩放以适应其容器。
+        sources: [{
+          type: 'video/mp4', // 类型
+          src: 'https://qask.qhdsafety.com/file/uploadFiles/file/13cf0f4ec77e4d98ae8cdd9c3386ae0c/20210625/691910cd81024986a392f6203c4045f8.mp4' // url地址
+        }],
+        poster: '', // 封面地址
+        notSupportedMessage: '此视频暂无法播放，请稍后再试', // 允许覆盖Video.js无法播放媒体源时显示的默认信息。
+        controlBar: {
+          timeDivider: true, // 当前时间和持续时间的分隔符
+          durationDisplay: true, // 显示持续时间
+          remainingTimeDisplay: false, // 是否显示剩余时间功能
+          fullscreenToggle: true // 是否显示全屏按钮
+        }
+      },
+      fileList: []
+    }
+  },
+  created() {
+    this.corpInfoId = this.$parent.indexVal
+    this.getList('0')
+    this.getDataTree()
+    this.urlToBlob()
+  },
+  methods: {
+
+    urlToBlob() {},
+    // 上一页
+    prePage() {
+      let page = this.pageNum
+      page = page > 1 ? page - 1 : this.pageTotalNum
+      this.pageNum = page
+    },
+
+    // 下一页
+    nextPage() {
+      let page = this.pageNum
+      page = page < this.pageTotalNum ? page + 1 : 1
+      this.pageNum = page
+    },
+    getRowKey(row) {
+      return row.MFOLDER_ID
+    },
+    // 搜索
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.getList('0')
+    },
+    // 获取列表
+    getList(F_ID) {
+      this.listLoading = true
+      this.MFOLDER_ID = F_ID
+      requestFN(
+        '/ajFfolder/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          KEYWORDS: this.KEYWORDS,
+          CORPINFO_ID: this.corpInfoId,
+          MFOLDER_ID: this.MFOLDER_ID,
+          SHARE: this.SHARE
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.PARENT_ID = data.PARENT_ID
+        this.total = data.page.totalResult
+        this.hasButton()
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    // 添加
+    handleAdd() {
+      this.resetForm()
+      this.dialogForm = true
+    },
+    submitUpload() {
+      this.$refs.upload.submit()
+    },
+    handleRemove(file, fileList) {
+      console.log(1)
+
+      console.log(file, fileList)
+    },
+    handlePreview(file) {
+      console.log(file)
+    },
+    handleChangePDF(file, fileList) {
+      // const types = ['application/pdf']
+      // const isImage = types.includes(file.raw.type)
+      // if (!isImage) {
+      //   this.$message.error('上传文件只能是 PDF 格式!')
+      //   fileList.pop()
+      // } else {
+      //   this.form.FFILE = file.raw
+      // }
+      this.form.FFILE = file.raw
+    },
+    handleChangePDF2(file, fileList) {
+      // const types = ['application/pdf']
+      // const isImage = types.includes(file.raw.type)
+      // if (!isImage) {
+      //   this.$message.error('上传文件只能是 PDF 格式!')
+      //   fileList.pop()
+      // }
+
+    },
+    // 添加
+    handleUpload() {
+      this.resetForm()
+      this.dialogFormUpload = true
+    },
+    // 添加
+    handleBatchUpload() {
+      this.resetForm()
+      this.dialogBatchUpload = true
+    },
+    // beforeFileUpload2(file) {
+    //   console.info(this.fileList)
+    //   this.fileList.push(file)
+    //   this.$forceUpdate()
+    //   return false
+    // },
+    beforeFileUpload2(file) {
+      var testmsg = file.name.substring(file.name.lastIndexOf('.') + 1)
+      const extension = testmsg === 'pdf'
+      if (!extension) {
+        this.$confirm(`上传文件只能是pdf格式!`)
+      } else {
+        this.fileList.push(file)
+      }
+      this.$forceUpdate()
+      return false
+    },
+    beforeFileUpload(file) {
+      var testmsg = file.name.substring(file.name.lastIndexOf('.') + 1)
+      const extension = testmsg === 'pdf'
+      if (!extension) {
+        this.$confirm(`上传文件只能是pdf格式!`)
+      } else {
+        this.form.FFILE = file
+      }
+      this.$forceUpdate()
+      return false
+    },
+    // 保存
+    confirm() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          requestFN(
+            '/ajFfolder/add',
+            {
+              PARENT_ID: this.MFOLDER_ID,
+              NAME: this.form.NAME,
+              REMARKS: this.form.REMARKS
+            }
+          ).then((data) => {
+            this.$message({
+              message: '操作成功',
+              type: 'success'
+            })
+            this.dialogForm = false
+            this.getDataTree()
+            this.getList(this.MFOLDER_ID)
+          }).catch((e) => {
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    batchUpload() {
+      var _this = this
+
+      if (_this.$refs.batchUpload.uploadFiles.length < 1) {
+        Message({
+          message: '请上传附件',
+          type: 'error',
+          duration: 5 * 1000
+        })
+        return
+      }
+
+      _this.$refs.batchUpload.submit()
+      const loading = _this.$loading({
+        lock: true,
+        text: '上传中...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      _this.form.PARENT_ID = _this.MFOLDER_ID
+      const formData = new FormData()
+      Object.keys(_this.form).map(key => {
+        formData.append(key, _this.form[key])
+      })
+      console.info(_this.fileList)
+      for (var i = 0; i < _this.fileList.length; i++) {
+        if (_this.fileList[i]) {
+          formData.append('FFILE', _this.fileList[i])
+        }
+      }
+      upload(
+        '/ajFfolder/batchUpload',
+        formData
+      ).then((data) => {
+        _this.fileList = []
+        _this.dialogBatchUpload = false
+        _this.getDataTree()
+        _this.getList(_this.MFOLDER_ID)
+        loading.close()
+      }).catch((e) => {
+        loading.close()
+      })
+    },
+    // 保存
+    upload() {
+      this.$refs.uploadForm.validate(valid => {
+        if (!this.form.FFILE) {
+          Message({
+            message: '请上传附件',
+            type: 'error',
+            duration: 5 * 1000
+          })
+          return
+        }
+        const loading = this.$loading({
+          lock: true,
+          text: '上传中...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        this.form.PARENT_ID = this.MFOLDER_ID
+        const formData = new FormData()
+        Object.keys(this.form).map(key => {
+          formData.append(key, this.form[key])
+        })
+        upload(
+          '/ajFfolder/upload',
+          formData
+        ).then((data) => {
+          this.dialogFormUpload = false
+          this.getDataTree()
+          this.getList(this.MFOLDER_ID)
+          loading.close()
+        }).catch((e) => {
+          loading.close()
+        })
+      })
+    },
+    handleNodeClick(node, data, value) {
+      this.getList(node.id)
+    },
+    handleDelete(id, FILEPATH) {
+      this.$confirm('确定要删除吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true
+        requestFN(
+          '/ajFfolder/delete',
+          {
+            MFOLDER_ID: id,
+            FILEPATH: FILEPATH || ''
+          }
+        ).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
+          this.listLoading = false
+          this.varList = []
+          this.listQuery.page = 1
+          this.getDataTree()
+          this.getList(this.MFOLDER_ID)
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }).catch(() => {
+      })
+    },
+
+    // 判断按钮权限，用于是否显示按钮
+    hasButton() {
+      var keys = 'mfolder:add,mfolder:del,mfolder:edit,toExcel'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys
+        }
+      ).then((data) => {
+        this.add = data.mfolderfhadminadd		// 新增权限
+        this.del = data.mfolderfhadmindel		// 删除权限
+        this.edit = data.mfolderfhadminedit	// 修改权限
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    resetForm() {
+      this.form = {
+        form: {
+          NAME: '', //
+          FFILE: [],
+          REMARKS: ''
+        }
+      }
+    },
+    getDataTree() {
+      this.treeLoading = true
+      requestFN(
+        '/ajFfolder/listTree',
+        {
+          corpInfoId: this.corpInfoId
+        }
+      ).then((data) => {
+        this.treeLoading = false
+        this.treeData = JSON.parse(data.zTreeNodes)
+      })
+        .catch((e) => {
+          this.treeLoading = false
+        })
+    },
+    filterNode(value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
+    downloadFile(MFOLDER_ID) {
+      this.$confirm('确定要下载此文件吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = false
+        // '/ajFfolder/download?MFOLDER_ID=' + MFOLDER_ID,
+        window.location.href = config.httpurl + 'mfolder/download?MFOLDER_ID=' + MFOLDER_ID
+      }).catch(() => {
+        this.listLoading = false
+      })
+      this.listLoading = false
+    },
+    // pdf 预览
+    goViewPdf(filePath) {
+      this.pageNum = 1
+      this.pdfUrl = this.serverurl + filePath
+      this.dialogViewPdf = true
+    },
+    // txt 预览
+    goViewTxt(filePath) {
+      const file_url = 'serverurl' + filePath
+      // 可以是具体.txt也可以是接口返回的blob，或者web转换
+      const xhr = new XMLHttpRequest()
+      xhr.open('get', file_url, true)
+      xhr.responseType = 'blob'
+      var self = this// onload this指向为window中转一下
+      this.loading = true
+      xhr.onload = function() {
+        if (this.status == 200) {
+          self.loading = false
+          console.log(this.response)
+          const reader = new FileReader()
+          reader.onload = function() {
+            self.txtPre = reader.result// 获取的数据data
+            self.dialogvisibleview = true
+            console.log('reader.result', reader.result)
+          }
+          reader.readAsText(this.response)
+        } else {
+          this.loading = false
+        }
+      }
+      xhr.send()
+
+      this.dialogViewTxt = true
+    },
+    goViewVideo(filePath) {
+      this.playerOptions.sources[0].src = 'serverurl' + filePath
+      this.playerOptions.sources[0].type = 'video/mp4'
+
+      this.dialogViewVideo = true
+    },
+    goOffice(filePath) {
+      window.open(config.fileUrl + filePath, '_blank').document.charset = 'UTF-8'
+    }
+  }
+}
+
+</script>
+<style lang="sass" scoped>
+.btn-only
+  .el-button+.el-button
+    margin-left: 0px
+</style>
-- 
2.42.0.windows.1