Merge remote-tracking branch 'origin/release-sy-v1.0.0'

src/views/dike/runManage/dangerWeakProject/inspectProjects/fillReport.vue

@@ -153,8 +153,19 @@ export default {
       }
     },
     // 选中某个项目
-    handleClickItem(item) {
+    handleClickItem(item, ref) {
+      this.$confirm(
+        `本系统为非涉密信息系统，严禁处理、传输国家秘密、工作秘密。`,
+        `提示`,
+        {
+          confirmButtonText: "我已知晓",
+          cancelButtonText: "取消上传",
+          type: "warning",
+        }
+      ).then(() => {
         this.currentItem = item;
+        this.$refs[ref][0].$refs['upload-inner'].handleClick()
+      })
     },
     // 上传前
     beforeUpload(e) {
@@ -268,7 +279,7 @@ export default {
       <template v-if="problemList.length">
         <el-tabs v-model="activeName" type="card">
           <el-tab-pane
-            v-for="item in problemList"
+            v-for="(item, index) in problemList"
             :key="item.id"
             :label="item.projectName"
             :name="item.projectId"
@@ -355,6 +366,7 @@ export default {
                   <el-upload
                     action="#"
                     :disabled="isDisabled"
+                    :ref="`upload${index}${index2}`"
                     :http-request="handleUpload"
                     :auto-upload="true"
                     :before-upload="beforeUpload"
@@ -362,14 +374,14 @@ export default {
                     accept=".jpg,.png,.jpeg"
                     :limit="99"
                   >
+                  </el-upload>
                   <el-button
                     size="small"
                     type="primary"
-                      @click="handleClickItem(item2)"
+                    @click="handleClickItem(item2,  `upload${index}${index2}`)"
                     :disabled="isDisabled"
                   >上传</el-button
                   >
-                  </el-upload>
                 </div>
               </div>
             </div>

src/views/dike/runManage/supervisionInspetion/methodsManage/details.vue

@@ -4,9 +4,10 @@
 
     <div class="method-details-page slider-right-body">
       <div class="flex justify-between items-center">
+        <div v-if="$route.query.mode != 'preview'">
           <el-upload
-          v-if="$route.query.mode != 'preview'"
             action="#"
+            ref="upload"
             class="avatar-uploader"
             :http-request="handleUpload"
             :auto-upload="true"
@@ -15,10 +16,15 @@
             accept=".PDF"
             :limit="1"
           >
-          <el-button type="primary">{{
+          </el-upload>
+          <el-button
+            @click="handleUploadButton"
+            type="primary"
+          >{{
               detailsData.superviseCheckWay ? "重新上传" : "上传文件"
             }}</el-button>
-        </el-upload>
+
+        </div>
         <div v-else>&nbsp;</div>
         <span v-if="editName && $route.query.mode === 'edit'">
           <el-input
@@ -94,6 +100,19 @@ export default {
         }
       });
     },
+    handleUploadButton() {
+      this.$confirm(
+        `本系统为非涉密信息系统，严禁处理、传输国家秘密、工作秘密。`,
+        `提示`,
+        {
+          confirmButtonText: "我已知晓",
+          cancelButtonText: "取消上传",
+          type: "warning",
+        }
+      ).then(() => {
+        this.$refs.upload.$refs['upload-inner'].handleClick()
+      })
+    },
     handleSaveName() {
       if (!this.detailsData.name) {
         this.$message.warning("请输入名称");

src/views/dike/runManage/supervisionInspetion/projectManage/projectReport.vue

@@ -200,8 +200,19 @@ export default {
       }
     },
     // 选中某个项目
-    handleClickItem(item) {
+    handleClickItem(item, ref) {
+      this.$confirm(
+        `本系统为非涉密信息系统，严禁处理、传输国家秘密、工作秘密。`,
+        `提示`,
+        {
+          confirmButtonText: "我已知晓",
+          cancelButtonText: "取消上传",
+          type: "warning",
+        }
+      ).then(() => {
         this.currentItem = item;
+        this.$refs[ref][0].$refs['upload-inner'].handleClick()
+      })
     },
     // 上传前
     beforeUpload(e) {
@@ -346,7 +357,7 @@ export default {
       <template v-if="problemList.length">
         <el-tabs v-model="activeName" type="card">
           <el-tab-pane
-            v-for="item in problemList"
+            v-for="(item, index) in problemList"
             :key="item.id"
             :label="item.projectName"
             :name="item.projectId"
@@ -452,6 +463,7 @@ export default {
                   <el-upload
                     action="#"
                     :disabled="isDisabled"
+                    :ref="`upload${index}`"
                     :http-request="handleUpload"
                     :auto-upload="true"
                     :before-upload="beforeUpload"
@@ -459,13 +471,13 @@ export default {
                     accept=".jpg,.png,.jpeg"
                     :limit="99"
                   >
+                  </el-upload>
                   <el-button
                     type="primary"
-                      @click="handleClickItem(item2)"
+                    @click="handleClickItem(item2, `upload${index}`)"
                     :disabled="isDisabled"
                   >上传</el-button
                   >
-                  </el-upload>
                 </div>
               </div>
             </div>

src/views/sluice/runManage/dangerWeakProject/inspectProjects/fillReport.vue

@@ -154,8 +154,19 @@ export default {
       }
     },
     // 选中某个项目
-    handleClickItem(item) {
+    handleClickItem(item, ref) {
+      this.$confirm(
+        `本系统为非涉密信息系统，严禁处理、传输国家秘密、工作秘密。`,
+        `提示`,
+        {
+          confirmButtonText: "我已知晓",
+          cancelButtonText: "取消上传",
+          type: "warning",
+        }
+      ).then(() => {
         this.currentItem = item;
+        this.$refs[ref][0].$refs['upload-inner'].handleClick()
+      })
     },
     // 上传前
     beforeUpload(e) {
@@ -269,7 +280,7 @@ export default {
       <template v-if="problemList.length">
         <el-tabs v-model="activeName" type="card">
           <el-tab-pane
-            v-for="item in problemList"
+            v-for="(item, index) in problemList"
             :key="item.id"
             :label="item.projectName"
             :name="item.projectId"
@@ -354,6 +365,7 @@ export default {
                   <el-upload
                     action="#"
                     :disabled="isDisabled"
+                    :ref="`upload${index}${index2}`"
                     :http-request="handleUpload"
                     :auto-upload="true"
                     :before-upload="beforeUpload"
@@ -361,13 +373,13 @@ export default {
                     accept=".jpg,.png,.jpeg"
                     :limit="99"
                   >
+                  </el-upload>
                   <el-button
                     type="primary"
-                      @click="handleClickItem(item2)"
+                    @click="handleClickItem(item2, `upload${index}${index2}`)"
                     :disabled="isDisabled"
                   >上传</el-button
                   >
-                  </el-upload>
                 </div>
               </div>
             </div>

src/views/sluice/runManage/dispatch/plan/components/edit.vue

@@ -128,6 +128,19 @@ export default {
       if (this.file) {
         return this.$confirm(`确定移除 ${file.name}？`);
       }
+    },
+    handleUploadButton() {
+      this.$confirm(
+        `本系统为非涉密信息系统，严禁处理、传输国家秘密、工作秘密。`,
+        `提示`,
+        {
+          confirmButtonText: "我已知晓",
+          cancelButtonText: "取消上传",
+          type: "warning",
+        }
+      ).then(() => {
+        this.$refs.upload.$refs['upload-inner'].handleClick()
+      })
     }
   }
 }
@@ -203,6 +216,7 @@ export default {
           <el-upload
               class="avatar-uploader"
               action="#"
+              ref="upload"
               :http-request="handleUpload"
               :on-preview="handlePreview"
               :before-remove="beforeRemove"
@@ -213,9 +227,10 @@ export default {
               :limit="5"
               :on-exceed="handleExceed"
               :file-list="fileList">
-            <el-button size="small" type="primary">点击上传</el-button>
+            <el-button size="small" type="primary" @click.stop="handleUploadButton">点击上传</el-button>
             <div slot="tip" class="el-upload__tip">只能上传doc/docx/pdf/png/jpg且不能超过50m</div>
           </el-upload>
+
         </el-form-item>
       </el-col>
       <div ref="word"></div>

src/views/sluice/runManage/supervisionInspetion/methodsManage/details.vue

@@ -4,10 +4,11 @@
 
     <div class="method-details-page slider-right-body">
       <div class="flex justify-between items-center">
+        <div v-if="$route.query.mode != 'preview'">
           <el-upload
-          v-if="$route.query.mode != 'preview'"
             action="#"
             class="avatar-uploader"
+            ref="upload"
             :http-request="handleUpload"
             :auto-upload="true"
             :before-upload="beforeUpload"
@@ -15,10 +16,11 @@
             accept=".PDF"
             :limit="1"
           >
-          <el-button type="primary">{{
+          </el-upload>
+          <el-button type="primary" @click="handleUploadButton">{{
               detailsData.superviseCheckWay ? "重新上传" : "上传文件"
             }}</el-button>
-        </el-upload>
+        </div>
         <div v-else>&nbsp;</div>
         <span v-if="editName && $route.query.mode === 'edit'">
           <el-input
@@ -93,6 +95,19 @@ export default {
         }
       });
     },
+    handleUploadButton() {
+      this.$confirm(
+        `本系统为非涉密信息系统，严禁处理、传输国家秘密、工作秘密。`,
+        `提示`,
+        {
+          confirmButtonText: "我已知晓",
+          cancelButtonText: "取消上传",
+          type: "warning",
+        }
+      ).then(() => {
+        this.$refs.upload.$refs['upload-inner'].handleClick()
+      })
+    },
     handleSaveName() {
       if (!this.detailsData.name) {
         this.$message.warning("请输入名称");

src/views/sluice/runManage/supervisionInspetion/projectManage/projectReport.vue

@@ -200,8 +200,19 @@ export default {
       }
     },
     // 选中某个项目
-    handleClickItem(item) {
+    handleClickItem(item, ref) {
+      this.$confirm(
+        `本系统为非涉密信息系统，严禁处理、传输国家秘密、工作秘密。`,
+        `提示`,
+        {
+          confirmButtonText: "我已知晓",
+          cancelButtonText: "取消上传",
+          type: "warning",
+        }
+      ).then(() => {
         this.currentItem = item;
+        this.$refs[ref][0].$refs['upload-inner'].handleClick()
+      })
     },
     // 上传前
     beforeUpload(e) {
@@ -351,7 +362,7 @@ export default {
       <template v-if="problemList.length">
         <el-tabs v-model="activeName" type="card">
           <el-tab-pane
-            v-for="item in problemList"
+            v-for="(item, index) in problemList"
             :key="item.id"
             :label="item.projectName"
             :name="item.projectId"
@@ -359,7 +370,7 @@ export default {
           >
             <div
               class="question-row w-full"
-              v-for="item2 in item.children"
+              v-for="(item2, index2) in item.children"
               :key="item2.id"
             >
               <div class="flex">
@@ -457,6 +468,7 @@ export default {
                   <el-upload
                     action="#"
                     :disabled="isDisabled"
+                    :ref="`upload${index}${index}`"
                     :http-request="handleUpload"
                     :auto-upload="true"
                     :before-upload="beforeUpload"
@@ -464,13 +476,13 @@ export default {
                     accept=".jpg,.png,.jpeg"
                     :limit="99"
                   >
+                  </el-upload>
                   <el-button
                     type="primary"
-                      @click="handleClickItem(item2)"
+                    @click="handleClickItem(item2, `upload${index}${index}`)"
                     :disabled="isDisabled"
                   >上传</el-button
                   >
-                  </el-upload>
                 </div>
               </div>
             </div>