Просмотр исходного кода

Merge branch 'hjw-222' into 'master'

附件上传接口修改

See merge request spfm/spfm-market-front!486
徐兴安 1 год назад
Родитель
Сommit
9208efdf1c

+ 1 - 1
src/components/upload.vue

@@ -169,7 +169,7 @@ export default {
         query.append("relId", this.fileInfo.relId);
       }
       //运营类项目考核及结算
-      if (this.fileInfo.url == "/market/cmkAttachInfo/upload") {
+      if (this.fileInfo.url == "/market/cmkAttachInfo/uploadByMinio") {
         query.append("uploadType", this.fileInfo.uploadType);
       }
       if (this.fileInfo.url == "/market/cStoreOutWo/importData") {

+ 1 - 1
src/config/dev.js

@@ -79,7 +79,7 @@ let test = {
     riskMaterialsfresourceId: '3124a2d4-7209-11ed-8d6f-00505687dcd3',//风险防控
     materialApplicationfresourceId:'8f0e9c49-b348-11ed-be6b-00505687dcd3',//宣传物料省
     materialApplicationdsfresourceId:'a7f127b7-b348-11ed-be6b-00505687dcd3',//宣传物料地市
-    accountApplicationfresourceId: '9acf34bf-b24d-11ed-be6b-00505687dcd3',//账号申请流程
+    accountApplicationfresourceId: '27a9dbbf-d742-11ed-8255-e00084564cce',//账号申请流程
     accountdelfresourceId: 'e907b062-b33f-11ed-be6b-00505687dcd3',//账号删除
     accountPermissionsfresourceId: '2b9e648d-b24d-11ed-be6b-00505687dcd3',//账号权限申请流程
     aqbgsyListfresourceId: 'bc3402ee-b33f-11ed-be6b-00505687dcd3',//安全报告审阅

+ 1 - 1
src/pages/main/accountPermissions/accountApplication.vue

@@ -13,7 +13,7 @@
         <el-dialog :title="dialogTitle" :visible.sync="dialogStatus" width="100%" :before-close="handleClose" :modal="false"
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
-            <div style="position: fixed; z-index: 10000;top: 55px;">
+            <div style="">
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
                 <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
                 <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>                

+ 1 - 1
src/pages/main/accountPermissions/accountPermissions.vue

@@ -13,7 +13,7 @@
         <el-dialog :title="dialogTitle" :visible.sync="dialogStatus" width="100%" :before-close="handleClose" :modal="false"
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
-            <div style="position: fixed; z-index: 10000;top: 55px;">
+            <div style="">
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
                 <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
                 <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>  

+ 1 - 1
src/pages/main/accountPermissions/accountdel.vue

@@ -13,7 +13,7 @@
         <el-dialog :title="dialogTitle" :visible.sync="dialogStatus" width="100%" :before-close="handleClose" :modal="false"
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
-            <div style="position: fixed; z-index: 10000;top: 55px;">
+            <div style="">
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
                 <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
                 <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>  

+ 1 - 1
src/pages/main/accountPermissions/aqbgsyList.vue

@@ -13,7 +13,7 @@
         <el-dialog :title="dialogTitle" :visible.sync="dialogStatus" width="100%" :before-close="handleClose" :modal="false"
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
-            <div style="position: fixed; z-index: 10000;top: 55px;">
+            <div style="">
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
                 <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
                 <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>  

+ 1 - 1
src/pages/main/accountPermissions/klhfsqList.vue

@@ -13,7 +13,7 @@
         <el-dialog :title="dialogTitle" :visible.sync="dialogStatus" width="100%" :before-close="handleClose" :modal="false"
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
-            <div style="position: fixed; z-index: 10000;top: 55px;">
+            <div style="">
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
                 <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
                 <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>  

+ 1 - 1
src/pages/main/accountPermissions/rltzjlList.vue

@@ -13,7 +13,7 @@
         <el-dialog :title="dialogTitle" :visible.sync="dialogStatus" width="100%" :before-close="handleClose" :modal="false"
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
-            <div style="position: fixed; z-index: 10000;top: 55px;">
+            <div style="">
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
                 <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
                 <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>  

+ 1 - 1
src/pages/main/accountPermissions/sjkdbList.vue

@@ -13,7 +13,7 @@
         <el-dialog :title="dialogTitle" :visible.sync="dialogStatus" width="100%" :before-close="handleClose" :modal="false"
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
-            <div style="position: fixed; z-index: 10000;top: 55px;">
+            <div style="">
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
                 <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
                 <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>  

+ 1 - 1
src/pages/main/accountPermissions/tyshList.vue

@@ -13,7 +13,7 @@
         <el-dialog :title="dialogTitle" :visible.sync="dialogStatus" width="100%" :before-close="handleClose" :modal="false"
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
-            <div style="position: fixed; z-index: 10000;top: 55px;">
+            <div style="">
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
                 <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
                 <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>  

+ 9 - 10
src/pages/main/applyFor/authoriZation.vue

@@ -11,15 +11,13 @@
         :before-close="handleClose" width="100%" height="500vh" class="dialogClass" top="0" :modal="false"
         :modal-append-to-body="true">
         <span class="dialog-body">
-          <div class="flex-title">口令授权</div>
+          <div>
+            <el-button type="primary" @click="newFormgong" v-if="baocun">保存</el-button>
+            <el-button type="primary" v-if="deal" @click="dealwith()">处理</el-button>
+            <el-button type="primary" @click="close()">关闭</el-button>
+          </div>
           <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-            <!--dialogVisible1 = true -->
-            <el-form-item style="position: fixed; top: 70px; left: -60px; z-index: 1000">
-              <el-button type="primary" @click="newFormgong" v-if="baocun">保存</el-button>
-              <el-button type="primary" v-if="deal" @click="dealwith()">处理</el-button>
-              <el-button type="primary" @click="close()">关闭</el-button>
-              <!-- <el-button type="primary" @click="submitForm()" v-if = "baocun">保存</el-button> -->
-            </el-form-item>
+            <div class="flex-title">口令授权</div>
             <div class="flex-header">
               <el-form-item label="文件标题" prop="needName" style="width: 33%">
                 <el-input v-model="ruleForm.needName" :disabled="isdisabled"></el-input>
@@ -157,7 +155,8 @@
         :destroy-on-close="true">
         <!--  -->
         <!-- <Workflow :list="ruleForm" :requestForm="requestForm" @dialogVisible1 = "Visible1"/> -->
-        <Workflow :list="ruleForm" @updateForm="updateForm" :requestForm="requestForm" :request_formTitle="request_form.title"/>
+        <Workflow :list="ruleForm" @updateForm="updateForm" :requestForm="requestForm"
+          :request_formTitle="request_form.title" />
         <!-- @dialogVisible1 = "Visible1" -->
         <!-- <WorkflowEntrance
           :list="ruleForm"
@@ -1207,7 +1206,7 @@ export default {
   text-align: center;
   font-size: 24px;
   line-height: 60px;
-  border-bottom: 1px solid #e1e1e1;
+  // border-bottom: 1px solid #e1e1e1;
   font-weight: 700;
 }
 

+ 10 - 10
src/pages/main/applyFor/backupRequire.vue

@@ -11,16 +11,15 @@
         :before-close="handleClose" width="100%" height="500vh" class="dialogClass" top="0" :modal="false"
         :modal-append-to-body="true">
         <span class="dialog-body">
-          <div class="flex-title">备份需求及变更</div>
+          <div>
+            <el-button type="primary" @click="newFormgong" v-if="baocun">保存</el-button>
+            <el-button type="primary" v-if="deal" @click="dealwith()">处理</el-button>
+            <el-button type="primary" @click="close()">关闭</el-button>
+          </div>
+          
           <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
             <!--dialogVisible1 = true -->
-            <el-form-item style="position: fixed; top: 70px; left: -60px; z-index: 1000">
-              <el-button type="primary" @click="newFormgong" v-if="baocun">保存</el-button>
-              <el-button type="primary" v-if="deal" @click="dealwith()">处理</el-button>
-              <el-button type="primary" @click="close()">关闭</el-button>
-
-              <!-- <el-button type="primary" @click="submitForm()" v-if = "baocun">保存</el-button> -->
-            </el-form-item>
+            <div class="flex-title">备份需求及变更</div>
             <div class="flex-header">
               <el-form-item label="文件标题" prop="needName" style="width: 33%">
                 <el-input v-model="ruleForm.needName" :disabled="isdisabled"></el-input>
@@ -97,7 +96,8 @@
         :destroy-on-close="true">
         <!--  -->
         <!-- <Workflow :list="ruleForm" :requestForm="requestForm" @dialogVisible1 = "Visible1"/> -->
-        <Workflow :list="ruleForm" @updateForm="updateForm" :requestForm="requestForm" :request_formTitle="request_form.title"/>
+        <Workflow :list="ruleForm" @updateForm="updateForm" :requestForm="requestForm"
+          :request_formTitle="request_form.title" />
         <!-- @dialogVisible1 = "Visible1" -->
         <!-- <WorkflowEntrance
           :list="ruleForm"
@@ -1024,7 +1024,7 @@ export default {
   text-align: center;
   font-size: 24px;
   line-height: 60px;
-  border-bottom: 1px solid #e1e1e1;
+  // border-bottom: 1px solid #e1e1e1;
   font-weight: 700;
 }
 

+ 11 - 11
src/pages/main/applyFor/emergencyPlan.vue

@@ -11,16 +11,15 @@
         :before-close="handleClose" width="100%" height="500vh" class="dialogClass" top="0" :modal="false"
         :modal-append-to-body="true">
         <span class="dialog-body">
-          <div class="flex-title">应急预案审批</div>
+          <div>
+            <el-button type="primary" @click="newFormgong" v-if="baocun">保存</el-button>
+            <el-button type="primary" v-if="deal" @click="dealwith()">处理</el-button>
+            <el-button type="primary" @click="close()">关闭</el-button>
+          </div>
           <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
             <!--dialogVisible1 = true -->
-            <el-form-item style="position: fixed; top: 70px; left: -60px; z-index: 1000">
-              <el-button type="primary" @click="newFormgong" v-if="baocun">保存</el-button>
-              <el-button type="primary" v-if="deal" @click="dealwith()">处理</el-button>
-              <el-button type="primary" @click="close()">关闭</el-button>
-
-              <!-- <el-button type="primary" @click="submitForm()" v-if = "baocun">保存</el-button> -->
-            </el-form-item>
+            <div class="flex-title">应急预案审批</div>
+          
             <div class="flex-header">
               <el-form-item label="文件标题" prop="needName" style="width: 50%">
                 <el-input v-model="ruleForm.needName" :disabled="isdisabled"></el-input>
@@ -96,9 +95,10 @@
           :requestForm="requestForm"
         /> -->
         <Workflow ref="workflow" :list="ruleForm" v-if="isWorkflowStatus == true" @beforeClose="beforeClose"
-          @updateForm="updateForm" :requestForm="requestForm" :adminResourceId="adminResourceId" :request_formTitle="request_form.title"/>
+          @updateForm="updateForm" :requestForm="requestForm" :adminResourceId="adminResourceId"
+          :request_formTitle="request_form.title" />
         <WorkflowEntrance :list="ruleForm" v-else :lastManList="lastManList" @beforeClose="beforeClose"
-          :requestForm="requestForm" :request_formTitle="request_form.title"/>
+          :requestForm="requestForm" :request_formTitle="request_form.title" />
 
         <span slot="footer" class="dialog-footer">
         </span>
@@ -1305,7 +1305,7 @@ export default {
   text-align: center;
   font-size: 24px;
   line-height: 60px;
-  border-bottom: 1px solid #e1e1e1;
+  // border-bottom: 1px solid #e1e1e1;
   font-weight: 700;
 }
 

+ 7 - 9
src/pages/main/applyFor/internetAccess.vue

@@ -11,16 +11,14 @@
         :before-close="handleClose" width="100%" height="500vh" class="dialogClass" top="0" :modal="false"
         :modal-append-to-body="true">
         <span class="dialog-body">
-          <div class="flex-title">互联网访问端口开放</div>
-          <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-            <!--dialogVisible1 = true -->
-            <el-form-item style="position: fixed; top: 70px; left: -60px; z-index: 1000">
-              <el-button type="primary" @click="newFormgong" v-if="baocun">保存</el-button>
+          <div>
+            <el-button type="primary" @click="newFormgong" v-if="baocun">保存</el-button>
               <el-button type="primary" v-if="deal" @click="dealwith()">处理</el-button>
               <el-button type="primary" @click="close()">关闭</el-button>
-
-              <!-- <el-button type="primary" @click="submitForm()" v-if = "baocun">保存</el-button> -->
-            </el-form-item>
+          </div>
+          <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+            <!--dialogVisible1 = true -->
+            <div class="flex-title">互联网访问端口开放</div>
             <div class="flex-header">
               <el-form-item label="文件标题" prop="needName" style="width: 33%">
                 <el-input v-model="ruleForm.needName" :disabled="isdisabled"></el-input>
@@ -1031,7 +1029,7 @@ export default {
   text-align: center;
   font-size: 24px;
   line-height: 60px;
-  border-bottom: 1px solid #e1e1e1;
+  // border-bottom: 1px solid #e1e1e1;
   font-weight: 700;
 }
 

+ 12 - 10
src/pages/main/applyFor/resourceApply.vue

@@ -11,16 +11,17 @@
         :before-close="handleClose" width="100%" height="500vh" class="dialogClass" top="0" :modal="false"
         :modal-append-to-body="true">
         <span class="dialog-body">
-          <div class="flex-title">系统资源申请</div>
+          
+          <div>
+            <el-button type="primary" @click="newFormgong" v-if="baocun">保存</el-button>
+            <el-button type="primary" v-if="deal" @click="dealwith()">处理</el-button>
+            <el-button type="primary" @click="close()">关闭</el-button>
+
+          </div>
           <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
             <!--dialogVisible1 = true -->
-            <el-form-item style="position: fixed; top: 70px; left: -60px; z-index: 1000">
-              <el-button type="primary" @click="newFormgong" v-if="baocun">保存</el-button>
-              <el-button type="primary" v-if="deal" @click="dealwith()">处理</el-button>
-              <el-button type="primary" @click="close()">关闭</el-button>
-
-              <!-- <el-button type="primary" @click="submitForm()" v-if = "baocun">保存</el-button> -->
-            </el-form-item>
+            <div class="flex-title">系统资源申请</div>
+          
             <div class="flex-header">
               <el-form-item label="文件标题" prop="needName" style="width: 33%">
                 <el-input v-model="ruleForm.needName" :disabled="isdisabled"></el-input>
@@ -102,7 +103,8 @@
         :destroy-on-close="true">
         <!--  -->
         <!-- <Workflow :list="ruleForm" :requestForm="requestForm" @dialogVisible1 = "Visible1"/> -->
-        <Workflow :list="ruleForm" @updateForm="updateForm" :requestForm="requestForm" :request_formTitle="request_form.title"/>
+        <Workflow :list="ruleForm" @updateForm="updateForm" :requestForm="requestForm"
+          :request_formTitle="request_form.title" />
         <!-- @dialogVisible1 = "Visible1" -->
         <!-- <WorkflowEntrance
           :list="ruleForm"
@@ -1029,7 +1031,7 @@ export default {
   text-align: center;
   font-size: 24px;
   line-height: 60px;
-  border-bottom: 1px solid #e1e1e1;
+  // border-bottom: 1px solid #e1e1e1;
   font-weight: 700;
 }
 

+ 8 - 9
src/pages/main/applyFor/securityAudit.vue

@@ -11,16 +11,15 @@
         :before-close="handleClose" width="100%" height="500vh" class="dialogClass" top="0" :modal="false"
         :modal-append-to-body="true">
         <span class="dialog-body">
-          <div class="flex-title">安全审计计划管理</div>
-          <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-            <!--dialogVisible1 = true -->
-            <el-form-item style="position: fixed; top: 70px; left: -60px; z-index: 1000">
-              <el-button type="primary" @click="newFormgong" v-if="baocun">保存</el-button>
+          <div>
+            <el-button type="primary" @click="newFormgong" v-if="baocun">保存</el-button>
               <el-button type="primary" v-if="deal" @click="dealwith()">处理</el-button>
               <el-button type="primary" @click="close()">关闭</el-button>
-
-              <!-- <el-button type="primary" @click="submitForm()" v-if = "baocun">保存</el-button> -->
-            </el-form-item>
+          </div>
+          <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+            <!--dialogVisible1 = true -->
+          
+            <div class="flex-title">安全审计计划管理</div>
             <div class="flex-header">
               <el-form-item label="文件标题" prop="needName" style="width: 50%">
                 <el-input v-model="ruleForm.needName" :disabled="isdisabled"></el-input>
@@ -1008,7 +1007,7 @@ export default {
   text-align: center;
   font-size: 24px;
   line-height: 60px;
-  border-bottom: 1px solid #e1e1e1;
+  // border-bottom: 1px solid #e1e1e1;
   font-weight: 700;
 }
 

Разница между файлами не показана из-за своего большого размера
+ 573 - 709
src/pages/main/applyFor/userChange.vue


+ 1 - 1
src/pages/main/bfsj/bfsjList.vue

@@ -13,7 +13,7 @@
         <el-dialog :title="dialogTitle" :visible.sync="dialogStatus" width="100%" :before-close="handleClose" :modal="false"
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
-            <div style="position: fixed; z-index: 10000;top: 55px;">
+            <div style="">
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
                 <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
                 <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>                

+ 10 - 8
src/pages/main/collect/collect.vue

@@ -470,7 +470,7 @@ export default {
       },
     async downloads(fileData) {
       await this.$http({
-        url: "/market/CMKFile/downFile",
+        url: "/market/waf/downFileByMinio",
         method: "post",
         headers: {
           "Content-Type": "application/json",
@@ -515,13 +515,13 @@ export default {
         });
       });
       await this.$http({
-        url: "/market/CMKFile/downAllFile",
+        url: "/market/waf/downAllFileByMinio",
         method: "post",
         headers: {
           "Content-Type": "application/json",
         },
         responseType: "blob",
-        data: { mkFileShareAttachList: arr },
+        data: { wfFileShareAttachList: arr },
       }).then((response) => {
         if (window.navigator && window.navigator.msSaveOrOpenBlob) {
           let blob = new Blob([response.data], {
@@ -561,15 +561,17 @@ export default {
         },
         data: array,
       }).then((res) => {
-        this.infolist = res.data.body || [];
+        // this.infolist = res.data.body || [];
+        this.infolist = res.data.body;
+        console.log(res.data.body.orderName);
         let user = window.sessionStorage.getItem('userInfo')
           let userName = JSON.parse(user).loginNo
           console.log(userName)
 
           for(let i=res.data.body.mkFileShareAttachList.length-1;i>=0;i--){
               console.log(res.data.body.createId)
-              console.log(res.data.body.mkFileShareAttachList[i].opName)
-              if(res.data.body.createId === res.data.body.mkFileShareAttachList[i].opName || res.data.body.mkFileShareAttachList[i].opName === userName){
+              console.log(res.data.body.mkFileShareAttachList[i].opNo)
+              if(res.data.body.createId === res.data.body.mkFileShareAttachList[i].opNo || res.data.body.mkFileShareAttachList[i].opNo === userName){
               }else{
                   res.data.body.mkFileShareAttachList.splice(i,1);
               }
@@ -817,7 +819,7 @@ export default {
       const form = new FormData();
       form.append("file", file);
       await this.$http({
-        url: "/market/CMKFile/upload",
+        url: "/market/CMKFile/uploadByMinio",
         method: "post",
         headers: {
           "Content-Type": "application/json",
@@ -843,7 +845,7 @@ export default {
       const form = new FormData();
       form.append("file", file);
       await this.$http({
-        url: "/market/CMKFile/upload",
+        url: "/market/CMKFile/uploadByMinio",
         method: "post",
         headers: {
           "Content-Type": "application/json",

+ 5 - 5
src/pages/main/collect/launch.vue

@@ -451,7 +451,7 @@ export default {
     //单文件下载方法
     async download(fileData) {
       await this.$http({
-        url: "/market/cmkFileShare/downFile",
+        url: "/market/waf/downFileByMinio",
         method: "post",
         headers: {
           "Content-Type": "application/json",
@@ -487,13 +487,13 @@ export default {
         });
       });
       await this.$http({
-        url: "/market/cmkFileShare/downAllFile",
+        url: "/market/waf/downAllFileByMinio",
         method: "post",
         headers: {
           "Content-Type": "application/json",
         },
         responseType: "blob",
-        data: { mkFileShareAttachList: arr },
+        data: { wfFileShareAttachList: arr },
       }).then((response) => {
         if (window.navigator && window.navigator.msSaveOrOpenBlob) {
           let blob = new Blob([response.data], {
@@ -635,7 +635,7 @@ export default {
       const form = new FormData();
       form.append("file", file);
       await this.$http({
-        url: "/market/CMKFile/upload",
+        url: "/market/CMKFile/uploadByMinio",
         method: "post",
         headers: {
           "Content-Type": "application/json",
@@ -643,7 +643,7 @@ export default {
         data: form,
       }).then((res) => {
         if (this.infolist.mkFileShareAttachList) {
-          this.infolist.mkFileShareAttachList = [];
+          // this.infolist.mkFileShareAttachList = [];
           this.infolist.mkFileShareAttachList.push(res.data.body);
         } else {
           let mkFileShareAttachList = [];

+ 3 - 3
src/pages/main/file/flieList.vue

@@ -484,7 +484,7 @@ export default {
         type: "bt1n",
         typename: "上传文件",
         limit: 5,
-        url: "/market/cmkFileShare/upload",
+        url: "/market/waf/uploadByMinio",
         fileList: [],
       },
       titname: "新增",
@@ -537,7 +537,7 @@ export default {
       // });
       this.idList.forEach((item) => {
         this.$http({
-          url: "/market/cmkFileShare/downFile",
+          url: "/market/waf/downFileByMinio",
           method: "post",
           headers: {
             "Content-Type": "application/json",
@@ -581,7 +581,7 @@ export default {
     // 附件下载
     downLoad(fileData) {
       this.$http({
-        url: "/market/cmkFileShare/downFile",
+        url: "/market/waf/downFileByMinio",
         method: "post",
         headers: {
           "Content-Type": "application/json",

+ 1 - 1
src/pages/main/firewall/index.vue

@@ -12,7 +12,7 @@
         <el-dialog v-if="dialogStatus" :before-close="clickClose" :title="dialogTitle + '需求'" :visible.sync="dialogStatus"
             width="100%" :modal="false" style="display: flex; flex-direction: column">
             <!-- 后期维护 -->
-            <div style="position: fixed; z-index: 99">
+            <div style="">
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
                 <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
                 <el-button type="primary" v-if="closeStatus" @click="clickClose">关闭</el-button>

+ 1 - 1
src/pages/main/gridDivision/workersList.vue

@@ -747,7 +747,7 @@ export default {
     handleDownload({ fileCode, fileName }) {
       console.log(fileCode, fileName);
       this.$http({
-        url: "/bpm/api/download",
+        url: "/market/waf/downFileByMinio",
         method: "post",
         headers: {
           "Content-Type": "application/json",

+ 1 - 1
src/pages/main/opcode/index.vue

@@ -12,7 +12,7 @@
         <el-dialog v-if="dialogStatus" :before-close="clickClose" :title="dialogTitle + '需求'" :visible.sync="dialogStatus"
             width="100%" :modal="false" style="display: flex; flex-direction: column">
             <!-- 后期维护 -->
-            <div style="position: fixed; z-index: 99">
+            <div style="">
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
                 <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
                 <el-button type="primary" v-if="closeStatus" @click="clickClose">关闭</el-button>

+ 2 - 2
src/pages/main/pdbPartners/index.vue

@@ -261,14 +261,14 @@
                     },
                 ],
                 datalist: {
-                    url: '/market/compatt/downfile',
+                    url: "/market/waf/downFileByMinio",
                     type: 1
                 },
                 uploadstatus: false,
                 attList: [],
                 fileInfo: {
                     limit: 5,
-                    url: '/market/cmkAttachInfo/upload',
+                    url: '/market/cmkAttachInfo/uploadByMinio',
                     fileList: [],
                     uploadType:'newlyCoop'
                 },

+ 1 - 1
src/pages/main/userList/docAppr.vue

@@ -13,7 +13,7 @@
         <el-dialog :title="dialogTitle" :visible.sync="dialogStatus" width="100%" :before-close="handleClose" :modal="false"
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
-            <div style="position: fixed; z-index: 10000;top: 55px;">
+            <div style="">
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
                 <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
                 <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>  

+ 1 - 1
src/pages/main/userList/userList.vue

@@ -13,7 +13,7 @@
         <el-dialog :title="dialogTitle" :visible.sync="dialogStatus" width="100%" :before-close="handleClose" :modal="false"
             v-if="dialogStatus" :destroy-on-close="true">
             <!-- 后期维护 -->
-            <div style="position: fixed; z-index: 10000;top: 55px;">
+            <div style="">
                 <el-button type="primary" v-if="saveStatus" @click="clickSave">保存</el-button>
                 <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
                 <el-button type="primary" v-if="closeStatus" @click="handleClose">关闭</el-button>