diff --git a/config/index.js b/config/index.js index a44a9c93..a6a51a11 100644 --- a/config/index.js +++ b/config/index.js @@ -12,9 +12,9 @@ module.exports = { proxyTable: { "/api": { // 请求的目标主机 - //target: 'http://116.255.223.226:8081/nsgk_test/', + // target: 'http://116.255.223.226:8082/nsgk_test/', // 公网测试环境 + // target: `http://192.168.0.116:8091/nsgk_api/`, // 内网测试环境 target: 'http://localhost:8080/', - //target: 'http://192.168.0.107:8080/', changeOrigin: true, pathRewrite: { '^/api': '' diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js index 08bafaac..35f3a26a 100644 --- a/src/api/sunVillage_info/fixedAssets.js +++ b/src/api/sunVillage_info/fixedAssets.js @@ -94,6 +94,15 @@ export function otherEdit(data) { }) } +// 复制公开信息 +export function otherCopy(data) { + return request({ + url: '/subcontract/other/copy', + method: 'post', + data: data + }); +} + // 查询合同信息列表 export function contractionList(query) { return request({ diff --git a/src/assets/images/sunVillage_info/index_block_22.png b/src/assets/images/sunVillage_info/index_block_22.png new file mode 100644 index 00000000..78ddc09c Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_22.png differ diff --git a/src/assets/images/sunVillage_info/index_code_btn_13.png b/src/assets/images/sunVillage_info/index_code_btn_13.png new file mode 100644 index 00000000..dcf6a8b4 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_code_btn_13.png differ diff --git a/src/assets/images/sunVillage_info/list_icon_copy.png b/src/assets/images/sunVillage_info/list_icon_copy.png new file mode 100644 index 00000000..df4cdfb8 Binary files /dev/null and b/src/assets/images/sunVillage_info/list_icon_copy.png differ diff --git a/src/permission.js b/src/permission.js index 6586238e..93c675f5 100644 --- a/src/permission.js +++ b/src/permission.js @@ -211,37 +211,37 @@ router.beforeEach((to, from, next) => { // }) next() }).catch(err => { - store.dispatch('LogOut').then(() => { - try { - let loginUrl = Cookies.get("_Login_url"); - if (loginUrl && loginUrl.indexOf("onlineHomeLogin") !== -1) { - next({ path: '/onlineHomeLogin' }) - return; - } - } catch (e) { console.log(e); } - // Message.error(err) - if ('/authenticRight'.indexOf(to.path) !== -1) { - next({ path: '/authenticRight/login' }) - } else if ('/homestead'.indexOf(to.path) !== -1) { - next({ path: '/homestead/login' }) - } else if (to.path.indexOf('/onlineHome') !== -1) { - //next(`/onlineHomeLogin`) - next(`/zjdLogin`) - } else if (to.path.indexOf('/yinnong') !== -1) { - next(`/yinnongLogin`) - } else if (window.location.href.indexOf('/sunVillage_info/') != -1) { - window.location.href = '/sunVillage_info/login'; - } else if (to.path.indexOf('/homesteadSurvey') !== -1) { - next(`/homesteadLogin`) - } else if (to.path.indexOf('/lawEnforcement') !== -1) { - next(`/lawEnforcement/login`) - } else if (to.path.indexOf('/sunVillage') !== -1) { - next(`/sunVillage/login`) - } else { - next(`/yinnongLogin`) - //next({ path: '/' }) - } - }) + // store.dispatch('LogOut').then(() => { + // try { + // let loginUrl = Cookies.get("_Login_url"); + // if (loginUrl && loginUrl.indexOf("onlineHomeLogin") !== -1) { + // next({ path: '/onlineHomeLogin' }) + // return; + // } + // } catch (e) { console.log(e); } + // // Message.error(err) + // if ('/authenticRight'.indexOf(to.path) !== -1) { + // next({ path: '/authenticRight/login' }) + // } else if ('/homestead'.indexOf(to.path) !== -1) { + // next({ path: '/homestead/login' }) + // } else if (to.path.indexOf('/onlineHome') !== -1) { + // //next(`/onlineHomeLogin`) + // next(`/zjdLogin`) + // } else if (to.path.indexOf('/yinnong') !== -1) { + // next(`/yinnongLogin`) + // } else if (window.location.href.indexOf('/sunVillage_info/') != -1) { + // window.location.href = '/sunVillage_info/login'; + // } else if (to.path.indexOf('/homesteadSurvey') !== -1) { + // next(`/homesteadLogin`) + // } else if (to.path.indexOf('/lawEnforcement') !== -1) { + // next(`/lawEnforcement/login`) + // } else if (to.path.indexOf('/sunVillage') !== -1) { + // next(`/sunVillage/login`) + // } else { + // next(`/yinnongLogin`) + // //next({ path: '/' }) + // } + // }) }) } else { next() diff --git a/src/utils/request.js b/src/utils/request.js index a4b60e5f..8118346e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -14,145 +14,154 @@ const service = axios.create({ // 超时 timeout: 100000 }) -// request拦截器 -service.interceptors.request.use(config => { - // Toast.loading({ - // message: '加载中...', - // forbidClick: true, - // duration: 0 - // }); - // 是否需要设置 token - const isToken = (config.headers || {}).isToken === false - if (getToken() && !isToken) { - config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - } - // get请求映射params参数 - if (config.method === 'get' && config.params) { - let url = config.url + '?'; - for (const propName of Object.keys(config.params)) { - const value = config.params[propName]; - var part = encodeURIComponent(propName) + "="; - if (value !== null && typeof (value) !== "undefined") { - if (typeof value === 'object') { - for (const key of Object.keys(value)) { - let params = propName + '[' + key + ']'; - var subPart = encodeURIComponent(params) + "="; - url += subPart + encodeURIComponent(value[key]) + "&"; +let requestInterceptor; +if(requestInterceptor === undefined){ + // request拦截器 + requestInterceptor = service.interceptors.request.use(config => { + // Toast.loading({ + // message: '加载中...', + // forbidClick: true, + // duration: 0 + // }); + // 是否需要设置 token + const isToken = (config.headers || {}).isToken === false + if (getToken() && !isToken) { + config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 + } + // get请求映射params参数 + if (config.method === 'get' && config.params) { + let url = config.url + '?'; + for (const propName of Object.keys(config.params)) { + const value = config.params[propName]; + var part = encodeURIComponent(propName) + "="; + if (value !== null && typeof (value) !== "undefined") { + if (typeof value === 'object') { + for (const key of Object.keys(value)) { + let params = propName + '[' + key + ']'; + var subPart = encodeURIComponent(params) + "="; + url += subPart + encodeURIComponent(value[key]) + "&"; + } + } else { + url += part + encodeURIComponent(value) + "&"; } - } else { - url += part + encodeURIComponent(value) + "&"; } } + url = url.slice(0, -1); + config.params = {}; + config.url = url; } - url = url.slice(0, -1); - config.params = {}; - config.url = url; - } - return config -}, error => { - console.log(error) - Promise.reject(error) -}) + return config + }, error => { + console.log(error) + Promise.reject(error) + }) +} + // 响应拦截器 -service.interceptors.response.use(res => { - Toast.clear(); - // 未设置状态码则默认成功状态 - const code = res.data.code || 200; - // 获取错误信息 - const msg = errorCode[code] || res.data.msg || errorCode['default'] +let responseInterceptor; +let gqnum = 0; +if(responseInterceptor === undefined){ + responseInterceptor = service.interceptors.response.use(res => { + Toast.clear(); + // 未设置状态码则默认成功状态 + const code = res.data.code || 200; + // 获取错误信息 + const msg = errorCode[code] || res.data.msg || errorCode['default'] + console.info(gqnum); + if (code === 401 && gqnum === 0) { + gqnum++; + Dialog.confirm({ + title: '系统提示', + message: '登录状态已过期,请重新登录', + confirmButtonText: '重新登录', + cancelButtonText: '取消' + }) + .then(() => { + store.dispatch('LogOut').then(() => { + try { + let loginUrl = Cookies.get("_Login_url"); + if(loginUrl && loginUrl.indexOf("onlineHomeLogin") !== -1) { + window.location.href = loginUrl; + return; + } + } catch (e) { console.log(e); } + + if (window.location.href.indexOf('/lawEnforcement') != -1) { + // 农业执法 + window.location.href = '/lawEnforcement/login'; + return; + }else if (window.location.href.indexOf('/authenticRight') != -1) { + // 确权回头看 + window.location.href = '/authenticRight/login'; + return; + }else if (window.location.href.indexOf('/homesteadSurvey') != -1) { + // 宅基地调查 + window.location.href = '/homesteadLogin'; + return; + }else if (window.location.href.indexOf('/yinnong') != -1) { + // 事项审批 + window.location.href = '/yinnongLogin'; + return; + }else if (window.location.href.indexOf('/sunVillage_info/') != -1) { + // 阳光村务 + window.location.href = '/sunVillage_info/login'; + return; + }else if (window.location.href.indexOf('/homestead/') != -1) { + // 两清三化 + window.location.href = '/homestead/login'; + return; + }else if (window.location.href.indexOf('/agriculturalTrusteeship') != -1){ + // 生产托管 + window.location.href = '/agriculturalTrusteeship/login'; + return; + } else if (window.location.href.indexOf('/contracted') != -1){ + // 土地确权 + window.location.href = '/contracted/login'; + return; + }else{ + // 产权交易 + window.location.href = '/login'; + } - if (code === 401) { - Dialog.confirm({ - title: '系统提示', - message: '登录状态已过期,请重新登录', - confirmButtonText: '重新登录', - cancelButtonText: '取消' + }) + }) + } else if (code === 500) { + Dialog.alert({ type: 'warning', message: msg }); + return Promise.reject(new Error(msg)) + } else if (code !== 200 && code !== 401) { + Dialog.alert({ type: 'warning', message: msg }); + return Promise.reject('error') + } else { + return res.data + } + }, + error => { + console.log('err' + error) + let { message } = error; + if (message == "Network Error") { + message = "后端接口连接异常"; + } + else if (message.includes("timeout")) { + message = "系统接口请求超时"; + } + else if (message.includes("Request failed with status code")) { + message = "系统接口" + message.substr(message.length - 3) + "异常"; + } + Toast.clear(); + // Message({ + // message: message, + // type: 'error', + // duration: 5 * 1000 + // }) + Dialog.alert({ type: 'warning', message: message }); + return Promise.reject(error) }) - .then(() => { - store.dispatch('LogOut').then(() => { - try { - let loginUrl = Cookies.get("_Login_url"); - if(loginUrl && loginUrl.indexOf("onlineHomeLogin") !== -1) { - window.location.href = loginUrl; - return; - } - } catch (e) { console.log(e); } - // 农业执法 - if (window.location.href.indexOf('/lawEnforcement') != -1) { - window.location.href = '/lawEnforcement/login'; - return; - } - // 确权回头看 - if (window.location.href.indexOf('/authenticRight') != -1) { - window.location.href = '/authenticRight/login'; - return; - } - // 宅基地调查 - if (window.location.href.indexOf('/homesteadSurvey') != -1) { - window.location.href = '/homesteadLogin'; - return; - } - // 事项审批 - if (window.location.href.indexOf('/yinnong') != -1) { - window.location.href = '/yinnongLogin'; - return; - } - // 阳光村务 - if (window.location.href.indexOf('/sunVillage_info/') != -1) { - window.location.href = '/sunVillage_info/login'; - return; - } - // 两清三化 - if (window.location.href.indexOf('/homestead/') != -1) { - window.location.href = '/homestead/login'; - return; - } - // 生产托管 - if (window.location.href.indexOf('/agriculturalTrusteeship') != -1){ - window.location.href = '/agriculturalTrusteeship/login'; - return; - } - // 土地确权 - if (window.location.href.indexOf('/contracted') != -1){ - window.location.href = '/contracted/login'; - return; - } - // 产权交易 - window.location.href = '/login'; - }) - }) - } else if (code === 500) { - Dialog.alert({ type: 'warning', message: msg }); - return Promise.reject(new Error(msg)) - } else if (code !== 200) { - Dialog.alert({ type: 'warning', message: msg }); - return Promise.reject('error') - } else { - return res.data - } -}, - error => { - console.log('err' + error) - let { message } = error; - if (message == "Network Error") { - message = "后端接口连接异常"; - } - else if (message.includes("timeout")) { - message = "系统接口请求超时"; - } - else if (message.includes("Request failed with status code")) { - message = "系统接口" + message.substr(message.length - 3) + "异常"; - } - Toast.clear(); - // Message({ - // message: message, - // type: 'error', - // duration: 5 * 1000 - // }) - Dialog.alert({ type: 'warning', message: message }); - return Promise.reject(error) - } -) +} + +// // 取消请求拦截器 +// instance.interceptors.request.eject(requestInterceptor); +// // 取消响应拦截器 +// instance.interceptors.response.eject(responseInterceptor); export default service diff --git a/src/views/sunVillage_info/list_contract.vue b/src/views/sunVillage_info/list_contract.vue index 7ed41deb..cad78de0 100644 --- a/src/views/sunVillage_info/list_contract.vue +++ b/src/views/sunVillage_info/list_contract.vue @@ -4,7 +4,7 @@ class="header_main" :style="`background-image:url(${require(showBtn?'@/assets/images/sunVillage_info/list_head.png':'@/assets/images/sunVillage_info/list_head_red.png')})`" > - {{queryParams.otherType=='1'?'合同':queryParams.otherType=='2'?'党务':queryParams.otherType=='3'?'政务':''}}公开 + {{queryParams.otherType=='1'?'合同':queryParams.otherType=='2'?'党务':queryParams.otherType=='3'?'政务':queryParams.otherType=='4'?'产交':''}}公开
@@ -41,7 +41,10 @@