KJ135
/
microwave-project-unite
mirror of http://172.16.0.12:5000/WBJY/microwave-project-unite.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

同步联调修改

tykong-cidian
duxiaoning 2023-08-01 16:18:31 +08:00
parent 4c382e6279
commit 21c5cece0b
7 changed files with 81 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/config/config.js
View File

@ -1,3 +1,14 @@
const DAICHULI_URL = "http://10.0.3.157:18030/kjwebAdmin/#/Order/DJYOrder"; const LXYLOGIN_URL = "http://124.16.188.131:18030/kjwebAdmin-test/#/login";
const YUNGUAN_SERVER_URL = "http://10.0.3.157:18030/yunguan-app"; // 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 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";

9
src/api/lang/pendingOrder.js
View File

@ -163,7 +163,7 @@ export function checkReality(data) {
} }
// 导出pdf模板 // 导出pdf模板
export function exportWord(data, pdfName, localTiffPath, httpTiffPath, productType) { export function exportWord(data, pdfName, localTiffPath, httpTiffPath, productType,polarizationMethod) {
return fileRequest({ return fileRequest({
url: url:
"importPDF/importWordAndPDF?reportName=" + "importPDF/importWordAndPDF?reportName=" +
@ -173,7 +173,9 @@ export function exportWord(data, pdfName, localTiffPath, httpTiffPath, productTy
"&httpTiffPath=" + "&httpTiffPath=" +
httpTiffPath + httpTiffPath +
"&productType=" + "&productType=" +
productType, productType +
"&polarizationMethod=" +
polarizationMethod,
method: "post", method: "post",
// headers:{'Content-Type':'multipart/form-data'}, // headers:{'Content-Type':'multipart/form-data'},
data data
@ -198,7 +200,8 @@ export async function getUserInfo(token) {
return request({ return request({
url: "/app/logincheck?token=" + token, url: "/app/logincheck?token=" + token,
method: "get", 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"
}); });
} }
/** /**

4
src/components/ration/soilMoisture/index.vue
View File

@ -79,11 +79,11 @@
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column :label="smLabel" show-overflow-tooltip> <!-- <el-table-column :label="smLabel" show-overflow-tooltip>
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.paramStr | getSampleVal scope.row.paramStr | getSampleVal
}}</template> }}</template>
</el-table-column> </el-table-column> -->
<el-table-column <el-table-column
prop="collectDate" prop="collectDate"
label="采样时间" label="采样时间"

1
src/lib/request.js
View File

@ -4,6 +4,7 @@ import { Message } from "element-ui";
// create an axios instance // create an axios instance
const service = axios.create({ const service = axios.create({
baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
// baseURL: 'http://124.16.188.131:18030/', // url = base url + request url
timeout: 5000000 // request timeout timeout: 5000000 // request timeout
}); });

67
src/views/About.vue
View File

@ -2,36 +2,36 @@
<div class="layout"> <div class="layout">
<el-container> <el-container>
<!-- 侧边栏 --> <!-- 侧边栏 -->
<div style="max-width: 300px; height: 100%; background-color: #061278"> <div style="max-width: 300px; height: 100%; background-color: #354595">
<el-menu <el-menu
:default-active="activeMenu" :default-active="activeMenu"
class="el-menu-vertical-demo" class="el-menu-vertical-demo"
background-color="#061278" background-color="#354595"
text-color="#fff" text-color="#fff"
active-text-color="#ffd04b" active-text-color="#ffd04b"
:router="true"
:collapse="isCollapse" :collapse="isCollapse"
@select="selectMenus"
> >
<el-menu-item index="/daichuli" v-show="userType === '2'"> <el-menu-item index="/daichuli">
<i class="el-icon-s-order"></i> <!-- <i class="el-icon-s-order"></i> -->
<span slot="title">待处理的检验订单</span> <span slot="title">待处理的检验订单</span>
</el-menu-item> </el-menu-item>
<el-menu-item index="/yichuli" v-show="userType === '2'"> <el-menu-item index="/yichuli">
<i class="el-icon-s-claim"></i> <!-- <i class="el-icon-s-claim"></i> -->
<span slot="title">已处理的检验订单</span> <span slot="title">已处理的检验订单</span>
</el-menu-item> </el-menu-item>
<el-menu-item index="/daishenhe" v-show="userType === '3'"> <el-menu-item index="/daishenhe">
<i class="el-icon-s-open"></i> <!-- <i class="el-icon-s-open"></i> -->
<span slot="title">待审核的检验订单</span> <span slot="title">待审核的检验订单</span>
</el-menu-item> </el-menu-item>
<el-menu-item index="/yishenhe" v-show="userType === '3'"> <el-menu-item index="/yishenhe">
<i class="el-icon-s-check"></i> <!-- <i class="el-icon-s-check"></i> -->
<span slot="title">已审核的检验订单</span> <span slot="title">已审核的检验订单</span>
</el-menu-item> </el-menu-item>
<el-menu-item index="/" class="toHome"> <!-- <el-menu-item index="/" class="toHome">
<i class="el-icon-s-home"></i> <i class="el-icon-s-home"></i>
<span slot="title">返回首页</span> <span slot="title">返回首页</span>
</el-menu-item> </el-menu-item> -->
</el-menu> </el-menu>
</div> </div>
<el-container> <el-container>
@ -66,6 +66,16 @@
{{ item.name }} {{ item.name }}
</el-breadcrumb-item> </el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
<!-- <el-dropdown trigger="click" style="float: right">
<span class="el-dropdown-link">
{{ userName }}<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="selectMenus('/')"
>退出登录</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown> -->
</div> </div>
<!-- 主页 --> <!-- 主页 -->
<el-main> <el-main>
@ -105,11 +115,37 @@ export default {
this.userType = localStorage.userType; this.userType = localStorage.userType;
this.activeMenu = this.$route.path; this.activeMenu = this.$route.path;
}, },
computed: {
userName: function () {
return localStorage.getItem("userName");
},
},
methods: { methods: {
btnClick() { btnClick() {
this.btn1Show = !this.btn1Show; this.btn1Show = !this.btn1Show;
this.btn2Show = !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() { getBreadcrumb() {
let that = this; let that = this;
@ -167,8 +203,8 @@ export default {
} }
.lline { .lline {
padding-left: 20px; padding: 15px 20px 0px 20px;
padding-top: 15px; // padding-top: 15px;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
// background-color: gainsboro; // background-color: gainsboro;
@ -250,6 +286,7 @@ export default {
.el-header { .el-header {
background-color: white; background-color: white;
color: #333; color: #333;
display: none;
} }
.el-aside { .el-aside {
background-color: #354595; background-color: #354595;

4
src/views/Daichuli/index.vue
View File

@ -159,8 +159,8 @@ export default {
} }
}, },
changePage(orderMsg) { changePage(orderMsg) {
// 正射：150424 土水：150208 地表覆盖：150166 // 正射：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=150208&token=WEB*1675826560592@VBSA_ZZX-yg000087_903ced0b26f74d5abcbbb70a4458de72"); this.$router.push("/orderUnprocessed?orderId=152279&token=WEB*1690781129417@S6Q8_ZZX-yg000087_cffde98b3fab4349a6e488abd7ee9b0f");
}, },
}, },
}; };

8
vue.config.js
View File

@ -21,21 +21,21 @@ module.exports = {
open: false, open: false,
proxy: { proxy: {
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: "http://10.0.3.157:18030", target: "http://124.16.188.131:18030",
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "" ["^" + process.env.VUE_APP_BASE_API]: ""
} }
}, },
[process.env.VUE_APP_MICROWAVE_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, changeOrigin: true,
pathRewrite: { pathRewrite: {
["^" + process.env.VUE_APP_MICROWAVE_API]: "" ["^" + process.env.VUE_APP_MICROWAVE_API]: ""
} }
}, },
[process.env.VUE_APP_REALITY_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", // target: "http://211.157.180.211:18092/microwave",
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
@ -43,7 +43,7 @@ module.exports = {
} }
}, },
[process.env.VUE_APP_FILE_API]: { [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", // target: "http://211.157.180.211:18093/file",
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {