From 21c5cece0b747a56fa82214d4e092bfd83e6e691 Mon Sep 17 00:00:00 2001 From: duxiaoning <17621883433@163.com> Date: Tue, 1 Aug 2023 16:18:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=81=94=E8=B0=83=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config/config.js | 17 ++++- src/api/lang/pendingOrder.js | 9 ++- src/components/ration/soilMoisture/index.vue | 4 +- src/lib/request.js | 1 + src/views/About.vue | 67 +++++++++++++++----- src/views/Daichuli/index.vue | 4 +- vue.config.js | 8 +-- 7 files changed, 81 insertions(+), 29 deletions(-) diff --git a/public/config/config.js b/public/config/config.js index 007a16c..07fb473 100644 --- a/public/config/config.js +++ b/public/config/config.js @@ -1,3 +1,14 @@ -const DAICHULI_URL = "http://10.0.3.157:18030/kjwebAdmin/#/Order/DJYOrder"; -const YUNGUAN_SERVER_URL = "http://10.0.3.157:18030/yunguan-app"; -// const JCTOKEN = "WEB%2a1673425993482%40L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19"; \ No newline at end of file +const LXYLOGIN_URL = "http://124.16.188.131:18030/kjwebAdmin-test/#/login"; +// const DAICHULI_URL = "http://124.16.188.131:18030/kjwebAdmin-test/#/Order/DJYOrder"; +const YUNGUAN_SERVER_URL = "http://124.16.188.131:18030/yunguan-app"; +// const JCTOKEN = "WEB%2a1673425993482%40L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19"; +// const LXYLOGIN_URL = "http://10.0.3.157:18030/kjwebAdmin-test/#/login"; +// const DAICHULI_URL = "http://10.0.3.157:18030/kjwebAdmin-test/#/Order/DJYOrder"; +// const YICHULI_URL = "http://10.0.3.157:18030/kjwebAdmin-test/#/Order/YJYOrder"; +// const DAISHENHE_URL = "http://10.0.3.157:18030/kjwebAdmin-test/#/Order/DSHOrder"; +// const YISHENHE_URL = "http://10.0.3.157:18030/kjwebAdmin-test/#/Order/YSHOrder"; +// const YUNGUAN_SERVER_URL = "http://10.0.3.157:18030/yunguan-app"; +const DAICHULI_URL = "http://124.16.188.131:9599/lxyweb/kjwebAdmin/#/Order/DJYOrder"; +const YICHULI_URL = "http://124.16.188.131:9599/lxyweb/kjwebAdmin/#/Order/YJYOrder"; +const DAISHENHE_URL = "http://124.16.188.131:9599/lxyweb/kjwebAdmin/#/Order/DSHOrder"; +const YISHENHE_URL = "http://124.16.188.131:9599/lxyweb/kjwebAdmin/#/Order/YSHOrder"; \ No newline at end of file diff --git a/src/api/lang/pendingOrder.js b/src/api/lang/pendingOrder.js index 2c2df96..bbeafd9 100644 --- a/src/api/lang/pendingOrder.js +++ b/src/api/lang/pendingOrder.js @@ -163,7 +163,7 @@ export function checkReality(data) { } // 导出pdf模板 -export function exportWord(data, pdfName, localTiffPath, httpTiffPath, productType) { +export function exportWord(data, pdfName, localTiffPath, httpTiffPath, productType,polarizationMethod) { return fileRequest({ url: "importPDF/importWordAndPDF?reportName=" + @@ -173,7 +173,9 @@ export function exportWord(data, pdfName, localTiffPath, httpTiffPath, productTy "&httpTiffPath=" + httpTiffPath + "&productType=" + - productType, + productType + + "&polarizationMethod=" + + polarizationMethod, method: "post", // headers:{'Content-Type':'multipart/form-data'}, data @@ -198,7 +200,8 @@ export async function getUserInfo(token) { return request({ url: "/app/logincheck?token=" + token, method: "get", - baseURL: "http://10.0.3.157:18030/yunguan-app" + // baseURL: "http://124.16.188.131:18030/yunguan-app" + baseURL: process.env.VUE_APP_BASE_API+"/yunguan-app" }); } /** diff --git a/src/components/ration/soilMoisture/index.vue b/src/components/ration/soilMoisture/index.vue index a719c24..2394a45 100644 --- a/src/components/ration/soilMoisture/index.vue +++ b/src/components/ration/soilMoisture/index.vue @@ -79,11 +79,11 @@ show-overflow-tooltip > - + -
+
- - + + 待处理的检验订单 - - + + 已处理的检验订单 - - + + 待审核的检验订单 - - + + 已审核的检验订单 - +
@@ -66,6 +66,16 @@ {{ item.name }} +
@@ -105,11 +115,37 @@ export default { this.userType = localStorage.userType; this.activeMenu = this.$route.path; }, + computed: { + userName: function () { + return localStorage.getItem("userName"); + }, + }, methods: { btnClick() { this.btn1Show = !this.btn1Show; this.btn2Show = !this.btn1Show; }, + selectMenus(key) { + let routeHerf = null; + switch (key) { + case "/": + routeHerf = `${LXYLOGIN_URL}`; + break; + case "/daichuli": + routeHerf = `${DAICHULI_URL}`; + break; + case "/yichuli": + routeHerf = `${YICHULI_URL}`; + break; + case "/daishenhe": + routeHerf = `${DAISHENHE_URL}`; + break; + case "/yishenhe": + routeHerf = `${YISHENHE_URL}`; + break; + } + window.location.href = routeHerf; + }, // 面包屑数据处理 getBreadcrumb() { let that = this; @@ -167,8 +203,8 @@ export default { } .lline { - padding-left: 20px; - padding-top: 15px; + padding: 15px 20px 0px 20px; + // padding-top: 15px; height: 30px; line-height: 30px; // background-color: gainsboro; @@ -250,6 +286,7 @@ export default { .el-header { background-color: white; color: #333; + display: none; } .el-aside { background-color: #354595; diff --git a/src/views/Daichuli/index.vue b/src/views/Daichuli/index.vue index 7071687..90f3092 100644 --- a/src/views/Daichuli/index.vue +++ b/src/views/Daichuli/index.vue @@ -159,8 +159,8 @@ export default { } }, changePage(orderMsg) { - // 正射：150424 土水：150208 地表覆盖：150166 - this.$router.push("/orderUnprocessed?orderId=150208&token=WEB*1675826560592@VBSA_ZZX-yg000087_903ced0b26f74d5abcbbb70a4458de72"); + // 正射：150424 土水：150208 PL_DF_DF_20220905175209_8648 地表覆盖：150166 PL_DF_DF_20220905112508_4567 叶面积：150533 PL_DF_DF_20230221173349_4569 后向散射系数：152279 + this.$router.push("/orderUnprocessed?orderId=152279&token=WEB*1690781129417@S6Q8_ZZX-yg000087_cffde98b3fab4349a6e488abd7ee9b0f"); }, }, }; diff --git a/vue.config.js b/vue.config.js index ad8b050..20c1e3a 100644 --- a/vue.config.js +++ b/vue.config.js @@ -21,21 +21,21 @@ module.exports = { open: false, proxy: { [process.env.VUE_APP_BASE_API]: { - target: "http://10.0.3.157:18030", + target: "http://124.16.188.131:18030", changeOrigin: true, pathRewrite: { ["^" + process.env.VUE_APP_BASE_API]: "" } }, [process.env.VUE_APP_MICROWAVE_API]: { - target: "http://10.0.36.121:8086/macApi", + target: "http://124.16.188.131:18086/macApi", changeOrigin: true, pathRewrite: { ["^" + process.env.VUE_APP_MICROWAVE_API]: "" } }, [process.env.VUE_APP_REALITY_API]: { - target: "http://10.0.36.121:18092/microwave", + target: "http://124.16.188.131:18092/microwave", // target: "http://211.157.180.211:18092/microwave", changeOrigin: true, pathRewrite: { @@ -43,7 +43,7 @@ module.exports = { } }, [process.env.VUE_APP_FILE_API]: { - target: "http://10.0.36.121:18093/file", + target: "http://124.16.188.131:18093/file", // target: "http://211.157.180.211:18093/file", changeOrigin: true, pathRewrite: {