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

20250214代码提交备份

earthstar-new
Mr.Dong 2025-02-14 15:26:46 +08:00
parent 2731a1986a
commit 1173ed7228
9 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/config/config.js
View File

@ -23,5 +23,5 @@ const YICHULI_URL = "https://caplos.aircas.ac.cn/lxyweb/kjwebAdmin/#/Order/YJYOr
const DAISHENHE_URL = "https://caplos.aircas.ac.cn/lxyweb/kjwebAdmin/#/Order/DSHOrder";
const YISHENHE_URL = "https://caplos.aircas.ac.cn/lxyweb/kjwebAdmin/#/Order/YSHOrder";
// const DQYSERVER_URL = "https://caplos.aircas.ac.cn/dqweb";
const DQYSERVER_URL = "http://192.168.1.205:8089";
const DQYSERVER_URL = "http://192.168.1.243:8089";
const LXYSERVER_URL = "https://caplos.aircas.ac.cn/lxyweb";

5
src/components/orderSearch/index.vue
View File

@ -17,6 +17,7 @@
popper-class="date-style"
value-format=" yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss"
@change="getDate"
>
</el-date-picker>
</el-form-item>
@ -241,6 +242,10 @@ export default {
};
},
methods: {
getDate(){
this.searchForm.submitDate = this.searchForm.submitDate.join(',');
console.log(this.searchForm.submitDate,'this.searchForm.submitDate');
},
// 根据卫星选择载荷
bindLoad(val) {
const item = this.loadOptions.filter(

3
src/components/ration/qualitative/index.vue
View File

@ -141,6 +141,7 @@
// getSamplesByLayer,
// } from "@/api/pendingOrder";
import {
getCoverTypes,
getSamplesList,
getSampleData,
getSamplesByLayer,
@ -258,7 +259,7 @@ export default {
}
this.funcOpt = this.configration.funcOpt;
// this.getCoverType();
this.getCoverType();
this.getSqlData();
this.initParam();
},

5
src/config/config.js
View File

@ -14,7 +14,8 @@ const prefix = "D:/deveEnvironment/nginx-1.18.0/html/microwaveData/sampleExcel";
//旧版本地址
// const newPrefix = "D:/deveEnvironment/nginx-1.18.0/html/microwaveData/sampleExcelNew";
//新版本地址
const newPrefix = "D:/WorkTools/apache-tomcat-9.0.93/webapps/microwaveData/sampleExcel";
// const newPrefix = "D:/WorkTools/apache-tomcat-9.0.93/webapps/microwaveData/sampleExcel";
const newPrefix = "D:/WorkTools/JDK8/apache-tomcat-8/webapps/microwaveData/sampleExcel";
const url = {
otgSamplesPath: `${newPrefix}/otgSamples.xlsx`, //正射1
@ -34,7 +35,7 @@ const serverUrl = DQYSERVER_URL;
const langServerUrl = LXYSERVER_URL;
const urlprefix = {
// pdfUrlPrefix: `${serverUrl}/microwaveData/pdf/`,
pdfUrlPrefix: `http://192.168.1.205:8081/microwaveData/pdf/`,
pdfUrlPrefix: `http://192.168.1.243:8081/microwaveData/pdf/`,
samePoiImgsUrl: `${serverUrl}/microwaveData/samePoiImgs/`,
geoserverUrl: `${serverUrl}/geoserver/gwc/service/wmts`,
otgGeoServerUrl: `${serverUrl}/geoserver/gwc/service/wmts`,

2
src/lib/request-microwave.js
View File

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

5
src/views/Daichuli/Feedback/Inspection/index.vue
View File

@ -339,7 +339,9 @@ export default {
var smpVal = undefined;
var featureMapData = [];
const pdType = this.productSubType;
console.log(this.$refs.otgCorrectionPanel,'$refs.otgCorrectionPanel');
console.log(this.$refs.qualitativePanel,'$refs.qualitativePanel');
console.log(this.$refs.soilMositurePanel,'$refs.soilMositurePanel');
if (pdType === productSubTypeVal.ACS_ORTHOPHOTO) {
smpVal = this.$refs.otgCorrectionPanel;
} else if (
@ -353,6 +355,7 @@ export default {
}
this.sampleList = smpVal.multipleSelection;
// if (featureMapData !== [] || featureMapData.length !== 0)
// this.updateCoverType(featureMapData);
const orderId = this.orderId;

50
src/views/Daichuli/Feedback/index.vue
View File

@ -87,7 +87,7 @@
<div class="daichuli1" v-if="groudClassShow">
<div class="box1">
<span class="sp1"></span><span class="sp2">{{
orderMsg.productSubClassId == 39
orderMsg.productSubClassId == 6
? "地表覆盖类型表"
: "植被物候类型表"
}}</span>
@ -150,17 +150,8 @@
</template>
<script>
import cu from "@/lib/cesiumUtils";
// 廊信院接口
import {
getOrderMsg,
getPendingProductMsg,
updateOrderStage,
getSamplesList,
getUserInfo,
getFeatureMap,
} from "@/api/lang/pendingOrder";
// 环球星云内部接口
import { getOrderAndProduct, getOrderSamples, updateFeature, getProductMetaMsg, orderFeedback } from '@/api/pendingOrder';
import { getOrderAndProduct, getOrderSamples, updateFeature, getProductMetaMsg, orderFeedback, updateOrderStage } from '@/api/pendingOrder';
import { productSubTypeVal } from "@/lib/contract.js";
import qs from "qs";
import ProductInfo from "../../../components/productInfo/index";
@ -286,6 +277,8 @@ export default {
// localStorage.setItem("userId", self.userId);
// localStorage.setItem("userName", self.userName);
// }
self.userId = localStorage.getItem("userId");
self.userName = localStorage.getItem("userName");
const orderId = (self.orderId = this.$route.query.orderId);
const productId = (self.productId = this.$route.query.productId);
const orderCode = (self.orderCode = this.$route.query.orderCode);
@ -306,8 +299,11 @@ export default {
getProductMetaMsg(JSON.stringify({ dataPath: res.data.tifPath })).then((res) => {
if (res.code === 200) {
const pm = (self.productMsg = res.data);
console.log(pm,'pm');
const om = self.orderMsg;
console.log(om,'om');
// 订单基本信息
self.orderData = [];
self.orderData.push({
@ -348,9 +344,10 @@ export default {
cu.addlayer(geoWS, geoLN);
cu.flyToLayerRect(minLon, minLat, maxLon, maxLat);
const proSubId = om.productSubClassId;
console.log(proSubId,'proSubId');
// 加载地物关联信息
if (proSubId === 39) {
if (proSubId === 6) {
self.groudClassShow = true;
document.cookie = 'KJInspect-Token=' + self.token
updateFeature(self.userId, orderId, self.token).then(res => {
@ -366,7 +363,7 @@ export default {
}
})
} else if (proSubId === 47) {
} else if (proSubId === 12) {
self.groudClassShow = true;
self.groudClassData = JSON.parse(pm.microwaveDataJson).vegetationPhenology;
}
@ -386,8 +383,8 @@ export default {
},
inspection() {
let param = {
// userId: this.userId,
// userName: this.userName,
userId: this.userId,
userName: this.userName,
// token: this.token,
orderId: this.orderId,
orderCode: this.orderCode,
@ -457,19 +454,14 @@ export default {
});
this.imgLocalUrl = null;
this.dialogFormVisible = false;
window.location.href = DAICHULI_URL;
// updateOrderStage(
// qs.stringify(
// {
// orderId: this.orderId,
// orderStatus: 3,
// userId: this.userId,
// },
// { indices: false }
// )
// ).then(uoRes => {
// if (uoRes.code == 200 && uoRes.success)
// });
// window.location.href = DAICHULI_URL;
const up = new FormData();
up.append("orderId", this.orderMsg.id)
up.append("orderStatus", 3)
up.append("userId", this.userId)
updateOrderStage(up).then(res => {
if (res.code === 200) this.$router.push({ name: '待处理的检验订单' });
})
}
});
} else {
@ -509,7 +501,7 @@ export default {
},
// 下载产品数据
downLoadPro() {
const zipPath = this.productMsg.filePath;
const zipPath = this.orderMsg.filePath;
if (zipPath !== null || zipPath !== undefined) {
const pdfName = zipPath.substr(zipPath.lastIndexOf("/") + 1); //截取文件名称字符串
if ("download" in document.createElement("a")) {

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

@ -137,6 +137,7 @@ export default {
getOrderList() {
const searchVal = this.$refs.orderSearchPanel;
const sf = searchVal.searchForm;
// if(sf.submitDate !== '') sf.submitDate = sf.submitDate.join(',');
sf.page = this.pageForm.page;
sf.limit = this.pageForm.limit;
sf.status = [8];

8
vue.config.js
View File

@ -22,7 +22,7 @@ module.exports = {
open: false,
proxy: {
[process.env.VUE_APP_BASE_API]: {
target: "http://192.168.1.205:8086",
target: "http://192.168.1.243:8086",
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: ""
@ -30,14 +30,14 @@ module.exports = {
},
[process.env.VUE_APP_MICROWAVE_API]: {
// target: "http://124.16.188.131:18086/macApi",
target: "http://192.168.1.205:8086/macApi",
target: "http://192.168.1.243:8086/macApi",
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_MICROWAVE_API]: ""
}
},
[process.env.VUE_APP_REALITY_API]: {
target: "http://192.168.1.205:18092/microwave",
target: "http://192.168.1.243:18092/microwave",
// target: "https://124.16.188.131:28092/microwave",
// target: "http://192.168.1.227:18092/microwave",
changeOrigin: true,
@ -46,7 +46,7 @@ module.exports = {
}
},
[process.env.VUE_APP_FILE_API]: {
target: "http://192.168.1.205:18093/file",
target: "http://192.168.1.243:18093/file",
// target: "https://124.16.188.131:28093/file",
// target: "http://192.168.1.227:18093/file",
changeOrigin: true,