sr 4 lat temu
rodzic
commit
32e90cfec9

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

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

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

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

+ 10 - 10
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" :limit="1" :file-list="fileListTdz" :on-success="upl_fn" :action="defaultSettings.urls + '/common/upload'">
+            <el-upload class="upload-demo" :limit="1" :file-list="fileListTdz" :on-success="upl_fn" :action="defaultSettings.urls + '/prod-api/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 + '/common/upload'">
+            <el-upload class="upload-demo" :file-list="fileListTdls" :limit="1" :on-success="upl_fn_lzht" :action="defaultSettings.urls + '/prod-api/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 + '/common/upload'">
+            <el-upload class="upload-demo" :limit="1" :file-list="fileListCqz" :on-success="upl_fn_cqz" :action="defaultSettings.urls + '/prod-api/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 + '/common/upload'">
+            <el-upload class="upload-demo" :limit="1" :file-list="fileListZht" :on-success="upl_fn_zlht" :action="defaultSettings.urls + '/prod-api/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 + '/common/upload'">
+            <el-upload class="upload-demo" :limit="1" :file-list="fileListZcq" :on-success="upl_fn_zlcqz" :action="defaultSettings.urls + '/prod-api/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 + '/common/upload'" :on-preview="handlePreview"
+            <el-upload class="upload-demo" ref="upload" :file-list="flieListHt" :action="defaultSettings.urls + '/prod-api/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 + '/common/upload'">
+            <el-upload class="upload-demo" :limit="1" :file-list="flieListYzz" :on-success="upl_fn_zzfyj" :action="defaultSettings.urls + '/prod-api/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 + '/common/upload'" :on-preview="handlePreview"
+            <el-upload class="upload-demo" ref="bAupload" :file-list="flieListBa" :action="defaultSettings.urls + '/prod-api/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>
@@ -440,13 +440,13 @@
         </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 + '/common/upload'">
+            :action="defaultSettings.urls + '/prod-api/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 + '/common/upload'">
+            :action="defaultSettings.urls + '/prod-api/common/upload'">
             <el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
         </el-form-item>

+ 2 - 2
ruoyi-ui/src/settings.js

@@ -1,8 +1,8 @@
 module.exports = {
   title: '招商引资管理系统',
-  // urls: 'http://192.168.101.11:8080',
+  // urls: 'http://192.168.101.11:8010',
   urls: 'http://47.99.82.249:80',
-  
+
 
   /**
    * 侧边栏主题 深色主题theme-dark,浅色主题theme-light

+ 3 - 3
ruoyi-ui/src/views/management/info/index.vue

@@ -65,8 +65,8 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
             @click="chei(scope.row)">查看详情</el-button>
-            <el-button size="mini" type="text" style="background: #3FBCEF;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']" v-if="scope.row.projectStatus%2==0"
-              @click="getPass(scope.row)">通过</el-button>
+            <el-button size="mini" type="text" style="background: #00B034;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']" v-if="scope.row.projectStatus%2==0"
+              @click="getPass(scope.row)">审核</el-button>
           <el-button size="mini" type="text" style="background: #3FBCEF;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
             @click="infoBtn(scope.row)">{{scope.row.projectStatus%2==1?'提交':'驳回'}}</el-button>
           <!-- <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']">修改</el-button> -->
@@ -486,7 +486,7 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const ids = row.id || this.ids;
-        this.$confirm('是否确认删除项目-线索信息"' + ids + '"的数据项?', "警告", {
+        this.$confirm('是否确认删除项目-线索信息"' + (row.name||this.ids) + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 7 - 7
ruoyi-ui/src/views/management/nstruction/index.vue

@@ -97,7 +97,7 @@
               <div class="forieu" style="width: 618px">
                 <div class="bure burert">
                   <el-upload
-                    :action="defaultSettings.urls+'/common/upload'"
+                    :action="defaultSettings.urls+'/prod-api/common/upload'"
                     :auto-upload="false"
                     ref="uploadone"
                     :before-upload="beforeAvatarUpload"
@@ -170,7 +170,7 @@
               <div class="forieu" style="width: 618px">
                 <div class="bure burert">
                   <el-upload
-                    :action="defaultSettings.urls+'/common/upload'"
+                    :action="defaultSettings.urls+'/prod-api/common/upload'"
                     :auto-upload="false"
                     ref="uploadtwo"
                     :before-upload="beforeAvatarUpload"
@@ -211,7 +211,7 @@
               <div class="forieu" style="width: 618px">
                 <div class="bure burert">
                   <el-upload
-                    :action="defaultSettings.urls+'/common/upload'"
+                    :action="defaultSettings.urls+'/prod-api/common/upload'"
                     :auto-upload="false"
                     ref="upload"
                     :before-upload="beforeAvatarUpload"
@@ -420,7 +420,7 @@
             <div class="forieu" style="width: 618px">
               <div class="bure burert">
                 <el-upload
-                  :action="defaultSettings.urls+'/common/upload'"
+                  :action="defaultSettings.urls+'/prod-api/common/upload'"
                   :auto-upload="false"
                   ref="upload"
                   :before-upload="beforeAvatarUpload"
@@ -486,7 +486,7 @@
           <el-upload
             class="upload-demo"
             ref="upload"
-            :action="defaultSettings.urls+'/common/upload'"
+            :action="defaultSettings.urls+'/prod-api/common/upload'"
             :on-preview="handlePreviewther"
             :on-remove="handleRemovether"
             :on-success="handleSuccther"
@@ -552,7 +552,7 @@
           <el-upload
             class="upload-demo"
             ref="upload"
-            :action="defaultSettings.urls+'/common/upload'"
+            :action="defaultSettings.urls+'/prod-api/common/upload'"
             :on-preview="handlePreviewther"
             :on-remove="handleRemovether"
             :on-success="handleSuccther"
@@ -625,7 +625,7 @@
           <el-upload
             class="upload-demo"
             ref="upload"
-            :action="defaultSettings.urls+'/common/upload'"
+            :action="defaultSettings.urls+'/prod-api/common/upload'"
             :on-preview="handlePreviewther"
             :on-remove="handleRemovether"
             :on-success="handleSuccther"

+ 1 - 1
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+'/common/upload'"
+                      :action="defaultSettings.urls+'/prod-api/common/upload'"
                       list-type="picture-card"
                       :on-preview="handlePictureCardPreview"
                       :on-remove="handleRemove"

+ 1 - 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+'/common/upload'"
+              <el-upload class="upload-demo" ref="upload" :action="defaultSettings.urls+'/prod-api/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>

+ 1 - 1
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+'/common/upload'"
+                :action="defaultSettings.urls+'/prod-api/common/upload'"
                 :auto-upload="false"
                 ref="upload"
                 :before-upload="beforeAvatarUpload"