项目优化 图片等信息回显

.env.production

@@ -5,4 +5,4 @@ VUE_APP_TITLE = 市场部投标信息检索工具
 ENV = 'production'
 
 # 市场部投标信息检索工具/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/search-tool-api'

src/components/UploadImg/index.vue

@@ -136,12 +136,12 @@ export default {
                 this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join('、')}格式的文件!`)
                 return false
             }
-            const isLt = file.size / 1024 / 1024 < this.fileSize
+            // const isLt = file.size / 1024 / 1024 < this.fileSize
-            if (!isLt) {
+            // if (!isLt) {
-                this.$modal.msgError(`图片大小不能超过 ${this.fileSize} MB`)
+            //     this.$modal.msgError(`图片大小不能超过 ${this.fileSize} MB`)
 
-                return false
+            //     return false
-            }
+            // }
             this.$modal.loading('图片正在上传，请稍候...')
         },
 

src/layout/components/Navbar.vue

@@ -1,6 +1,11 @@
 <template>
     <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+        <hamburger
+            id="hamburger-container"
+            :is-active="sidebar.opened"
+            class="hamburger-container"
+            @toggleClick="toggleSideBar"
+        />
 
         <breadcrumb v-if="!topNav" id="breadcrumb-container" class="breadcrumb-container" />
         <top-nav v-if="topNav" id="topmenu-container" class="topmenu-container" />
@@ -22,12 +27,11 @@
                 <el-tooltip content="布局大小" effect="dark" placement="bottom">
                     <size-select id="size-select" class="right-menu-item hover-effect" />
                 </el-tooltip>
-
             </template>
 
             <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
                 <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
+                    <img :src="avatar" class="user-avatar" />
                     <i class="el-icon-caret-bottom" />
                 </div>
                 <el-dropdown-menu slot="dropdown">
@@ -66,14 +70,10 @@ export default {
         SizeSelect,
         Search,
         RuoYiGit,
-    RuoYiDoc
+        RuoYiDoc,
     },
     computed: {
-    ...mapGetters([
+        ...mapGetters(['sidebar', 'avatar', 'device']),
-      'sidebar',
-      'avatar',
-      'device'
-    ]),
         setting: {
             get() {
                 return this.$store.state.settings.showSettings
@@ -81,15 +81,15 @@ export default {
             set(val) {
                 this.$store.dispatch('settings/changeSetting', {
                     key: 'showSettings',
-          value: val
+                    value: val,
                 })
-      }
+            },
         },
         topNav: {
             get() {
                 return this.$store.state.settings.topNav
-      }
+            },
-    }
+        },
     },
     methods: {
         toggleSideBar() {
@@ -99,14 +99,16 @@ export default {
             this.$confirm('确定注销并退出系统吗？', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
-        type: 'warning'
+                type: 'warning',
-      }).then(() => {
-        this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index'
             })
-      }).catch(() => {})
+                .then(() => {
-    }
+                    this.$store.dispatch('LogOut').then(() => {
-  }
+                        location.href = process.env.NODE_ENV === 'production' ? '/search-tool/index' : '/index'
+                    })
+                })
+                .catch(() => {})
+        },
+    },
 }
 </script>
 
@@ -116,18 +118,18 @@ export default {
     overflow: hidden;
     position: relative;
     background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+    box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
 
     .hamburger-container {
         line-height: 46px;
         height: 100%;
         float: left;
         cursor: pointer;
-    transition: background .3s;
+        transition: background 0.3s;
         -webkit-tap-highlight-color: transparent;
 
         &:hover {
-      background: rgba(0, 0, 0, .025)
+            background: rgba(0, 0, 0, 0.025);
         }
     }
 
@@ -164,10 +166,10 @@ export default {
 
             &.hover-effect {
                 cursor: pointer;
-        transition: background .3s;
+                transition: background 0.3s;
 
                 &:hover {
-          background: rgba(0, 0, 0, .025)
+                    background: rgba(0, 0, 0, 0.025);
                 }
             }
         }

src/router/index.js

@@ -37,29 +37,29 @@ export const constantRoutes = [
         children: [
             {
                 path: '/redirect/:path(.*)',
-        component: () => import('@/views/redirect')
+                component: () => import('@/views/redirect'),
-      }
+            },
-    ]
+        ],
     },
     {
         path: '/login',
         component: () => import('@/views/login'),
-    hidden: true
+        hidden: true,
     },
     {
         path: '/register',
         component: () => import('@/views/register'),
-    hidden: true
+        hidden: true,
     },
     {
         path: '/404',
         component: () => import('@/views/error/404'),
-    hidden: true
+        hidden: true,
     },
     {
         path: '/401',
         component: () => import('@/views/error/401'),
-    hidden: true
+        hidden: true,
     },
     {
         path: '',
@@ -70,9 +70,9 @@ export const constantRoutes = [
                 path: 'index',
                 component: () => import('@/views/index'),
                 name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
+                meta: { title: '首页', icon: 'dashboard', affix: true },
-      }
+            },
-    ]
+        ],
     },
     {
         path: '/user',
@@ -84,10 +84,10 @@ export const constantRoutes = [
                 path: 'profile',
                 component: () => import('@/views/system/user/profile/index'),
                 name: 'Profile',
-        meta: { title: '个人中心', icon: 'user' }
+                meta: { title: '个人中心', icon: 'user' },
-      }
+            },
-    ]
+        ],
-  }
+    },
 ]
 
 // 动态路由，基于用户权限动态去加载
@@ -102,9 +102,9 @@ export const dynamicRoutes = [
                 path: 'role/:userId(\\d+)',
                 component: () => import('@/views/system/user/authRole'),
                 name: 'AuthRole',
-        meta: { title: '分配角色', activeMenu: '/system/user' }
+                meta: { title: '分配角色', activeMenu: '/system/user' },
-      }
+            },
-    ]
+        ],
     },
     {
         path: '/system/role-auth',
@@ -116,9 +116,9 @@ export const dynamicRoutes = [
                 path: 'user/:roleId(\\d+)',
                 component: () => import('@/views/system/role/authUser'),
                 name: 'AuthUser',
-        meta: { title: '分配用户', activeMenu: '/system/role' }
+                meta: { title: '分配用户', activeMenu: '/system/role' },
-      }
+            },
-    ]
+        ],
     },
     {
         path: '/system/dict-data',
@@ -130,9 +130,9 @@ export const dynamicRoutes = [
                 path: 'index/:dictId(\\d+)',
                 component: () => import('@/views/system/dict/data'),
                 name: 'Data',
-        meta: { title: '字典数据', activeMenu: '/system/dict' }
+                meta: { title: '字典数据', activeMenu: '/system/dict' },
-      }
+            },
-    ]
+        ],
     },
     {
         path: '/monitor/job-log',
@@ -144,9 +144,9 @@ export const dynamicRoutes = [
                 path: 'index/:jobId(\\d+)',
                 component: () => import('@/views/monitor/job/log'),
                 name: 'JobLog',
-        meta: { title: '调度日志', activeMenu: '/monitor/job' }
+                meta: { title: '调度日志', activeMenu: '/monitor/job' },
-      }
+            },
-    ]
+        ],
     },
     {
         path: '/tool/gen-edit',
@@ -158,26 +158,27 @@ export const dynamicRoutes = [
                 path: 'index/:tableId(\\d+)',
                 component: () => import('@/views/tool/gen/editTable'),
                 name: 'GenEdit',
-        meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
+                meta: { title: '修改生成配置', activeMenu: '/tool/gen' },
-      }
+            },
-    ]
+        ],
-  }
+    },
 ]
 
 // 防止连续点击多次路由报错
-let routerPush = Router.prototype.push;
+let routerPush = Router.prototype.push
-let routerReplace = Router.prototype.replace;
+let routerReplace = Router.prototype.replace
 // push
 Router.prototype.push = function push(location) {
-  return routerPush.call(this, location).catch(err => err)
+    return routerPush.call(this, location).catch((err) => err)
 }
 // replace
 Router.prototype.replace = function push(location) {
-  return routerReplace.call(this, location).catch(err => err)
+    return routerReplace.call(this, location).catch((err) => err)
 }
 
 export default new Router({
     mode: 'history', // 去掉url中的#
     scrollBehavior: () => ({ y: 0 }),
-  routes: constantRoutes
+    routes: constantRoutes,
+    base: process.env.NODE_ENV === 'production' ? '/search-tool' : '', //根据运行环境设置
 })

src/utils/request.js

@@ -96,7 +96,7 @@ service.interceptors.response.use(
                     .then(() => {
                         isRelogin.show = false
                         store.dispatch('LogOut').then(() => {
-                            location.href = '/index'
+                            location.href = process.env.NODE_ENV === 'production' ? '/search-tool/index' : '/index'
                         })
                     })
                     .catch(() => {

src/views/company-manage/key-person/components/addAndEditForm.vue

@@ -224,6 +224,7 @@
 
 <script>
 import UploadImg from '@/components/UploadImg'
+import { getToken } from '@/utils/auth'
 import { addKeyPersonAPI, editKeyPersonAPI } from '@/api/company-manage/key-person'
 import { deleteImgAPI } from '@/api/common'
 export default {
@@ -245,6 +246,7 @@ export default {
     data() {
         return {
             uploadFileUrl: process.env.VUE_APP_BASE_API + '/system/file/uploadFiles',
+            fileViewUrl: process.env.VUE_APP_BASE_API + '/files',
             deleteFileList: [],
             uploadOuterVisible: false,
             addAndEditForm: {
@@ -550,7 +552,7 @@ export default {
                         .map((e) => {
                             return {
                                 ...e,
-                                url: e.filePath,
+                                url: this.fileViewUrl + e.filePath.split('oadPath')[1] + '?file_token=' + getToken(),
                             }
                         })
                     this.addAndEditForm.idCardBack = this.addAndEditForm.tbFileSourceVoList
@@ -558,7 +560,7 @@ export default {
                         .map((e) => {
                             return {
                                 ...e,
-                                url: e.filePath,
+                                url: this.fileViewUrl + e.filePath.split('oadPath')[1] + '?file_token=' + getToken(),
                             }
                         })
                     this.addAndEditForm.diplomaImg = this.addAndEditForm.tbFileSourceVoList
@@ -566,7 +568,7 @@ export default {
                         .map((e) => {
                             return {
                                 ...e,
-                                url: e.filePath,
+                                url: this.fileViewUrl + e.filePath.split('oadPath')[1] + '?file_token=' + getToken(),
                             }
                         })
                     this.addAndEditForm.otherImg = this.addAndEditForm.tbFileSourceVoList
@@ -574,7 +576,7 @@ export default {
                         .map((e) => {
                             return {
                                 ...e,
-                                url: e.filePath,
+                                url: this.fileViewUrl + e.filePath.split('oadPath')[1] + '?file_token=' + getToken(),
                             }
                         })
                 }

src/views/company-manage/other-person/components/addAndEditForm.vue

@@ -205,6 +205,7 @@
 
 <script>
 import UploadImg from '@/components/UploadImg'
+import { getToken } from '@/utils/auth'
 import { addOtherPersonAPI, editOtherPersonAPI } from '@/api/company-manage/other-person'
 import { deleteImgAPI } from '@/api/common'
 export default {
@@ -227,6 +228,7 @@ export default {
     data() {
         return {
             uploadFileUrl: process.env.VUE_APP_BASE_API + '/system/file/uploadFiles',
+            fileViewUrl: process.env.VUE_APP_BASE_API + '/files',
             uploadOuterVisible: false,
             addAndEditForm: {
                 userName: '', // 姓名
@@ -512,7 +514,7 @@ export default {
                         .map((e) => {
                             return {
                                 ...e,
-                                url: e.filePath,
+                                url: this.fileViewUrl + e.filePath.split('oadPath')[1] + '?file_token=' + getToken(),
                             }
                         })
                     this.addAndEditForm.idCardBack = this.addAndEditForm.tbFileSourceVoList
@@ -520,7 +522,7 @@ export default {
                         .map((e) => {
                             return {
                                 ...e,
-                                url: e.filePath,
+                                url: this.fileViewUrl + e.filePath.split('oadPath')[1] + '?file_token=' + getToken(),
                             }
                         })
                     this.addAndEditForm.diplomaImg = this.addAndEditForm.tbFileSourceVoList
@@ -528,7 +530,7 @@ export default {
                         .map((e) => {
                             return {
                                 ...e,
-                                url: e.filePath,
+                                url: this.fileViewUrl + e.filePath.split('oadPath')[1] + '?file_token=' + getToken(),
                             }
                         })
                     this.addAndEditForm.otherImg = this.addAndEditForm.tbFileSourceVoList
@@ -536,7 +538,7 @@ export default {
                         .map((e) => {
                             return {
                                 ...e,
-                                url: e.filePath,
+                                url: this.fileViewUrl + e.filePath.split('oadPath')[1] + '?file_token=' + getToken(),
                             }
                         })
                 }

src/views/company-manage/performance-manage/components/addAndEditForm.vue

@@ -179,7 +179,15 @@
                                         margin-bottom: 4px;
                                     "
                                 >
-                                    <span>材料{{ index + 1 }}</span>
+                                    <!-- <span>材料{{ index + 1 }}</span> -->
+
+                                    <el-image
+                                        :src="item.url"
+                                        :preview-src-list="[item.url]"
+                                        style="width: 48px; height: 48px; margin-right: 4px"
+                                    >
+                                    </el-image>
+
                                     <el-button
                                         type="text"
                                         size="mini"
@@ -279,6 +287,7 @@
 <script>
 import moment from 'moment'
 import UploadImg from '@/components/UploadImg'
+import { getToken } from '@/utils/auth'
 import { getKeyPersonListAPI } from '@/api/common'
 import { addCompanyPerformanceAPI, editCompanyPerformanceAPI } from '@/api/company-manage/performance-manage'
 export default {
@@ -314,6 +323,8 @@ export default {
         return {
             uploadOuterVisible: false,
             uploadFileUrl: process.env.VUE_APP_BASE_API + '/system/file/uploadFiles',
+            fileViewUrl: process.env.VUE_APP_BASE_API + '/files',
+            token: getToken(),
             deleteFileList: [],
             addAndEditForm: {
                 proName: '', // 工程名称
@@ -522,6 +533,7 @@ export default {
                         filePath,
                         fileName,
                         fileType: 1,
+                        url: this.fileViewUrl + filePath.split('oadPath')[1] + '?file_token=' + getToken(),
                     })
                 } else {
                     this.addTableList[this.keyTbCurrentIndex].tbFileSourceVoList.push({
@@ -529,9 +541,15 @@ export default {
                         filePath: item.filePath,
                         fileName: item.fileName,
                         fileType: 1,
+                        url: this.fileViewUrl + item.filePath.split('oadPath')[1] + '?file_token=' + getToken(),
                     })
                 }
             })
+
+            console.log(
+                'this.addTableList[this.keyTbCurrentIndex].tbFileSourceVoList',
+                this.addTableList[this.keyTbCurrentIndex].tbFileSourceVoList,
+            )
             this.uploadOuterVisible = false
         },
         onHandleDeleteFile(index, fileIndex) {
@@ -543,7 +561,7 @@ export default {
             this.proveFileList = this.addTableList[index].tbFileSourceVoList.map((e) => {
                 return {
                     ...e,
-                    url: e.filePath,
+                    url: this.fileViewUrl + e.filePath.split('oadPath')[1] + '?file_token=' + getToken(),
                 }
             })
             this.uploadOuterVisible = true
@@ -559,10 +577,19 @@ export default {
                     this.addTableList = []
                     this.addTableList = newValueObj.tbCompanyPerfRelList
 
+                    this.addTableList.forEach((e) => {
+                        e.tbFileSourceVoList = e.tbFileSourceVoList.map((item) => {
+                            return {
+                                ...item,
+                                url: this.fileViewUrl + item.filePath.split('oadPath')[1] + '?file_token=' + getToken(),
+                            }
+                        })
+                    })
+
                     this.addAndEditForm.htKeyFileList = newVal.tbFileSourceVoList.map((e) => {
                         return {
                             ...e,
-                            url: e.filePath,
+                            url: this.fileViewUrl + e.filePath.split('oadPath')[1] + '?file_token=' + getToken(),
                         }
                     })
                 }

src/views/sub-manage/sub-manage/components/addAndEditForm.vue

@@ -89,6 +89,7 @@
 
 <script>
 import UploadImg from '@/components/UploadImg'
+import { getToken } from '@/utils/auth'
 import { addSubManageAPI, editSubManageAPI } from '@/api/sub-manage/sub-manage'
 import { deleteImgAPI } from '@/api/common'
 export default {
@@ -111,6 +112,7 @@ export default {
         return {
             uploadOuterVisible: false,
             uploadFileUrl: process.env.VUE_APP_BASE_API + '/system/file/uploadFiles',
+            fileViewUrl: process.env.VUE_APP_BASE_API + '/files',
             addAndEditForm: {
                 subName: '',
                 address: '',
@@ -236,7 +238,7 @@ export default {
                         .map((e) => {
                             return {
                                 ...e,
-                                url: e.filePath,
+                                url: this.fileViewUrl + e.filePath.split('oadPath')[1] + '?file_token=' + getToken(),
                             }
                         })
                 }

src/views/sub-manage/sub-performance-manage/components/addAndEditForm.vue

@@ -190,6 +190,7 @@
 
 <script>
 import UploadImg from '@/components/UploadImg'
+import { getToken } from '@/utils/auth'
 import { getSubListAPI, getSubKeyPersonListAPI, deleteImgAPI } from '@/api/common'
 import { addSubPerformanceManageAPI, editSubPerformanceManageAPI } from '@/api/sub-manage/sub-performance-manage'
 export default {
@@ -212,6 +213,7 @@ export default {
         return {
             uploadOuterVisible: false,
             uploadFileUrl: process.env.VUE_APP_BASE_API + '/system/file/uploadFiles',
+            fileViewUrl: process.env.VUE_APP_BASE_API + '/files',
             addAndEditForm: {
                 subId: '', // 所属分包商
                 proName: '', // 项目名称
@@ -465,7 +467,7 @@ export default {
                     this.addAndEditForm.imgList = newVal.tbFileSourceVoList.map((e) => {
                         return {
                             ...e,
-                            url: e.filePath,
+                            url: this.fileViewUrl + e.filePath.split('oadPath')[1] + '?file_token=' + getToken(),
                         }
                     })
                 }

src/views/sub-manage/sub-person-manage/components/addAndEditForm.vue

@@ -52,6 +52,7 @@
                             <el-form-item prop="idCardFront">
                                 <UploadImg
                                     :limit="4"
+                                    :multiple="true"
                                     :file-size="10"
                                     @deleteFile="deleteFile"
                                     :upload-file-url="uploadFileUrl"
@@ -64,6 +65,7 @@
                             <el-form-item prop="idCardBack">
                                 <UploadImg
                                     :limit="4"
+                                    :multiple="true"
                                     :file-size="10"
                                     @deleteFile="deleteFile"
                                     :upload-file-url="uploadFileUrl"
@@ -126,6 +128,7 @@
                         </template>
                         <UploadImg
                             :limit="5"
+                            :multiple="true"
                             :file-size="10"
                             @deleteFile="deleteFile"
                             :upload-file-url="uploadFileUrl"
@@ -145,6 +148,7 @@
                         </template>
                         <UploadImg
                             :limit="5"
+                            :multiple="true"
                             :file-size="10"
                             @deleteFile="deleteFile"
                             :upload-file-url="uploadFileUrl"
@@ -165,6 +169,7 @@
 
 <script>
 import UploadImg from '@/components/UploadImg'
+import { getToken } from '@/utils/auth'
 import { getSubListAPI, deleteImgAPI } from '@/api/common'
 import { addSubPersonManageAPI, editSubPersonManageAPI } from '@/api/sub-manage/sub-person-manage'
 export default {
@@ -186,6 +191,7 @@ export default {
     data() {
         return {
             uploadFileUrl: process.env.VUE_APP_BASE_API + '/system/file/uploadFiles',
+            fileViewUrl: process.env.VUE_APP_BASE_API + '/files',
             deleteFileList: [],
             uploadOuterVisible: false,
             addAndEditForm: {
@@ -460,7 +466,7 @@ export default {
                         .map((e) => {
                             return {
                                 ...e,
-                                url: e.filePath,
+                                url: this.fileViewUrl + e.filePath.split('oadPath')[1] + '?file_token=' + getToken(),
                             }
                         })
                     this.addAndEditForm.idCardBack = this.addAndEditForm.tbFileSourceVoList
@@ -468,7 +474,7 @@ export default {
                         .map((e) => {
                             return {
                                 ...e,
-                                url: e.filePath,
+                                url: this.fileViewUrl + e.filePath.split('oadPath')[1] + '?file_token=' + getToken(),
                             }
                         })
                     this.addAndEditForm.diplomaImg = this.addAndEditForm.tbFileSourceVoList
@@ -476,7 +482,7 @@ export default {
                         .map((e) => {
                             return {
                                 ...e,
-                                url: e.filePath,
+                                url: this.fileViewUrl + e.filePath.split('oadPath')[1] + '?file_token=' + getToken(),
                             }
                         })
                     this.addAndEditForm.otherImg = this.addAndEditForm.tbFileSourceVoList
@@ -484,7 +490,7 @@ export default {
                         .map((e) => {
                             return {
                                 ...e,
-                                url: e.filePath,
+                                url: this.fileViewUrl + e.filePath.split('oadPath')[1] + '?file_token=' + getToken(),
                             }
                         })
                 }