页面更新

ruoyi-ui/.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = ''
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

ruoyi-ui/src/components/FileUpload/index.vue

@@ -63,7 +63,7 @@ export default {
   },
   data() {
     return {
-      uploadFileUrl: process.env.VUE_APP_BASE_API + "/prod-api/common/upload", // 上传的图片服务器地址
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },

ruoyi-ui/src/components/ImageUpload/index.vue

@@ -43,7 +43,7 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      uploadImgUrl: process.env.VUE_APP_BASE_API + "/prod-api/common/upload", // 上传的图片服务器地址
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },

ruoyi-ui/src/components/ProjectDec/SignContract.vue

@@ -121,7 +121,7 @@
         </el-col>
         <el-col :span="4">
           <el-form-item label-width="82px" label="土地证:" class="elItem" prop="landPhoto">
-            <el-upload class="upload-demo" list-type="picture" :limit="1" :file-list="fileListTdz" :on-success="upl_fn" :action="defaultSettings.urls + '/prod-api/common/upload'">
+            <el-upload class="upload-demo" list-type="picture" :limit="1" :file-list="fileListTdz" :on-remove="resetPhoto" :on-success="upl_fn" :action="defaultSettings.urls + process + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
@@ -143,14 +143,14 @@
         </el-col>
         <el-col :span="4">
           <el-form-item label-width="119px" label="土地流转合同:" class="elItem" prop="circulationDoc">
-            <el-upload class="upload-demo" :file-list="fileListTdls" :limit="1" :on-success="upl_fn_lzht" :action="defaultSettings.urls + '/prod-api/common/upload'">
+            <el-upload class="upload-demo" list-type="picture" :on-remove="resetPhoto1" :file-list="fileListTdls" :limit="1" :on-success="upl_fn_lzht" :action="defaultSettings.urls+process+'/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
         </el-col>
         <el-col :span="4">
           <el-form-item label-width="94px" label="产权证:" class="elItem" prop="circulationPhoto">
-            <el-upload class="upload-demo" :limit="1" :file-list="fileListCqz" :on-success="upl_fn_cqz" :action="defaultSettings.urls + '/prod-api/common/upload'">
+            <el-upload class="upload-demo" list-type="picture" :on-remove="resetPhoto2" :limit="1" :file-list="fileListCqz" :on-success="upl_fn_cqz" :action="defaultSettings.urls + process + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
@@ -172,14 +172,14 @@
         </el-col>
         <el-col :span="3">
           <el-form-item label-width="94px" label="租赁合同:" class="elItem" prop="leasePlantDoc">
-            <el-upload class="upload-demo" :limit="1" :file-list="fileListZht" :on-success="upl_fn_zlht" :action="defaultSettings.urls + '/prod-api/common/upload'">
+            <el-upload class="upload-demo" list-type="picture" :on-remove="resetPhoto3" :limit="1" :file-list="fileListZht" :on-success="upl_fn_zlht" :action="defaultSettings.urls + process + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
         </el-col>
         <el-col :span="4">
           <el-form-item label-width="94px" label="产权证:" class="elItem" prop="leasePlantPhoto">
-            <el-upload class="upload-demo" :limit="1" :file-list="fileListZcq" :on-success="upl_fn_zlcqz" :action="defaultSettings.urls + '/prod-api/common/upload'">
+            <el-upload class="upload-demo" list-type="picture" :on-remove="resetPhoto4" :limit="1" :file-list="fileListZcq" :on-success="upl_fn_zlcqz" :action="defaultSettings.urls + process + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
@@ -264,7 +264,7 @@
       <el-row>
         <el-col :span="18">
           <el-form-item label-width="121px" label="合同文本:" class="elItem" prop="agreementUrl">
-            <el-upload class="upload-demo" ref="upload" :file-list="flieListHt" :action="defaultSettings.urls + '/prod-api/common/upload'" :on-preview="handlePreview"
+            <el-upload class="upload-demo" ref="upload" list-type="picture" :file-list="flieListHt" :action="defaultSettings.urls + process + '/common/upload'" :on-preview="handlePreview"
               :on-success="up_loat_htwb" :on-remove="handleRemove" :auto-upload="false">
               <el-button slot="trigger" size="small" type="primary">选择图片</el-button>
               <el-button style="margin-left: 10px" size="small" type="success" @click="submitUpload">开始上传</el-button>
@@ -308,7 +308,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label-width="173px" label="营业执照复印件:" class="elItem" prop="bussinessUrl">
-            <el-upload class="upload-demo" :limit="1" :file-list="flieListYzz" :on-success="upl_fn_zzfyj" :action="defaultSettings.urls + '/prod-api/common/upload'">
+            <el-upload class="upload-demo" :limit="1" :on-remove='resetPhoto5'  list-type="picture" :file-list="flieListYzz" :on-success="upl_fn_zzfyj" :action="defaultSettings.urls + process + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
@@ -384,7 +384,7 @@
       <el-row>
         <el-col :span="18">
           <el-form-item label-width="121px" label="备案表:" class="elItem" prop="recordUrl">
-            <el-upload class="upload-demo" ref="bAupload" :file-list="flieListBa" :action="defaultSettings.urls + '/prod-api/common/upload'" :on-preview="handlePreview"
+            <el-upload class="upload-demo" ref="bAupload" list-type="picture" :file-list="flieListBa" :action="defaultSettings.urls + process + '/common/upload'" :on-preview="handlePreview"
               :on-success="up_loat_bab" :on-remove="handleRemove_bab" :auto-upload="false">
               <el-button slot="trigger" size="small" type="primary">选择图片</el-button>
               <el-button style="margin-left: 10px" size="small" type="success" @click="submitUpload_bab">开始上传</el-button>
@@ -439,14 +439,14 @@
           <el-input v-model="sharData.idcard" placeholder="请输入身份证号码" />
         </el-form-item>
         <el-form-item label="身份证(正面)" prop="idcardFront">
-          <el-upload class="upload-demo" :file-list="idcardFrontFlie" :on-remove="upl_remove_sfzzm" :on-success="upl_fn_sfzzm"
-            :action="defaultSettings.urls + '/prod-api/common/upload'">
+          <el-upload class="upload-demo" :file-list="idcardFrontFlie" list-type="picture" :on-remove="upl_remove_sfzzm" :on-success="upl_fn_sfzzm"
+            :action="defaultSettings.urls + process + '/common/upload'">
             <el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
         </el-form-item>
         <el-form-item label="身份证(反面)" prop="idcardBack">
-          <el-upload class="upload-demo" :file-list="idcardBackFlie" :on-remove="upl_remove_sfzfm" :on-success="upl_fn_sfzfm"
-            :action="defaultSettings.urls + '/prod-api/common/upload'">
+          <el-upload class="upload-demo" :file-list="idcardBackFlie" list-type="picture" :on-remove="upl_remove_sfzfm" :on-success="upl_fn_sfzfm"
+            :action="defaultSettings.urls + process + '/common/upload'">
             <el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
         </el-form-item>
@@ -479,6 +479,7 @@
   export default {
     data() {
       return {
+        process: process.env.VUE_APP_BASE_API,
         fileListZcq: [],
         fileListZht: [],
         fileListCqz: [],
@@ -891,6 +892,24 @@
         this.idcardBackFlie = [];
         this.resetForm("forms");
       },
+      resetPhoto() {
+        this.form.landPhoto = ''
+      },
+      resetPhoto1() {
+        this.form.circulationDoc = ''
+      },
+      resetPhoto2() {
+        this.form.circulationPhoto = ''
+      },
+      resetPhoto3() {
+        this.form.leasePlantDoc = ''
+      },
+      resetPhoto4() {
+        this.form.leasePlantPhoto = ''
+      },
+      resetPhoto5() {
+        this.form.bussinessUrl = ''
+      },
       upl_fn(res, file) {
         this.form.landPhoto = res.url;
       },
@@ -1024,32 +1043,43 @@
               })
             }
             this.flieListBa = arrs
+            if(data.bussinessUrl){
+              this.flieListYzz = [{
+                name: data.bussinessUrl,
+                url: data.bussinessUrl,
+              }]
+            }
+            if(data.leasePlantPhoto){
+              this.fileListZcq = [{
+                name: data.leasePlantPhoto,
+                url: data.leasePlantPhoto,
+              }]
+            }
+            if(data.leasePlantDoc){
+              this.fileListZht = [{
+                name: data.leasePlantDoc,
+                url: data.leasePlantDoc,
+              }]
+            }
+            if(data.circulationPhoto){
+              this.fileListCqz = [{
+                name: data.circulationPhoto,
+                url: data.circulationPhoto,
+              }]
+            }
+            if(data.circulationDoc){
+              this.fileListTdls = [{
+                name: data.circulationDoc,
+                url: data.circulationDoc,
+              }]
+            }
+           if(data.landPhoto){
+             this.fileListTdz = [{
+               name: data.landPhoto,
+               url: data.landPhoto,
+             }]
+           }
 
-            this.flieListYzz = [{
-              name: data.bussinessUrl,
-              url: data.bussinessUrl,
-            }]
-            this.fileListZcq = [{
-              name: data.leasePlantPhoto,
-              url: data.leasePlantPhoto,
-            }]
-            this.fileListZht = [{
-              name: data.leasePlantDoc,
-              url: data.leasePlantDoc,
-            }]
-            this.fileListCqz = [{
-              name: data.circulationPhoto,
-              url: data.circulationPhoto,
-            }]
-            this.fileListTdls = [{
-              name: data.circulationDoc,
-              url: data.circulationDoc,
-            }]
-            this.fileListTdz = [{
-              name: data.landPhoto,
-              url: data.landPhoto,
-            }]
-            
             data.isOutInvestment = Boolean(data.isOutInvestment - 0)
             data.agreementUrl = data.agreementUrl.split(',')
             data.recordUrl = data.recordUrl.split(',')
@@ -1097,15 +1127,28 @@
           });
       },
       handleRemove(file, fileList) {
+        let urls = ""
+        if(file.response){
+          this.form.agreementUrl =  file.response.url
+        }else{
+          urls = file.url
+        }
         for (let i = this.form.agreementUrl.length - 1; i >= 0; i--) {
-          if (this.form.agreementUrl[i] == file.response.url) {
-            this.form.agreementUrl.splice(i, 1);
+          if (this.form.agreementUrl[i] == urls) {
+             this.form.agreementUrl.splice(i, 1);
           }
         }
+        console.log(this.form.agreementUrl)
       },
       handleRemove_bab(file, fileList) {
+        let urls = ""
+        if(file.response){
+          urls = file.response.url
+        }else{
+          urls = file.url
+        }
         for (let i = this.form.recordUrl.length - 1; i >= 0; i--) {
-          if (this.form.recordUrl[i] == file.response.url) {
+          if (this.form.recordUrl[i] == urls) {
             this.form.recordUrl.splice(i, 1);
           }
         }

ruoyi-ui/src/settings.js

@@ -2,6 +2,7 @@ module.exports = {
   title: '招商引资管理系统',
   urls: 'http://192.168.101.11:8010',
   // urls: 'http://47.99.82.249:80',
+  
 
 
   /**

ruoyi-ui/src/views/management/roduction/index.vue

@@ -84,7 +84,7 @@
                 <div class="forieu" style="width: 618px">
                   <div class="bure burert">
                     <el-upload
-                      :action="defaultSettings.urls+'/prod-api/common/upload'"
+                      :action="defaultSettings.urls+process+'/common/upload'"
                       list-type="picture-card"
                       :on-preview="handlePictureCardPreview"
                       :on-remove="handleRemove"
@@ -161,6 +161,7 @@ export default {
   name: "production",
   data() {
     return {
+      process: process.env.VUE_APP_BASE_API,
       defaultSettings,
       //父级项目id
       bmProjectId: -1,

ruoyi-ui/src/views/system/notice/index.vue

@@ -178,7 +178,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item  label="缩略图" class="elItem" prop="je">
-              <el-upload class="upload-demo" ref="upload" :action="defaultSettings.urls+'/prod-api/common/upload'"
+              <el-upload class="upload-demo" ref="upload" :action="defaultSettings.urls+process+'/common/upload'"
                 :on-preview="handlePreview" :on-remove="handleRemove" :on-success="handleSucc" :file-list="fileList" :auto-upload="false" :multiple="true">
                 <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
                 <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
@@ -214,6 +214,7 @@ export default {
   },
   data() {
     return {
+      process: process.env.VUE_APP_BASE_API,
       defaultSettings,
       // 遮罩层
       loading: true,

ruoyi-ui/src/views/under/index.vue

@@ -531,7 +531,7 @@
           <div class="forieu" style="width: 618px">
             <div class="bure burert">
               <el-upload
-                :action="defaultSettings.urls+'/prod-api/common/upload'"
+                :action="defaultSettings.urls+process+'/common/upload'"
                 :auto-upload="false"
                 ref="upload"
                 :before-upload="beforeAvatarUpload"
@@ -710,6 +710,7 @@ export default {
   },
   data() {
     return {
+      process: process.env.VUE_APP_BASE_API,
       defaultSettings,
       // 遮罩层
       loading: true,