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

集成修改一版

main
duxiaoning 2023-01-11 09:15:17 +08:00
parent ea0c788d90
commit 36db61c27d
26 changed files with 855 additions and 943 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env.development
View File

@ -3,7 +3,6 @@ ENV = 'development'
# base api # base api
VUE_APP_BASE_API = '/dev-api' VUE_APP_BASE_API = '/dev-api'
VUE_APP_MICROWAVE_API = '/dev-microwave-api'
VUE_APP_REALITY_API = '/dev-reality-api' VUE_APP_REALITY_API = '/dev-reality-api'
VUE_APP_FILE_API = '/dev-file-api' VUE_APP_FILE_API = '/dev-file-api'

1
.env.production
View File

@ -3,5 +3,6 @@ ENV = 'production'
# base api # base api
VUE_APP_BASE_API = '/prod-api' VUE_APP_BASE_API = '/prod-api'
VUE_APP_MICROWAVE_API = '/prod-microwave-api'
VUE_APP_REALITY_API = '/prod-reality-api' VUE_APP_REALITY_API = '/prod-reality-api'
VUE_APP_FILE_API = '/prod-file-api' VUE_APP_FILE_API = '/prod-file-api'

2
.env.staging
View File

@ -5,7 +5,7 @@ ENV = 'staging'
# base api # base api
VUE_APP_BASE_API = '/stage-api' VUE_APP_BASE_API = '/stage-api'
VUE_APP_MICROWAVE_API = '/stage-microwave-api'
VUE_APP_REALITY_API = '/stage-reality-api' VUE_APP_REALITY_API = '/stage-reality-api'
VUE_APP_FILE_API = '/stage-file-api' VUE_APP_FILE_API = '/stage-file-api'

6
src/api/audit.js
View File

@ -1,8 +1,8 @@
import request from '@/lib/request' import microwaveRequest from "@/lib/request-microwave";
// 提交审核信息 // 提交审核信息
export function orderExamine(data){ export function orderExamine(data){
return request({ return microwaveRequest({
url:'orderExamine/orderExamineMsg', url:'orderExamine/orderExamineMsg',
method:'post', method:'post',
data data
@ -10,7 +10,7 @@ export function orderExamine(data){
} }
//获取订单审核信息 //获取订单审核信息
export function getExamineMsg(orderId){ export function getExamineMsg(orderId){
return request({ return microwaveRequest({
url:'orderExamine/getExamineMsg?orderId='+orderId, url:'orderExamine/getExamineMsg?orderId='+orderId,
method:'get' method:'get'
}) })

8
src/api/common.js
View File

@ -1,7 +1,7 @@
import request from "@/lib/request"; import microwaveRequest from "@/lib/request-microwave";
// 获取待检验产品订单列表 // 获取待检验产品订单列表
export function getOrderListByStatus(data) { export function getOrderListByStatus(data) {
return request({ return microwaveRequest({
url: "orderStatus/getOrderListByStatus", url: "orderStatus/getOrderListByStatus",
method: "post", method: "post",
data data
@ -9,7 +9,7 @@ export function getOrderListByStatus(data) {
} }
// 获取待检验产品订单列表 // 获取待检验产品订单列表
export function getOrderListOfPending(data) { export function getOrderListOfPending(data) {
return request({ return microwaveRequest({
url: "orderStatus/getOrderListOfPending", url: "orderStatus/getOrderListOfPending",
method: "post", method: "post",
headers: { "Content-Type": "multipart/form-data" }, headers: { "Content-Type": "multipart/form-data" },
@ -18,7 +18,7 @@ export function getOrderListOfPending(data) {
} }
// 获取待检验产品产品值 // 获取待检验产品产品值
export function getProductValue(data) { export function getProductValue(data) {
return request({ return microwaveRequest({
url: "GetValue/GetProductValue", url: "GetValue/GetProductValue",
method: "post", method: "post",
headers: { "Content-Type": "multipart/form-data" }, headers: { "Content-Type": "multipart/form-data" },

10
src/api/creatOrder.js
View File

@ -1,7 +1,7 @@
import request from "@/lib/request"; import microwaveRequest from "@/lib/request-microwave";
// 添加产品并且进行数据发布 // 添加产品并且进行数据发布
export function addProduct(data) { export function addProduct(data) {
return request({ return microwaveRequest({
url: "/productUpload/uploadProduct", url: "/productUpload/uploadProduct",
method: "post", method: "post",
headers: { "Content-Type": "multipart/form-data" }, headers: { "Content-Type": "multipart/form-data" },
@ -10,7 +10,7 @@ export function addProduct(data) {
} }
// 添加订单 // 添加订单
export function getProductList(pscId, userId, page, limit) { export function getProductList(pscId, userId, page, limit) {
return request({ return microwaveRequest({
url: url:
"productUpload/getProductList?productSubclassId=" + "productUpload/getProductList?productSubclassId=" +
pscId + pscId +
@ -25,7 +25,7 @@ export function getProductList(pscId, userId, page, limit) {
} }
// 更新产品的等级与时间 // 更新产品的等级与时间
export function updateProduct(data) { export function updateProduct(data) {
return request({ return microwaveRequest({
url: "/productUpload/updateProductMsg", url: "/productUpload/updateProductMsg",
method: "post", method: "post",
headers: { "Content-Type": "multipart/form-data" }, headers: { "Content-Type": "multipart/form-data" },
@ -34,7 +34,7 @@ export function updateProduct(data) {
} }
// 添加订单 // 添加订单
export function addOrder(data) { export function addOrder(data) {
return request({ return microwaveRequest({
url: "/validationOrder/addOrder", url: "/validationOrder/addOrder",
method: "post", method: "post",
headers: { "Content-Type": "multipart/form-data" }, headers: { "Content-Type": "multipart/form-data" },

18
src/api/home.js
View File

@ -1,8 +1,8 @@
import request from '@/lib/request' import microwaveRequest from "@/lib/request-microwave";
// 获取样本数据 // 获取样本数据
export function getStarSamples(data){ export function getStarSamples(data){
return request({ return microwaveRequest({
url:'/readExcel/parseExcel', url:'/readExcel/parseExcel',
method:'post', method:'post',
data data
@ -11,7 +11,7 @@ export function getStarSamples(data){
// 获取lc样本数据 // 获取lc样本数据
export function getLcSamples(data){ export function getLcSamples(data){
return request({ return microwaveRequest({
url:'/mockSample/getLcSample', url:'/mockSample/getLcSample',
method:'post', method:'post',
data data
@ -20,7 +20,7 @@ export function getLcSamples(data){
// 获取otg样本数据 // 获取otg样本数据
export function getOtgSamples(data){ export function getOtgSamples(data){
return request({ return microwaveRequest({
url:'/mockSample/getOtgSample', url:'/mockSample/getOtgSample',
method:'post', method:'post',
data data
@ -29,7 +29,7 @@ export function getOtgSamples(data){
// 获取sol样本数据 // 获取sol样本数据
export function getSolSamples(data){ export function getSolSamples(data){
return request({ return microwaveRequest({
url:'/mockSample/getSolSample', url:'/mockSample/getSolSample',
method:'post', method:'post',
data data
@ -39,7 +39,7 @@ export function getSolSamples(data){
// 选中的样本数据入库 // 选中的样本数据入库
export function insertSampleList(data){ export function insertSampleList(data){
return request({ return microwaveRequest({
url:'/metaDataOrder/insertSampleList', url:'/metaDataOrder/insertSampleList',
method:'post', method:'post',
headers:{'Content-Type':'multipart/form-data'}, headers:{'Content-Type':'multipart/form-data'},
@ -49,7 +49,7 @@ export function insertSampleList(data){
// 地表覆盖类型关联入库 // 地表覆盖类型关联入库
export function addCoverType(data){ export function addCoverType(data){
return request({ return microwaveRequest({
url:'/landCoverType/addCoverType', url:'/landCoverType/addCoverType',
method:'post', method:'post',
headers:{'Content-Type':'multipart/form-data'}, headers:{'Content-Type':'multipart/form-data'},
@ -59,7 +59,7 @@ export function addCoverType(data){
// 地表覆盖类型关联批量入库 // 地表覆盖类型关联批量入库
export function addCoverTypeBatch(data){ export function addCoverTypeBatch(data){
return request({ return microwaveRequest({
url:'/landCoverType/addCoverTypeBatch', url:'/landCoverType/addCoverTypeBatch',
method:'post', method:'post',
data data
@ -68,7 +68,7 @@ export function addCoverTypeBatch(data){
// 地表覆盖类型关联入库 // 地表覆盖类型关联入库
export function initOrderStage(data){ export function initOrderStage(data){
return request({ return microwaveRequest({
url:'orderStatus/initOrderStage', url:'orderStatus/initOrderStage',
method:'post', method:'post',
headers:{'Content-Type':'multipart/form-data'}, headers:{'Content-Type':'multipart/form-data'},

189
src/api/lang/pendingOrder.js Normal file
View File

@ -0,0 +1,189 @@
import request from "@/lib/request";
import realityRequest from "@/lib/request-reality";
// 查询订单基本信息
export function getOrderMsg(orderId) {
return request({
url: "outside/order/queryOrderBasicInfo?orderId=" + orderId,
method: "get"
});
}
// 根据订单id查询待检验产品基本信息接口
export function getPendingProductMsg(orderId) {
return request({
url: "outside/order/queryBasicInfo?orderId=" + orderId,
method: "get"
// headers:{'Content-Type':'multipart/form-data'},
});
}
// 根据订单id查询真实性检验分析方法接口
export function getAnalyseMethod(orderId) {
return request({
url: "outside/validation/info/analyseMethod?orderId=" + orderId,
method: "get"
});
}
// 根据订单id查询订单关联的地面数据
export function getSamplesList(orderId) {
return request({
url: "outside/order/queryListLandDataAssociated/" + orderId,
method: "get"
});
}
// 根据订单id查询订单关联的地面数据
export function delSampleData(data) {
return request({
url: "outside/order/deleteSampleData",
method: "post",
headers: { "Content-Type": "multipart/form-data" },
data
});
}
// 更新订单的真实性检验方法（分析方法）
export function upDateAnalyseMethod(params) {
return request({
url: "outside/validation/info/upDateAnalyseMethod?" + params,
method: "put"
});
}
// 订单反馈
export function orderFeedback(data) {
return request({
url: "outside/order/orderFeedback",
method: "post",
headers: { "Content-Type": "multipart/form-data" },
data
});
}
// 订单状态更新
export function updateOrderStage(params) {
return request({
url: "outside/order/?" + params,
method: "put"
});
}
//根据订单ID展示真实性检验报告接口
export function getRealityCheckReport(orderId) {
return request({
url: "outside/validation/showRealityCheckReport?orderId=" + orderId,
method: "get"
});
}
// 获取抽样方法
export function getAllSampleFun() {
return request({
url: "outside/validation/info/sampleMethod",
method: "get"
});
}
// 同名点选取
export function setSamePoi(data) {
return request({
url: "outside/validation/sameNamePoint/select",
headers: { "Content-Type": "multipart/form-data" },
method: "post",
data
});
}
// 设置订单审核
export function setExamine(data) {
return request({
url: "outside/order/examine",
method: "post",
data
});
}
// 查询订单审核结果
export function getExamine(orderId) {
return request({
url: "outside/order/examine/" + orderId,
method: "get"
});
}
// 存储检验结果接口
export function saveValidationRes(data) {
return request({
url: "outside/validation/result/saveValidationResult",
data,
method: "post"
});
}
// 存储报告信息
export function saveReport(params) {
return request({
url: "outside/validation/result/saveReportPath",
params,
method: "get"
});
}
// 根据抽样算法获取抽样后样本数据
export function getSampleData(data) {
return realityRequest({
url: "sampleGet/getSampleData",
method: "post",
headers: { "Content-Type": "multipart/form-data" },
data
});
}
// 分层抽样获取样本数据
export function getSamplesByLayer(data) {
return realityRequest({
url: "sampleGet/getSamplesByLayer",
method: "post",
headers: { "Content-Type": "multipart/form-data" },
data
});
}
// 真实性校验方法
export function checkReality(data) {
return realityRequest({
url: "check/reality",
method: "post",
headers: { "Content-Type": "multipart/form-data" },
data
});
}
// 导出pdf模板
export function exportWord(data, pdfName, localTiffPath, httpTiffPath, productType) {
return realityRequest({
url:
"importPDF/importWordAndPDF?reportName=" +
pdfName +
"&localTiffPath" +
localTiffPath +
"&httpTiffPath=" +
httpTiffPath +
"&productType=" +
productType,
method: "post",
// headers:{'Content-Type':'multipart/form-data'},
data
});
}
//下载PDF报告
export function downloadPdf(url) {
return request({
url: url,
responseType: "blob",
method: "GET"
});
}

34
src/api/pendingOrder.js
View File

@ -1,4 +1,4 @@
import request from "@/lib/request"; import microwaveRequest from "@/lib/request-microwave";
import realityRequest from "@/lib/request-reality"; import realityRequest from "@/lib/request-reality";
import fileRequest from "@/lib/request-file"; import fileRequest from "@/lib/request-file";
@ -31,7 +31,7 @@ export function getProductMetaMsg(data) {
} }
// 获取待检验产品订单列表 // 获取待检验产品订单列表
export function getPendingList(data) { export function getPendingList(data) {
return request({ return microwaveRequest({
url: "validationOrder/getPendingList", url: "validationOrder/getPendingList",
method: "post", method: "post",
headers: { "Content-Type": "multipart/form-data" }, headers: { "Content-Type": "multipart/form-data" },
@ -41,7 +41,7 @@ export function getPendingList(data) {
//更新订单信息 //更新订单信息
export function updateOrderMsg(data) { export function updateOrderMsg(data) {
return request({ return microwaveRequest({
url: "validationOrder/update", url: "validationOrder/update",
method: "post", method: "post",
data data
@ -49,7 +49,7 @@ export function updateOrderMsg(data) {
} }
// 获取订单信息 // 获取订单信息
export function getProductMsg(data) { export function getProductMsg(data) {
return request({ return microwaveRequest({
url: "validationOrder/getOrderMsg", url: "validationOrder/getOrderMsg",
method: "post", method: "post",
data data
@ -58,7 +58,7 @@ export function getProductMsg(data) {
//更新订单编辑状态 //更新订单编辑状态
export function updateOrderStatus(orderId) { export function updateOrderStatus(orderId) {
return request({ return microwaveRequest({
url: "/validationOrder/updateTime?id=" + orderId, url: "/validationOrder/updateTime?id=" + orderId,
method: "get" method: "get"
}); });
@ -66,7 +66,7 @@ export function updateOrderStatus(orderId) {
//更新订单编辑状态 //更新订单编辑状态
export function disOrderStatus(orderId) { export function disOrderStatus(orderId) {
return request({ return microwaveRequest({
url: "/validationOrder/updateByIdTimeNull?id=" + orderId, url: "/validationOrder/updateByIdTimeNull?id=" + orderId,
method: "get" method: "get"
}); });
@ -94,14 +94,14 @@ export function getSamplesByLayer(data) {
// 获取订单关联的所有样本数据 // 获取订单关联的所有样本数据
export function getOrderSamples(orderId, productType) { export function getOrderSamples(orderId, productType) {
return request({ return microwaveRequest({
url: "metaDataOrder/getOrderSamples?orderId=" + orderId + "&productType=" + productType, url: "metaDataOrder/getOrderSamples?orderId=" + orderId + "&productType=" + productType,
method: "post" method: "post"
}); });
} }
// 根据样本ID删除订单样本数据 // 根据样本ID删除订单样本数据
export function deleteOrderSamplesByID(sampleId, productType) { export function deleteOrderSamplesByID(sampleId, productType) {
return request({ return microwaveRequest({
url: url:
"metaDataOrder/deleteOrderSamplesByID?sampleId=" + "metaDataOrder/deleteOrderSamplesByID?sampleId=" +
sampleId + sampleId +
@ -112,7 +112,7 @@ export function deleteOrderSamplesByID(sampleId, productType) {
} }
// 抽样后样本数据入库 // 抽样后样本数据入库
export function addConnectSamples(data) { export function addConnectSamples(data) {
return request({ return microwaveRequest({
url: "metaDataOrder/updateConnectSamples", url: "metaDataOrder/updateConnectSamples",
method: "post", method: "post",
headers: { "Content-Type": "multipart/form-data" }, headers: { "Content-Type": "multipart/form-data" },
@ -121,7 +121,7 @@ export function addConnectSamples(data) {
} }
// 查询订单关联的地物映射关系 // 查询订单关联的地物映射关系
export function getCoverTypes(orderId) { export function getCoverTypes(orderId) {
return request({ return microwaveRequest({
url: "landCoverType/getCoverType?orderId=" + orderId, url: "landCoverType/getCoverType?orderId=" + orderId,
method: "post" method: "post"
}); });
@ -129,7 +129,7 @@ export function getCoverTypes(orderId) {
// 地表覆盖类型与空基类型关联 // 地表覆盖类型与空基类型关联
export function updateFeature(data) { export function updateFeature(data) {
return request({ return microwaveRequest({
url: "landCoverType/updateCoverType", url: "landCoverType/updateCoverType",
method: "post", method: "post",
headers: { "Content-Type": "multipart/form-data" }, headers: { "Content-Type": "multipart/form-data" },
@ -139,7 +139,7 @@ export function updateFeature(data) {
// 订单反馈 // 订单反馈
export function orderFeedback(data) { export function orderFeedback(data) {
return request({ return microwaveRequest({
url: "ordersFeedback/orderFeedback", url: "ordersFeedback/orderFeedback",
method: "post", method: "post",
headers: { "Content-Type": "multipart/form-data" }, headers: { "Content-Type": "multipart/form-data" },
@ -149,7 +149,7 @@ export function orderFeedback(data) {
// 订单状态更新 // 订单状态更新
export function updateOrderStage(data) { export function updateOrderStage(data) {
return request({ return microwaveRequest({
url: "orderStatus/updateOrderStage", url: "orderStatus/updateOrderStage",
method: "post", method: "post",
headers: { "Content-Type": "multipart/form-data" }, headers: { "Content-Type": "multipart/form-data" },
@ -177,7 +177,7 @@ export function exportWord(data, pdfName, localTiffPath, httpTiffPath, productTy
//下载PDF报告 //下载PDF报告
export function downloadPdf(url) { export function downloadPdf(url) {
return request({ return microwaveRequest({
url: url, url: url,
responseType: "blob", responseType: "blob",
method: "GET" method: "GET"
@ -186,7 +186,7 @@ export function downloadPdf(url) {
// 添加报告信息 // 添加报告信息
export function addReportMsg(data) { export function addReportMsg(data) {
return request({ return microwaveRequest({
url: "validationReport/addReportMsg", url: "validationReport/addReportMsg",
headers: { "Content-Type": "multipart/form-data" }, headers: { "Content-Type": "multipart/form-data" },
method: "post", method: "post",
@ -195,7 +195,7 @@ export function addReportMsg(data) {
} }
// 查询报告信息 // 查询报告信息
export function getReportMsg(orderId) { export function getReportMsg(orderId) {
return request({ return microwaveRequest({
url: "validationReport/getReportMsg?orderId=" + orderId, url: "validationReport/getReportMsg?orderId=" + orderId,
method: "get" method: "get"
}); });
@ -203,7 +203,7 @@ export function getReportMsg(orderId) {
//获取订单处理失败的信息 //获取订单处理失败的信息
export function getFeedbackMsg(orderId) { export function getFeedbackMsg(orderId) {
return request({ return microwaveRequest({
url: "ordersFeedback/getFeedbackMsg?orderId=" + orderId, url: "ordersFeedback/getFeedbackMsg?orderId=" + orderId,
method: "get" method: "get"
}); });

102
src/components/ration/otgCorrection/index.vue
View File

@ -7,18 +7,6 @@
<div class="otgCardContent"> <div class="otgCardContent">
<el-form :inline="true" :model="simpleForm" class="demo-form-inline"> <el-form :inline="true" :model="simpleForm" class="demo-form-inline">
<el-form-item style="margin-left: 15px"> <el-form-item style="margin-left: 15px">
<!-- <el-select
v-model="simpleForm.sampleFun"
:disabled="sampleFun !== ''"
size="mini"
placeholder="请选择抽样方法"
@change="changeSampleFun"
>
<el-option label="" value=""></el-option>
<el-option label="随机抽样" value="0"></el-option>
<el-option label="分层抽样" value="1"></el-option>
<el-option label="等距抽样" value="2"></el-option>
</el-select> -->
<el-cascader <el-cascader
v-model="simpleForm.sampleFun" v-model="simpleForm.sampleFun"
:disabled="sampleFun !== ''" :disabled="sampleFun !== ''"
@ -75,32 +63,36 @@
<el-table-column label="序号" type="index" width="70"> <el-table-column label="序号" type="index" width="70">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="sampleId" prop="samplesId"
label="样本编号" label="样本编号"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column label="纬度(°)" sortable show-overflow-tooltip> <el-table-column label="纬度(°)" sortable show-overflow-tooltip>
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.lat.toFixed(8) parseFloat(scope.row.measureLat.toFixed(8))
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column label="经度(°)" sortable> <el-table-column label="经度(°)" sortable>
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.lon.toFixed(8) parseFloat(scope.row.measureLong.toFixed(8))
}}</template> }}</template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="高程" sortable prop="alt"></el-table-column> -->
<el-table-column <el-table-column
label="采样时间" label="采样时间"
sortable sortable
prop="dataTime" prop="collectDate"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column label="选取点纬度" prop="sameLat"></el-table-column> <el-table-column
<el-table-column label="选取点经度" prop="sameLon"></el-table-column> label="选取点纬度"
<!-- <el-table-column label="选取点高度" prop="sameAlt"></el-table-column> --> prop="sameNameLat"
></el-table-column>
<el-table-column
label="选取点经度"
prop="sameNameLong"
></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope" <template slot-scope="scope"
><i ><i
@ -110,7 +102,6 @@
></template> ></template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- <Pagination :page-sizes="[13, 26, 39]" v-show="total>0" :total="total" :page.sync="simpleForm.pageNum" :limit.sync="simpleForm.pageSize" @pagination="getSimpleList" /> -->
</div> </div>
</div> </div>
<div class="sceneShow"> <div class="sceneShow">
@ -196,12 +187,19 @@
<script> <script>
import Pagination from "@/components/Pagination"; import Pagination from "@/components/Pagination";
import OtgProductInfo from "@/components/otgProductInfo"; import OtgProductInfo from "@/components/otgProductInfo";
// import {
// getSampleData,
// getOrderSamples,
// getSamplesByLayer,
// deleteOrderSamplesByID,
// } from "@/api/pendingOrder";
import { import {
getSamplesList,
getSampleData, getSampleData,
getOrderSamples,
getSamplesByLayer, getSamplesByLayer,
deleteOrderSamplesByID, setSamePoi,
} from "@/api/pendingOrder"; } from "@/api/lang/pendingOrder";
import otgCesiumUtils from "@/lib/otgCesiumUtils"; import otgCesiumUtils from "@/lib/otgCesiumUtils";
import SampleSetting from "@/components/ration/sampleSetting/index.vue"; import SampleSetting from "@/components/ration/sampleSetting/index.vue";
import WKT from "terraformer-wkt-parser"; import WKT from "terraformer-wkt-parser";
@ -245,20 +243,6 @@ export default {
require: true, require: true,
}, },
}, },
filters: {
formatDate(inputTime) {
if (!inputTime && typeof inputTime !== "number") {
return "";
}
var localTime = "";
inputTime = new Date(inputTime);
const offset = new Date().getTimezoneOffset();
localTime = new Date(inputTime - offset * 60000).toISOString();
localTime = localTime.substr(0, localTime.lastIndexOf("."));
localTime = localTime.replace("T", " ");
return localTime;
},
},
data() { data() {
return { return {
simpleForm: { simpleForm: {
@ -286,11 +270,6 @@ export default {
depthList: [], depthList: [],
}; };
}, },
// watch:{
// geoWorkSpace:function(value){
// otgCesiumUtils.addlayer(value,this.geoLayerName)
// }
// },
mounted() { mounted() {
otgCesiumUtils.initCesium(["farViewer", "nearViewer"]); otgCesiumUtils.initCesium(["farViewer", "nearViewer"]);
otgCesiumUtils.addlayer(this.geoWorkSpace, this.geoLayerName); otgCesiumUtils.addlayer(this.geoWorkSpace, this.geoLayerName);
@ -306,7 +285,7 @@ export default {
}, },
created() { created() {
this.funcOpt = this.configration.funcOpt; this.funcOpt = this.configration.funcOpt;
this.getSplData(); this.getSqlData();
this.initParam(); this.initParam();
}, },
methods: { methods: {
@ -314,7 +293,6 @@ export default {
this.stepSampling = newVal; this.stepSampling = newVal;
}, },
handleDepthList(newVal) { handleDepthList(newVal) {
// console.log('handleDepthList', newVal)
this.depthList = newVal; this.depthList = newVal;
}, },
editDeepSpace() { editDeepSpace() {
@ -339,7 +317,6 @@ export default {
} else { } else {
this.isDeepSpace = false; this.isDeepSpace = false;
} }
// this.stepSampling = this.sampleFun == "1" && this?.sampleCldFun == "0";
}, },
changeSampleFun(sfVal) { changeSampleFun(sfVal) {
if (Array.isArray(sfVal)) { if (Array.isArray(sfVal)) {
@ -350,9 +327,6 @@ export default {
this.isDeepSpace = false; this.isDeepSpace = false;
} }
} }
// const ssf = Number(sfVal);
// if (ssf === 1 && this.sampleCldFun !== '') this.stepSampling = true;
// else this.stepSampling = false;
}, },
samplesCk() { samplesCk() {
const self = this; const self = this;
@ -365,7 +339,7 @@ export default {
ssn = self.simpleForm.sampleNum; ssn = self.simpleForm.sampleNum;
if (ssn == "") { if (ssn == "") {
this.$message.error("请选择抽样个数"); this.$message.error("请选择抽样个数");
this.getSplData(); this.getSqlData();
return false; return false;
} }
if (ssn > st) { if (ssn > st) {
@ -376,9 +350,8 @@ export default {
this.$message.error("样本个数不可为负数"); this.$message.error("样本个数不可为负数");
return false; return false;
} }
if (Number(ssf[0]) === 1) { if (Number(ssf[0]) === 2) {
const stepSampParams = self.$refs.sampleSettingPanel; const stepSampParams = self.$refs.sampleSettingPanel;
// const hierarchyVal = stepSampParams.hierarchyVal;
const hierarchyVal = ssf[1]; const hierarchyVal = ssf[1];
if (hierarchyVal === "" || hierarchyVal === undefined) { if (hierarchyVal === "" || hierarchyVal === undefined) {
self.stepSampling = true; self.stepSampling = true;
@ -388,15 +361,11 @@ export default {
ssForm.append("samplesList", JSON.stringify(this.allSampleData)); ssForm.append("samplesList", JSON.stringify(this.allSampleData));
ssForm.append("stepType", Number(hierarchyVal)); ssForm.append("stepType", Number(hierarchyVal));
ssForm.append("orderID", this.orderId); ssForm.append("orderID", this.orderId);
// ssForm.append("productType",this.productSubType);
if (hierarchyVal === "0") { if (hierarchyVal === "0") {
// const depthList = stepSampParams.depthList;
const depthList = this.depthList; const depthList = this.depthList;
// console.log('=====', depthList)
ssForm.append("condition", JSON.stringify(depthList)); ssForm.append("condition", JSON.stringify(depthList));
} else if (hierarchyVal === "2") { } else if (hierarchyVal === "2") {
const jsonContent = JSON.parse(stepSampParams.jsonContent); const jsonContent = JSON.parse(stepSampParams.jsonContent);
// const jsonContentWKT = WKT.convert(jsonContent.geometries[0]);
const jg = jsonContent.geometries; const jg = jsonContent.geometries;
const newPolygon = []; const newPolygon = [];
for (let i in jg) { for (let i in jg) {
@ -455,9 +424,9 @@ export default {
tableRowClk(row) { tableRowClk(row) {
this.radioClkMsg = row; this.radioClkMsg = row;
otgCesiumUtils.removePoint(); otgCesiumUtils.removePoint();
const lon = row.lon, const lon = row.measureLong,
lat = row.lat, lat = row.measureLat,
alt = row.alt; alt = 10;
otgCesiumUtils.addPointToFarViewer(lon, lat, alt); otgCesiumUtils.addPointToFarViewer(lon, lat, alt);
otgCesiumUtils.addPointToNearViewer(lon, lat, alt); otgCesiumUtils.addPointToNearViewer(lon, lat, alt);
this.ckPoint = false; this.ckPoint = false;
@ -474,7 +443,6 @@ export default {
}, },
// 选择相同的点 // 选择相同的点
ckSamePoi() { ckSamePoi() {
// console.log('选择同名点');
otgCesiumUtils.drawPoint((point) => { otgCesiumUtils.drawPoint((point) => {
this.radioClkMsg.sameLon = Number(point[0]); this.radioClkMsg.sameLon = Number(point[0]);
this.radioClkMsg.sameLat = Number(point[1]); this.radioClkMsg.sameLat = Number(point[1]);
@ -484,7 +452,6 @@ export default {
}, },
// 保存相同的点 // 保存相同的点
saveSamePoi() { saveSamePoi() {
// console.log("保存同名点成功");
this.ckPoint = true; this.ckPoint = true;
this.savePoint = true; this.savePoint = true;
otgCesiumUtils.stopDrowPoi(); otgCesiumUtils.stopDrowPoi();
@ -502,14 +469,14 @@ export default {
alImgDom.src = this.measurePicDistant; alImgDom.src = this.measurePicDistant;
} }
}, },
getSplData() { getSqlData() {
getOrderSamples(this.orderId, this.productSubType).then((res) => { getSamplesList(this.orderId).then((res) => {
// console.log(res) console.log("111111111", res);
if (res.code == 200) { if (res.code == 200) {
this.multipleSelection = this.multipleSelection =
this.allSampleData = this.allSampleData =
this.simpleData = this.simpleData =
res.data; res.data.list;
this.loading = false; this.loading = false;
this.$refs.multipleTable.toggleAllSelection(); this.$refs.multipleTable.toggleAllSelection();
let min = Number.MAX_SAFE_INTEGER; let min = Number.MAX_SAFE_INTEGER;
@ -529,11 +496,6 @@ export default {
}, },
deleteSelected(index, simpleData) { deleteSelected(index, simpleData) {
simpleData.splice(index, 1); simpleData.splice(index, 1);
// deleteOrderSamplesByID(sampleId, this.productSubType).then((res) => {
// if (res.code == 200) {
// this.getSplData();
// }
// });
}, },
pickValueFar() { pickValueFar() {
otgCesiumUtils.handleClickFar(); otgCesiumUtils.handleClickFar();

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

@ -120,7 +120,7 @@
<el-table-column label="序号" type="index" width="70"> <el-table-column label="序号" type="index" width="70">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="sampleId" prop="samplesId"
label="样本编号" label="样本编号"
show-overflow-tooltip show-overflow-tooltip
> >
@ -133,7 +133,7 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="lon" prop="lng"
label="经度" label="经度"
sortable sortable
show-overflow-tooltip show-overflow-tooltip
@ -145,9 +145,12 @@
show-overflow-tooltip show-overflow-tooltip
sortable sortable
> >
<template slot-scope="scope">{{
scope.row.paramStr | getCoverName
}}</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dataTime" prop="collectDate"
label="采样时间" label="采样时间"
sortable sortable
show-overflow-tooltip show-overflow-tooltip
@ -221,13 +224,18 @@
</template> </template>
<script> <script>
// import {
// getCoverTypes,
// getSampleData,
// getOrderSamples,
// getSamplesByLayer,
// } from "@/api/pendingOrder";
import { import {
getCoverTypes, getSamplesList,
getSampleData, getSampleData,
getOrderSamples,
getSamplesByLayer, getSamplesByLayer,
deleteOrderSamplesByID, } from "@/api/lang/pendingOrder";
} from "@/api/pendingOrder";
import cu from "@/lib/cesiumUtils"; import cu from "@/lib/cesiumUtils";
import SampleSetting from "@/components/ration/sampleSetting/index.vue"; import SampleSetting from "@/components/ration/sampleSetting/index.vue";
import WKT from "terraformer-wkt-parser"; import WKT from "terraformer-wkt-parser";
@ -273,17 +281,8 @@ export default {
}, },
}, },
filters: { filters: {
formatDate(inputTime) { getCoverName(paramStr) {
if (!inputTime && typeof inputTime !== "number") { return JSON.parse(paramStr).covernm;
return "";
}
var localTime = "";
inputTime = new Date(inputTime);
const offset = new Date().getTimezoneOffset();
localTime = new Date(inputTime - offset * 60000).toISOString();
localTime = localTime.substr(0, localTime.lastIndexOf("."));
localTime = localTime.replace("T", " ");
return localTime;
}, },
}, },
data() { data() {
@ -308,12 +307,6 @@ export default {
depthList: [], depthList: [],
}; };
}, },
// watch:{
// geoWorkSpace:function(value){
// cu.addlayer(value,this.geoLayerName)
// cu.flyToLayer(this.geoLayerPos[0],this.geoLayerPos[1]);
// }
// },
mounted() { mounted() {
cu.initCesium("sceneShowContent"); cu.initCesium("sceneShowContent");
cu.handleClick(); cu.handleClick();
@ -329,8 +322,8 @@ export default {
} }
this.funcOpt = this.configration.funcOpt; this.funcOpt = this.configration.funcOpt;
this.getCoverType(); // this.getCoverType();
this.getSplData(); this.getSqlData();
this.initParam(); this.initParam();
}, },
methods: { methods: {
@ -447,14 +440,14 @@ export default {
} }
}); });
}, },
getSplData() { getSqlData() {
// console.log(this.productSubType) getSamplesList(this.orderId).then((res) => {
getOrderSamples(this.orderId, this.productSubType).then((res) => { // console.log("111111111", res);
if (res.code == 200) { if (res.code == 200) {
this.multipleSelection = this.multipleSelection =
this.allSampleData = this.allSampleData =
this.simpleData = this.simpleData =
res.data; res.data.list;
this.loading = false; this.loading = false;
this.$refs.multipleTable.toggleAllSelection(); this.$refs.multipleTable.toggleAllSelection();
let min = Number.MAX_SAFE_INTEGER; let min = Number.MAX_SAFE_INTEGER;
@ -468,7 +461,7 @@ export default {
if (this.allSampleData.length > 0) { if (this.allSampleData.length > 0) {
this.$store.commit("setAltRange", min + "," + (max + 1)); this.$store.commit("setAltRange", min + "," + (max + 1));
} }
this.simpleDataTotal = res.data.length; this.simpleDataTotal = res.data.list.length;
} }
}); });
}, },
@ -494,7 +487,7 @@ export default {
ssn = self.simpleForm.sampleNum; ssn = self.simpleForm.sampleNum;
if (ssn == "") { if (ssn == "") {
this.$message.error("请选择抽样个数"); this.$message.error("请选择抽样个数");
this.getSplData(); this.getSqlData();
return false; return false;
} }
if (ssn > st) { if (ssn > st) {
@ -505,10 +498,8 @@ export default {
this.$message.error("样本个数不可为负数"); this.$message.error("样本个数不可为负数");
return false; return false;
} }
if (Number(ssf[0]) === 1) { if (Number(ssf[0]) === 2) {
// self.stepSampling = true;
const stepSampParams = self.$refs.sampleSettingPanel; const stepSampParams = self.$refs.sampleSettingPanel;
// const hierarchyVal = stepSampParams.hierarchyVal;
const hierarchyVal = ssf[1]; const hierarchyVal = ssf[1];
if (hierarchyVal === "" || hierarchyVal === undefined) { if (hierarchyVal === "" || hierarchyVal === undefined) {
self.stepSampling = true; self.stepSampling = true;
@ -518,15 +509,11 @@ export default {
ssForm.append("samplesList", JSON.stringify(this.allSampleData)); ssForm.append("samplesList", JSON.stringify(this.allSampleData));
ssForm.append("stepType", Number(hierarchyVal)); ssForm.append("stepType", Number(hierarchyVal));
ssForm.append("orderID", this.orderId); ssForm.append("orderID", this.orderId);
// ssForm.append("productType",this.productSubType);
if (hierarchyVal === "0") { if (hierarchyVal === "0") {
// const depthList = stepSampParams.depthList;
const depthList = this.depthList; const depthList = this.depthList;
// console.log('=====', depthList)
ssForm.append("condition", JSON.stringify(depthList)); ssForm.append("condition", JSON.stringify(depthList));
} else if (hierarchyVal === "2") { } else if (hierarchyVal === "2") {
const jsonContent = JSON.parse(stepSampParams.jsonContent); const jsonContent = JSON.parse(stepSampParams.jsonContent);
// const jsonContentWKT = WKT.convert(jsonContent.geometries[0]);
const jg = jsonContent.geometries; const jg = jsonContent.geometries;
const newPolygon = []; const newPolygon = [];
for (let i in jg) { for (let i in jg) {
@ -580,11 +567,6 @@ export default {
}, },
deleteSelected(index, simpleData) { deleteSelected(index, simpleData) {
simpleData.splice(index, 1); simpleData.splice(index, 1);
// deleteOrderSamplesByID(sampleId, this.productSubType).then((res) => {
// if (res.code == 200) {
// this.getSplData();
// }
// });
}, },
pickValue() { pickValue() {
cu.handleClick(); cu.handleClick();

82
src/components/ration/sampleSetting/index.vue
View File

@ -1,21 +1,11 @@
<template> <template>
<div class="sampleFunParam"> <div class="sampleFunParam">
<el-dialog title="深度空间分层抽样设置" :visible.sync="stepSampling" width="35%"> <el-dialog
<!-- <el-select title="深度空间分层抽样设置"
v-model="hierarchyVal" :visible.sync="stepSampling"
placeholder="分层选择" width="35%"
@change="setHierarchy" >
>
<el-option
v-for="item in hierarchyOpt"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select> -->
<div class="hint"> <div class="hint">
<!-- <span>{{ hierarchyVal === "0" ? altRangeText : "" }}</span> -->
<span>{{ altRangeText }}</span> <span>{{ altRangeText }}</span>
</div> </div>
<div v-if="hierarchyVal === '2'"> <div v-if="hierarchyVal === '2'">
@ -127,7 +117,6 @@ export default {
}, },
data() { data() {
return { return {
// stepShow: false,
hierarchyVal: "0", hierarchyVal: "0",
hierarchyOpt: [ hierarchyOpt: [
{ {
@ -138,28 +127,26 @@ export default {
value: "1", value: "1",
label: "场站网空间分层", label: "场站网空间分层",
}, },
// , {
// value: '2',
// label: '空间区域分层'
// }
], ],
depthList: [], depthList: [],
editable: [], editable: [],
jsonContent: null, jsonContent: null,
depths: [] depths: [],
}; };
}, },
watch: { watch: {
stepSampling: function (value) {}, stepSampling: function (value) {},
'$store.state.altRange': function(value) { "$store.state.altRange": function (value) {
const temp = (value === null || value === "") ? [1, 5] : value.split(','); const temp = value === null || value === "" ? [1, 5] : value.split(",");
this.depths = temp; this.depths = temp;
this.depthList = [{ this.depthList = [
startDepth: this.depths[0], {
endDepth: this.depths[1], startDepth: this.depths[0],
}] endDepth: this.depths[1],
this.$emit('handleDepthList', this.depthList) },
} ];
this.$emit("handleDepthList", this.depthList);
},
}, },
computed: { computed: {
altRangeText: function () { altRangeText: function () {
@ -171,42 +158,44 @@ export default {
")"; ")";
}, },
}, },
created() {}, created() {},
mounted() { mounted() {
this.initParams(); this.initParams();
this.changeNum(0, 'editStartDepthInput'); this.changeNum(0, "editStartDepthInput");
this.changeNum(0, 'editEndDepthInput'); this.changeNum(0, "editEndDepthInput");
}, },
methods: { methods: {
initParams() { initParams() {
this.depthList = [{ this.depthList = [
startDepth: this.depths[0], {
endDepth: this.depths[1], startDepth: this.depths[0],
}]; endDepth: this.depths[1],
this.$emit('handleDepthList', this.depthList); },
];
this.$emit("handleDepthList", this.depthList);
}, },
// 修改地表覆盖 // 修改地表覆盖
changeNum(index, className) { changeNum(index, className) {
// tableList为表格数据 // tableList为表格数据
this.editable = new Array(this.depthList.length); this.editable = new Array(this.depthList.length);
this.editable[index] = true; this.editable[index] = true;
// this.saveItem = this.depthList[index];
this.$set(this.editable, index, true); this.$set(this.editable, index, true);
//让input自动获取焦点
this.$nextTick(function () { this.$nextTick(function () {
var editInputList = document.getElementsByClassName(className); var editInputList = document.getElementsByClassName(className);
editInputList[0]?.children[0]?.focus(); editInputList[0]?.children[0]?.focus();
}); });
}, },
addDepthT() { addDepthT() {
this.depthList.push({ startDepth: this.depths[0], endDepth: this.depths[1] }); this.depthList.push({
startDepth: this.depths[0],
endDepth: this.depths[1],
});
}, },
removeDepthT(index) { removeDepthT(index) {
if(this.depthList.length === 1) return; if (this.depthList.length === 1) return;
this.depthList.splice(index, 1); this.depthList.splice(index, 1);
}, },
setHierarchy(val) { setHierarchy(val) {
// console.log("当前值", val);
if (val === "0") { if (val === "0") {
this.depthList = [ this.depthList = [
{ {
@ -234,18 +223,15 @@ export default {
}; };
}, },
submitSampleFunSet() { submitSampleFunSet() {
// console.log(this.jsonContent)
if (this.hierarchyVal === "2" && this.jsonContent === null) { if (this.hierarchyVal === "2" && this.jsonContent === null) {
this.$message.error("请上传深度JSON文件"); this.$message.error("请上传深度JSON文件");
return false; return false;
} }
// this.stepShow = false; this.$emit("handleStepSampling", false);
this.$emit('handleStepSampling', false); this.$emit("handleDepthList", this.depthList);
this.$emit('handleDepthList', this.depthList);
}, },
cancelSampleFunSet() { cancelSampleFunSet() {
// this.stepShow = false; this.$emit("handleStepSampling", false);
this.$emit('handleStepSampling', false);
}, },
}, },
}; };

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

@ -8,18 +8,6 @@
<div> <div>
<el-form :inline="true" :model="simpleForm" class="demo-form-inline"> <el-form :inline="true" :model="simpleForm" class="demo-form-inline">
<el-form-item> <el-form-item>
<!-- <el-select
v-model="simpleForm.sampleFun"
:disabled="sampleFun !== ''"
size="mini"
placeholder="请选择抽样方法"
@change="changeSampleFun"
>
<el-option label="" value=""></el-option>
<el-option label="随机抽样" value="0"></el-option>
<el-option label="分层抽样" value="1"></el-option>
<el-option label="等距抽样" value="2"></el-option>
</el-select> -->
<el-cascader <el-cascader
v-model="simpleForm.sampleFun" v-model="simpleForm.sampleFun"
:disabled="sampleFun !== ''" :disabled="sampleFun !== ''"
@ -71,7 +59,7 @@
<el-table-column label="序号" type="index" width="70"> <el-table-column label="序号" type="index" width="70">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="sampleId" prop="samplesId"
label="样本编号" label="样本编号"
show-overflow-tooltip show-overflow-tooltip
min-width="100px;" min-width="100px;"
@ -85,22 +73,19 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="lon" prop="lng"
label="经度" label="经度"
sortable sortable
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column :label="smLabel" show-overflow-tooltip>
prop="dataValue" <template slot-scope="scope">{{
:label="productSubTypeName" scope.row.paramStr | getSampleVal
show-overflow-tooltip }}</template>
sortable
min-width="150px;"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dataTime" prop="collectDate"
label="采样时间" label="采样时间"
sortable sortable
show-overflow-tooltip show-overflow-tooltip
@ -143,11 +128,11 @@
<script> <script>
import { import {
getSamplesList,
getSampleData, getSampleData,
getOrderSamples,
getSamplesByLayer, getSamplesByLayer,
deleteOrderSamplesByID, } from "@/api/lang/pendingOrder";
} from "@/api/pendingOrder";
import cu from "@/lib/cesiumUtils"; import cu from "@/lib/cesiumUtils";
import SampleSetting from "@/components/ration/sampleSetting/index.vue"; import SampleSetting from "@/components/ration/sampleSetting/index.vue";
import WKT from "terraformer-wkt-parser"; import WKT from "terraformer-wkt-parser";
@ -192,17 +177,8 @@ export default {
}, },
}, },
filters: { filters: {
formatDate(inputTime) { getSampleVal(paramStr) {
if (!inputTime && typeof inputTime !== "number") { return JSON.parse(paramStr).featureValue.featureValue;
return "";
}
var localTime = "";
inputTime = new Date(inputTime);
const offset = new Date().getTimezoneOffset();
localTime = new Date(inputTime - offset * 60000).toISOString();
localTime = localTime.substr(0, localTime.lastIndexOf("."));
localTime = localTime.replace("T", " ");
return localTime;
}, },
}, },
data() { data() {
@ -244,7 +220,6 @@ export default {
this.stepSampling = newVal; this.stepSampling = newVal;
}, },
handleDepthList(newVal) { handleDepthList(newVal) {
// console.log('handleDepthList', newVal)
this.depthList = newVal; this.depthList = newVal;
}, },
editDeepSpace() { editDeepSpace() {
@ -262,14 +237,13 @@ export default {
const ssf = Number(this.simpleForm.sampleFun[0]); const ssf = Number(this.simpleForm.sampleFun[0]);
if ( if (
this.simpleForm.sampleFun.length >= 1 && this.simpleForm.sampleFun.length >= 1 &&
ssf === 1 && ssf === 2 &&
Number(this.simpleForm.sampleFun[1]) === 0 Number(this.simpleForm.sampleFun[1]) === 0
) { ) {
this.isDeepSpace = true; this.isDeepSpace = true;
} else { } else {
this.isDeepSpace = false; this.isDeepSpace = false;
} }
// this.stepSampling = this.sampleFun == "1" && this?.sampleCldFun == "0";
}, },
pickValue() { pickValue() {
cu.handleClick(); cu.handleClick();
@ -279,7 +253,7 @@ export default {
if (Array.isArray(sfVal)) { if (Array.isArray(sfVal)) {
const ssf = Number(sfVal[0]); const ssf = Number(sfVal[0]);
this.$store.commit("setSampleFun", sfVal.length === 0 ? null : ssf); this.$store.commit("setSampleFun", sfVal.length === 0 ? null : ssf);
if (sfVal.length >= 1 && ssf === 1 && Number(sfVal[1]) === 0) { if (sfVal.length >= 1 && ssf === 2 && Number(sfVal[1]) === 0) {
this.isDeepSpace = true; this.isDeepSpace = true;
} else { } else {
this.isDeepSpace = false; this.isDeepSpace = false;
@ -308,9 +282,8 @@ export default {
this.$message.error("样本个数不可为负数"); this.$message.error("样本个数不可为负数");
return false; return false;
} }
if (Number(ssf[0]) === 1) { if (Number(ssf[0]) === 2) {
const stepSampParams = self.$refs.sampleSettingPanel; const stepSampParams = self.$refs.sampleSettingPanel;
// const hierarchyVal = stepSampParams.hierarchyVal;
const hierarchyVal = ssf[1]; const hierarchyVal = ssf[1];
if (hierarchyVal === "" || hierarchyVal === undefined) { if (hierarchyVal === "" || hierarchyVal === undefined) {
self.stepSampling = true; self.stepSampling = true;
@ -320,15 +293,11 @@ export default {
ssForm.append("samplesList", JSON.stringify(self.allSampleData)); ssForm.append("samplesList", JSON.stringify(self.allSampleData));
ssForm.append("stepType", Number(hierarchyVal)); ssForm.append("stepType", Number(hierarchyVal));
ssForm.append("orderID", self.orderId); ssForm.append("orderID", self.orderId);
// ssForm.append("productType",this.productSubType);
if (hierarchyVal === "0") { if (hierarchyVal === "0") {
// const depthList = stepSampParams.depthList;
const depthList = this.depthList; const depthList = this.depthList;
// console.log('=====', depthList)
ssForm.append("condition", JSON.stringify(depthList)); ssForm.append("condition", JSON.stringify(depthList));
} else if (hierarchyVal === "2") { } else if (hierarchyVal === "2") {
const jsonContent = JSON.parse(stepSampParams.jsonContent); const jsonContent = JSON.parse(stepSampParams.jsonContent);
// const jsonContentWKT = WKT.convert(jsonContent.geometries[0]);
const jg = jsonContent.geometries; const jg = jsonContent.geometries;
const newPolygon = []; const newPolygon = [];
for (let i in jg) { for (let i in jg) {
@ -357,7 +326,7 @@ export default {
self.$refs.multipleTable.toggleAllSelection(); self.$refs.multipleTable.toggleAllSelection();
cu.removePoint(); cu.removePoint();
for (let i in dl) { for (let i in dl) {
cu.addPoint(dl[i].lon, dl[i].lat, dl[i].alt); cu.addPoint(dl[i].lng, dl[i].lat, 10);
} }
} }
}); });
@ -378,7 +347,7 @@ export default {
self.$refs.multipleTable.toggleAllSelection(); self.$refs.multipleTable.toggleAllSelection();
cu.removePoint(); cu.removePoint();
for (let i in dl) { for (let i in dl) {
cu.addPoint(dl[i].lon, dl[i].lat, dl[i].alt); cu.addPoint(dl[i].lng, dl[i].lat, 10);
} }
}); });
} }
@ -397,49 +366,45 @@ export default {
cu.removePoint(); cu.removePoint();
if (val.length !== 0) { if (val.length !== 0) {
for (let i in val) { for (let i in val) {
cu.addPoint(val[i].lon, val[i].lat, val[i].alt); cu.addPoint(val[i].lng, val[i].lat, 10);
} }
} }
this.multipleSelection = val; this.multipleSelection = val;
}, },
getSplData() { getSplData() {
getOrderSamples(this.orderId, this.productSubType).then((res) => { getSamplesList(this.orderId).then((res) => {
if (res.code == 200) { if (res.code == 200) {
let rd = res.data; let rd = res.data.list;
for (const i in rd) { if (rd.length > 0) {
rd[i]["hierarchicalIdentification"] = "0"; for (const i in rd) {
// 添加默认样本分层标识
rd[i]["hierarchicalIdentification"] = "0";
}
this.multipleSelection = this.allSampleData = this.simpleData = rd;
this.loading = false;
this.$refs.multipleTable.toggleAllSelection();
let min = Number.MAX_SAFE_INTEGER;
let max = Number.MIN_SAFE_INTEGER;
this.$store.commit("setAltRange", null);
this.allSampleData.forEach((k, v) => {
k.dataTime = this.formatDatetime(k.dataTime);
min = min > k.alt ? k.alt : min;
max = max < k.alt ? k.alt : max;
});
if (this.allSampleData.length > 0) {
this.$store.commit("setAltRange", min + "," + (max + 1));
}
this.simpleDataTotal = this.simpleForm.total = rd.length;
this.smLabel = this.simpleData[0].productSubTypeName;
} }
this.multipleSelection = this.allSampleData = this.simpleData = rd;
this.loading = false;
this.$refs.multipleTable.toggleAllSelection();
let min = Number.MAX_SAFE_INTEGER;
let max = Number.MIN_SAFE_INTEGER;
this.$store.commit("setAltRange", null);
this.allSampleData.forEach((k, v) => {
k.dataTime = this.formatDatetime(k.dataTime);
min = min > k.alt ? k.alt : min;
max = max < k.alt ? k.alt : max;
});
if (this.allSampleData.length > 0) {
this.$store.commit("setAltRange", min + "," + (max + 1));
}
this.simpleDataTotal = this.simpleForm.total = rd.length;
} }
}); });
}, },
deleteSelected(index, simpleData) { deleteSelected(index, simpleData) {
simpleData.splice(index, 1); simpleData.splice(index, 1);
// deleteOrderSamplesByID(sampleId, this.productSubType).then((res) => {
// if (res.code == 200) {
// this.getSplData();
// }
// });
}, },
}, },
computed: { computed: {
productSubTypeName: function () {
return this.configration.subProductName[this.productSubType];
},
globalSampleFun: function () { globalSampleFun: function () {
return this.$store.state.sampleFun; return this.$store.state.sampleFun;
}, },

18
src/components/rtReport/index.vue
View File

@ -234,31 +234,31 @@ export default {
getProductDes() { getProductDes() {
let prodDes = null; let prodDes = null;
switch (this.pdSubType) { switch (this.pdSubType) {
case 2: case 46:
prodDes = "高程值，单位：米"; prodDes = "高程值，单位：米";
break; break;
case 3: case 51:
prodDes = "后向散射系数,单位：dB"; prodDes = "后向散射系数,单位：dB";
break; break;
case 4: case 52:
prodDes = "延迟相位值"; prodDes = "延迟相位值";
break; break;
case 5: case 53:
prodDes = "形变量，单位：米"; prodDes = "形变量，单位：米";
break; break;
case 7: case 38:
prodDes = "土壤含水量"; prodDes = "土壤含水量";
break; break;
case 8: case 49:
prodDes = "土壤盐碱度"; prodDes = "土壤盐碱度";
break; break;
case 9: case 50:
prodDes = "地表粗糙度"; prodDes = "地表粗糙度";
break; break;
case 10: case 48:
prodDes = "植被高度值，单位：米"; prodDes = "植被高度值，单位：米";
break; break;
case 11: case 43:
prodDes = "叶面积指数"; prodDes = "叶面积指数";
break; break;
} }

41
src/config/config.js
View File

@ -33,8 +33,9 @@ const serverUrl = "http://192.168.1.104";
const urlprefix = { const urlprefix = {
pdfUrlPrefix: `${serverUrl}:18085/microwaveData/pdf/`, pdfUrlPrefix: `${serverUrl}:18085/microwaveData/pdf/`,
samePoiImgsUrl: `${serverUrl}:18085/microwaveData/samePoiImgs/`, samePoiImgsUrl: `${serverUrl}:18085/microwaveData/samePoiImgs/`,
geoserverUrl: `${serverUrl}:8087/geoserver/gwc/service/wmts`, geoserverUrl: `http://60.10.61.212:18030/geoserver/gwc/service/wmts`,
otgGeoServerUrl: `${serverUrl}:8087/geoserver/gwc/service/wmts` otgGeoServerUrl: `http://60.10.61.212:18030/geoserver/gwc/service/wmts`,
// otgGeoServerUrl: `${serverUrl}:8087/geoserver/gwc/service/wmts`
}; };
const subProductName = [ const subProductName = [
@ -138,38 +139,38 @@ const funcOpt = [
{ {
name: "随机抽样", name: "随机抽样",
label: "随机抽样", label: "随机抽样",
value: "0", value: "1",
pixelDealFun: [ pixelDealFun: [
{ {
name: "均值法", name: "均值法",
value: "0"
},
{
name: "最邻近法",
value: "1" value: "1"
}, },
{
name: "最邻近法",
value: "6"
},
{ {
name: "克里格法", name: "克里格法",
value: "2" value: "7"
}, },
{ {
name: "块克里格法", name: "块克里格法",
value: "3" value: "9"
}, },
{ {
name: "MSN法", name: "MSN法",
value: "4" value: "10"
} }
] ]
}, },
{ {
name: "分层抽样", name: "分层抽样",
label: "分层抽样", label: "分层抽样",
value: "1", value: "2",
pixelDealFun: [ pixelDealFun: [
{ {
name: "MSN法", name: "MSN法",
value: "4" value: "10"
} }
], ],
children: [ children: [
@ -186,27 +187,27 @@ const funcOpt = [
{ {
name: "等距抽样", name: "等距抽样",
label: "等距抽样", label: "等距抽样",
value: "2", value: "3",
pixelDealFun: [ pixelDealFun: [
{ {
name: "均值法", name: "均值法",
value: "0"
},
{
name: "最邻近法",
value: "1" value: "1"
}, },
{
name: "最邻近法",
value: "6"
},
{ {
name: "克里格法", name: "克里格法",
value: "2" value: "7"
}, },
{ {
name: "块克里格法", name: "块克里格法",
value: "3" value: "9"
}, },
{ {
name: "MSN法", name: "MSN法",
value: "4" value: "10"
} }
] ]
} }

56
src/lib/contract.js
View File

@ -1,36 +1,36 @@
export const productSubTypeVal = { export const productSubTypeVal = {
ACS_ORTHOPHOTO: 1, // 正射产品校验 ACS_ORTHOPHOTO: 45, // 正射产品校验
ACS_DEM: 2, // 高程产品校验 ACS_DEM: 46, // 高程产品校验
ACS_BACKSCATTERINGCOEFFICIENT: 3, // 后向散射系数产品校验 ACS_BACKSCATTERINGCOEFFICIENT: 51, // 后向散射系数产品校验
ACS_ATMOSPHERICDELAYCORRECTION: 4, // 大气延迟校正产品校验 ACS_ATMOSPHERICDELAYCORRECTION: 52, // 大气延迟校正产品校验
ACS_DEFORMATION: 5, // 干涉测量形变产品校验 ACS_DEFORMATION: 53, // 干涉测量形变产品校验
ACS_TYPESOFLANDCOVER: 6, // 地表覆盖类型产品校验 ACS_TYPESOFLANDCOVER: 39, // 地表覆盖类型产品校验
ACS_SOILMOISTURE: 7, // 土壤水分产品校验 ACS_SOILMOISTURE: 38, // 土壤水分产品校验
ACS_SOILSALINITYINVERSION: 8, // 土壤盐碱度产品校验 ACS_SOILSALINITYINVERSION: 49, // 土壤盐碱度产品校验
ACS_SURFACEROUGHNESS: 9, // 地表粗糙度产品校验 ACS_SURFACEROUGHNESS: 50, // 地表粗糙度产品校验
ACS_GROUNDVEGETATIONHEIGHT: 10, // 植被高度产品校验 ACS_GROUNDVEGETATIONHEIGHT: 48, // 植被高度产品校验
ACS_GROUNDLEAFAREAINDEX: 11, // 叶面积指数产品校验 ACS_GROUNDLEAFAREAINDEX: 43, // 叶面积指数产品校验
ACS_VEGETATIONPHENOLOGY: 12 // 植被物候产品校验 ACS_VEGETATIONPHENOLOGY: 47 // 植被物候产品校验
}; };
export const pixelFunVal = { export const pixelFunVal = {
PHM_AVERAGING: 0, // 均值法 PHM_AVERAGING: 1, // 均值法
PHM_NEIGHBOR: 1, // 最邻近法 PHM_NEIGHBOR: 6, // 最邻近法
PHM_POINTKRIGING: 2, // 克里格法 PHM_POINTKRIGING: 7, // 克里格法
PHM_BLOCKKRIGING: 3, // 块克里格法 PHM_BLOCKKRIGING: 9, // 块克里格法
PHM_MSN: 4 // MSN法 PHM_MSN: 10 // MSN法
}; };
export const truthFunVal = { export const truthFunVal = {
ACM_MEANERROR: 0, // 平均误差 ACM_MEANERROR: 4, // 平均误差
ACM_MEANABSOLUTEERROR: 1, // 平均绝对误差 ACM_MEANABSOLUTEERROR: 9, // 平均绝对误差
ACM_RELATIVEERROR: 2, // 相对误差 ACM_RELATIVEERROR: 5, // 相对误差
ACM_MEANRELATIVEERROR: 3, // 平均相对误差 ACM_MEANRELATIVEERROR: 8, // 平均相对误差
ACM_ROOTMANSQUAREERROR: 5, // 均方根误差 ACM_ROOTMANSQUAREERROR: 6, // 均方根误差
ACM_CORRELATIONCOEFFICIENT: 7, // 相关系数 ACM_CORRELATIONCOEFFICIENT: 7, // 相关系数
ACM_ERRORMATRIX: 8, // 误差矩阵（混淆矩阵） ACM_ERRORMATRIX: 12, // 误差矩阵（混淆矩阵）
ACM_OVERALLACCURACY: 9, // 总体分类精度 ACM_OVERALLACCURACY: 14, // 总体分类精度
ACM_KAPPA: 10, // Kappa系数 ACM_KAPPA: 13, // Kappa系数
ACM_MEANABSOLUTERELATIVEERROR: 4, // 平均绝对相对误差 ACM_MEANABSOLUTERELATIVEERROR: 24, // 平均绝对相对误差
ACM_PLANENESSERROR: 6, // 平面中误差 ACM_PLANENESSERROR: 23, // 平面中误差
ACM_REALVALLIST: 11, //真值数组记录 ACM_REALVALLIST: 11, //真值数组记录
ACM_OTGERROR:12, //正射误差记录 ACM_OTGERROR:112, //正射误差记录
}; };

79
src/lib/request-file.js
View File

@ -1,60 +1,39 @@
import axios from 'axios' import axios from "axios";
import { Message } from 'element-ui' 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_FILE_API, // url = base url + request url baseURL: process.env.VUE_APP_FILE_API, // url = base url + request url
// withCredentials: true, // send cookies when cross-domain requests timeout: 5000000 // request timeout
timeout: 5000000 // request timeout });
})
// request interceptor // request interceptor
service.interceptors.request.use( service.interceptors.request.use(
config => { config => {
// do something before request is sent return config;
// if (store.getters.token) { },
// config.headers['X-Token'] = getToken() error => {
// } // do something with request error
return config console.log(error); // for debug
}, return Promise.reject(error);
error => { }
// do something with request error );
console.log(error) // for debug
return Promise.reject(error)
}
)
// response interceptor // response interceptor
service.interceptors.response.use( service.interceptors.response.use(
response => { response => {
const res = response.data const res = response.data;
// if the custom code is not 20000, it is judged as an error. return res;
// if (res.code !== 200) { },
// if(res.code === 500){ error => {
// return res console.log("err" + error); // for debug
// } Message({
// Message({ message: error.message,
// message: res.message || 'Error', type: "error",
// type: 'error', duration: 5 * 1000
// duration: 5 * 1000 });
// }) return Promise.reject(error);
// // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired; }
// if (res.code === 50008 || res.code === 50012 || res.code === 50014) { );
// return Promise.reject(new Error(res.message || 'Error'))
// }
// } else {
return res
// }
},
error => {
console.log('err' + error) // for debug
Message({
message: error.message,
type: 'error',
duration: 5 * 1000
})
return Promise.reject(error)
}
)
export default service export default service;

37
src/lib/request-microwave.js Normal file
View File

@ -0,0 +1,37 @@
import axios from "axios";
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
timeout: 5000000 // request timeout
});
// request interceptor
service.interceptors.request.use(
config => {
return config;
},
error => {
console.log(error); // for debug
return Promise.reject(error);
}
);
service.interceptors.response.use(
response => {
const res = response.data;
return res;
},
error => {
console.log("err" + error); // for debug
Message({
message: error.message,
type: "error",
duration: 5 * 1000
});
return Promise.reject(error);
}
);
export default service;

78
src/lib/request-reality.js
View File

@ -1,60 +1,38 @@
import axios from 'axios' import axios from "axios";
import { Message } from 'element-ui' 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_REALITY_API, // url = base url + request url baseURL: process.env.VUE_APP_REALITY_API, // url = base url + request url
// withCredentials: true, // send cookies when cross-domain requests timeout: 5000000 // request timeout
timeout: 5000000 // request timeout });
})
// request interceptor // request interceptor
service.interceptors.request.use( service.interceptors.request.use(
config => { config => {
// do something before request is sent return config;
// if (store.getters.token) { },
// config.headers['X-Token'] = getToken() error => {
// } console.log(error); // for debug
return config return Promise.reject(error);
}, }
error => { );
// do something with request error
console.log(error) // for debug
return Promise.reject(error)
}
)
// response interceptor // response interceptor
service.interceptors.response.use( service.interceptors.response.use(
response => { response => {
const res = response.data const res = response.data;
// if the custom code is not 20000, it is judged as an error. return res;
// if (res.code !== 200) { },
// if(res.code === 500){ error => {
// return res console.log("err" + error); // for debug
// } Message({
// Message({ message: error.message,
// message: res.message || 'Error', type: "error",
// type: 'error', duration: 5 * 1000
// duration: 5 * 1000 });
// }) return Promise.reject(error);
// // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired; }
// if (res.code === 50008 || res.code === 50012 || res.code === 50014) { );
// return Promise.reject(new Error(res.message || 'Error'))
// }
// } else {
return res
// }
},
error => {
console.log('err' + error) // for debug
Message({
message: error.message,
type: 'error',
duration: 5 * 1000
})
return Promise.reject(error)
}
)
export default service export default service;

78
src/lib/request.js
View File

@ -1,60 +1,38 @@
import axios from 'axios' import axios from "axios";
import { Message } from 'element-ui' 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
// withCredentials: true, // send cookies when cross-domain requests timeout: 5000000 // request timeout
timeout: 5000000 // request timeout });
})
// request interceptor // request interceptor
service.interceptors.request.use( service.interceptors.request.use(
config => { config => {
// do something before request is sent return config;
// if (store.getters.token) { },
// config.headers['X-Token'] = getToken() error => {
// } console.log(error); // for debug
return config return Promise.reject(error);
}, }
error => { );
// do something with request error
console.log(error) // for debug
return Promise.reject(error)
}
)
// response interceptor // response interceptor
service.interceptors.response.use( service.interceptors.response.use(
response => { response => {
const res = response.data const res = response.data;
// if the custom code is not 20000, it is judged as an error. return res;
// if (res.code !== 200) { },
// if(res.code === 500){ error => {
// return res console.log("err" + error); // for debug
// } Message({
// Message({ message: error.message,
// message: res.message || 'Error', type: "error",
// type: 'error', duration: 5 * 1000
// duration: 5 * 1000 });
// }) return Promise.reject(error);
// // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired; }
// if (res.code === 50008 || res.code === 50012 || res.code === 50014) { );
// return Promise.reject(new Error(res.message || 'Error'))
// }
// } else {
return res
// }
},
error => {
console.log('err' + error) // for debug
Message({
message: error.message,
type: 'error',
duration: 5 * 1000
})
return Promise.reject(error)
}
)
export default service export default service;

96
src/lib/variateMap.js
View File

@ -1,18 +1,18 @@
//产品枚举映射 //产品枚举映射
export function productTypeMap(pdtype) { export function productTypeMap(pdtype) {
const pdtypeMap = { const pdtypeMap = {
1: "正射产品", 45: "正射产品",
2: "高程产品", 46: "高程产品",
3: "后向散射系数产品", 51: "后向散射系数产品",
4: "大气延迟校正产品", 52: "大气延迟校正产品",
5: "干涉测量形变产品", 53: "干涉测量形变产品",
6: "地表覆盖类型产品", 39: "地表覆盖类型产品",
7: "土壤水分产品", 38: "土壤水分产品",
8: "土壤盐碱度产品", 49: "土壤盐碱度产品",
9: "地表粗糙度产品", 50: "地表粗糙度产品",
10: "植被高度产品", 48: "植被高度产品",
11: "叶面积指数产品", 43: "叶面积指数产品",
12: "植被物候产品" 47: "植被物候产品"
}; };
if (pdtype == null) return null; if (pdtype == null) return null;
else return pdtypeMap[pdtype]; else return pdtypeMap[pdtype];
@ -21,18 +21,18 @@ export function productTypeMap(pdtype) {
//产品--样本类型映射 //产品--样本类型映射
export function productTypeSplMap(pdtype) { export function productTypeSplMap(pdtype) {
const pdtypeMap = { const pdtypeMap = {
1: "正射样本", 45: "正射样本",
2: "高程样本", 46: "高程样本",
3: "后向散射系数样本", 51: "后向散射系数样本",
4: "大气延迟校正样本", 52: "大气延迟校正样本",
5: "干涉测量形变样本", 53: "干涉测量形变样本",
6: "地表覆盖类型样本", 39: "地表覆盖类型样本",
7: "土壤水分样本", 38: "土壤水分样本",
8: "土壤盐碱度样本", 49: "土壤盐碱度样本",
9: "地表粗糙度样本", 50: "地表粗糙度样本",
10: "植被高度样本", 48: "植被高度样本",
11: "叶面积指数样本", 43: "叶面积指数样本",
12: "植被物候样本" 47: "植被物候样本"
}; };
if (pdtype == null) return null; if (pdtype == null) return null;
else return pdtypeMap[pdtype]; else return pdtypeMap[pdtype];
@ -41,19 +41,19 @@ export function productTypeSplMap(pdtype) {
//真实性检验方法映射 //真实性检验方法映射
export function truthFunctionsMap(truthFun) { export function truthFunctionsMap(truthFun) {
const truthFunMap = { const truthFunMap = {
0: "平均误差", 4: "平均误差",
1: "平均绝对误差", 9: "平均绝对误差",
2: "相对误差", 5: "相对误差",
3: "平均相对误差", 8: "平均相对误差",
4: "平均绝对相对误差", 24: "平均绝对相对误差",
5: "均方根误差", 6: "均方根误差",
6: "平面中误差", 23: "平面中误差",
7: "相关系数", 7: "相关系数",
8: "误差矩阵", 12: "误差矩阵",
9: "总体分类精度", 14: "总体分类精度",
10: "Kappa系数", 13: "Kappa系数",
11: "产品真值", 11: "产品真值",
12: "正射误差列表" 112: "正射误差列表"
}; };
if (truthFun == null) return null; if (truthFun == null) return null;
else return truthFunMap[truthFun]; else return truthFunMap[truthFun];
@ -62,9 +62,9 @@ export function truthFunctionsMap(truthFun) {
// 抽样方法枚举转换 // 抽样方法枚举转换
export function transformSlp(sampleFun) { export function transformSlp(sampleFun) {
const sampleFunMap = { const sampleFunMap = {
"0": "随机抽样", "1": "随机抽样",
"1": "分层抽样", "2": "分层抽样",
"2": "等距抽样" "3": "等距抽样"
}; };
if (sampleFun == null) return null; if (sampleFun == null) return null;
else return sampleFunMap[sampleFun]; else return sampleFunMap[sampleFun];
@ -72,11 +72,11 @@ export function transformSlp(sampleFun) {
// 像元级方法枚举转换 // 像元级方法枚举转换
export function transformPcMethod(pixelDealFun) { export function transformPcMethod(pixelDealFun) {
const pixelDealFunMap = { const pixelDealFunMap = {
"0": "均值法", "1": "均值法",
"1": "最邻近法", "6": "最邻近法",
"2": "克里格法", "7": "克里格法",
"3": "块克里格法", "9": "块克里格法",
"4": "MSN法" "10": "MSN法"
}; };
if (pixelDealFun == null) return null; if (pixelDealFun == null) return null;
else return pixelDealFunMap[pixelDealFun]; else return pixelDealFunMap[pixelDealFun];
@ -84,23 +84,23 @@ export function transformPcMethod(pixelDealFun) {
export const PIXELDEALFUNOPTION = [ export const PIXELDEALFUNOPTION = [
{ {
value: "0", value: "1",
label: "均值法" label: "均值法"
}, },
{ {
value: "1", value: "6",
label: "最邻近法" label: "最邻近法"
}, },
{ {
value: "2", value: "7",
label: "克里格法" label: "克里格法"
}, },
{ {
value: "3", value: "9",
label: "块克里格法" label: "块克里格法"
}, },
{ {
value: "4", value: "10",
label: "MSN法" label: "MSN法"
} }
]; ];

66
src/views/Daichuli/Feedback/Inspection/Report/index.vue
View File

@ -130,28 +130,29 @@
> >
<el-table-column type="index" label="序号" width="80"> <el-table-column type="index" label="序号" width="80">
</el-table-column> </el-table-column>
<el-table-column prop="sampleId" label="样本编号" sortable> <el-table-column prop="samplesId" label="样本编号" sortable>
</el-table-column> </el-table-column>
<el-table-column prop="lon" label="经度"></el-table-column> <el-table-column prop="lng" label="经度"></el-table-column>
<el-table-column prop="lat" label="纬度"></el-table-column> <el-table-column prop="lat" label="纬度"></el-table-column>
<el-table-column prop="alt" label="高度"></el-table-column> <!-- <el-table-column prop="alt" label="高度"></el-table-column> -->
<el-table-column prop="dataTime" label="采样日期" sortable> <el-table-column prop="createTime" label="采样日期" sortable>
<template slot-scope="scope"> <!-- <template slot-scope="scope">
{{ scope.row.dataTime | formatDate }} {{ scope.row.dataTime | formatDate }}
</template> </template> -->
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="addTime" prop="collectDate"
label="预处理时间" label="预处理时间"
sortable sortable
align="center" align="center"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.addTime | formatDate }} {{ scope.row.createTime }}
<!-- {{ scope.row.addTime | formatDate }} -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dataValue" prop="reliability"
label="可信度" label="可信度"
sortable sortable
align="center" align="center"
@ -174,13 +175,21 @@ import QtReport from "@/components/qtReport";
import PdfLoad from "@/components/pdfLoad"; import PdfLoad from "@/components/pdfLoad";
import cu from "@/lib/cesiumUtils"; import cu from "@/lib/cesiumUtils";
import { import {
downloadPdf, // downloadPdf,
updateOrderStage, // updateOrderStage,
updateOrderMsg, // updateOrderMsg,
disOrderStatus, // disOrderStatus,
addReportMsg, // addReportMsg,
exportWord, exportWord,
} from "@/api/pendingOrder"; } from "@/api/pendingOrder";
import {
saveValidationRes,
saveReport,
downloadPdf,
updateOrderStage,
} from "@/api/lang/pendingOrder";
import { productSubTypeVal, truthFunVal } from "@/lib/contract.js"; import { productSubTypeVal, truthFunVal } from "@/lib/contract.js";
import { import {
truthFunctionsMap, truthFunctionsMap,
@ -244,7 +253,7 @@ export default {
const sd = this.sampleData; const sd = this.sampleData;
for (let i in sd) { for (let i in sd) {
cu.addPoint(sd[i].lon, sd[i].lat, sd[i].alt); cu.addPoint(sd[i].lng, sd[i].lat, 10);
} }
if (this.pdSubType === 6 || this.pdSubType === 12) { if (this.pdSubType === 6 || this.pdSubType === 12) {
@ -282,7 +291,7 @@ export default {
init() { init() {
const self = this; const self = this;
const rpm = (self.reportMsg = this.queryParams); const rpm = (self.reportMsg = this.queryParams);
// console.log('sendMsg',rpm); console.log("sendMsg", rpm);
self.realRes = rpm.reportResult; self.realRes = rpm.reportResult;
self.pdSubType = rpm.pdSubType; self.pdSubType = rpm.pdSubType;
const rsl = (self.sampleData = rpm.sampleList); const rsl = (self.sampleData = rpm.sampleList);
@ -318,6 +327,7 @@ export default {
}, },
// 生产报告 // 生产报告
exportPdf(rpm) { exportPdf(rpm) {
console.log("11111111", rpm);
const self = this; const self = this;
const asmo = rpm.orderMsg; const asmo = rpm.orderMsg;
const asmp = rpm.productMsg; const asmp = rpm.productMsg;
@ -381,16 +391,16 @@ export default {
category: category, category: category,
categoryType: productTypeSplMap(self.pdSubType), categoryType: productTypeSplMap(self.pdSubType),
product: productTypeMap(self.pdSubType), product: productTypeMap(self.pdSubType),
orderID: asmo.order_code, orderID: asmo.orderCode,
reportMaker: localStorage.userName, reportMaker: 'DXN',
orderCreateTime: asmo.create_date, orderCreateTime: asmo.createDate,
orderStartTime: crTime.startTime, orderStartTime: crTime.startTime,
orderEndTime: crTime.endTime, orderEndTime: crTime.endTime,
reportCreateTime: asmo.create_date, reportCreateTime: asmo.createDate,
inspectorName: localStorage.userName, inspectorName: 'DXN',
productFileName: asmp.fileName, productFileName: asmp.fileName,
resolution: asmm.resRatio + "", resolution: asmm.resRatio + "",
productCreateTime: asmp.productDate, productCreateTime: asmp.collectDate,
coordinatSeystem: asmm.coordinateSys, coordinatSeystem: asmm.coordinateSys,
sampleTimeRequest: sampleTimeRequest:
asmo.simple_start_time + " - " + asmo.simple_end_time, asmo.simple_start_time + " - " + asmo.simple_end_time,
@ -398,10 +408,10 @@ export default {
sampleCount: rpm.sampleList.length + "", sampleCount: rpm.sampleList.length + "",
// areaLeftUp: asmm.minLon + "," + asmm.maxLat, // areaLeftUp: asmm.minLon + "," + asmm.maxLat,
// areaRightDown: asmm.maxLon + "," + asmm.minLat, // areaRightDown: asmm.maxLon + "," + asmm.minLat,
minLon: asmm.minLon, minLon: asmm.minLon + "",
maxLon: asmm.maxLon, maxLon: asmm.maxLon + "",
minLat: asmm.minLat, minLat: asmm.minLat + "",
maxLat: asmm.maxLat, maxLat: asmm.maxLat + "",
inspectionAlgorithm: iat, inspectionAlgorithm: iat,
sampleList: JSON.stringify(rpm.sampleList), sampleList: JSON.stringify(rpm.sampleList),
inspectionResultList: iatResArr, inspectionResultList: iatResArr,
@ -411,8 +421,8 @@ export default {
otgError: otgError, otgError: otgError,
}; };
const pdfName = productTypeMap(self.pdSubType) + "报告"; const pdfName = productTypeMap(self.pdSubType) + "报告";
const localTiffPath = rpm.tifPath; const localTiffPath = null;
const httpTiffPath = null; const httpTiffPath = rpm.tifPath;
// console.log("1111111", pdfMsg); // console.log("1111111", pdfMsg);
exportWord(pdfMsg, pdfName, localTiffPath, httpTiffPath, psId).then( exportWord(pdfMsg, pdfName, localTiffPath, httpTiffPath, psId).then(
(res) => { (res) => {

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

@ -35,9 +35,6 @@
sortable sortable
align="center" align="center"
> >
<template slot-scope="scope">
{{ scope.row.orderSource | orderSourceFilter }}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="uploadDate" prop="uploadDate"
@ -45,9 +42,6 @@
sortable sortable
align="center" align="center"
> >
<template slot-scope="scope">
{{ scope.row.uploadDate | formatDate }}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="fileName" prop="fileName"
@ -62,9 +56,6 @@
sortable sortable
align="center" align="center"
> >
<template slot-scope="scope">
{{ scope.row.fileSize | transformByte }}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="fileFormat" prop="fileFormat"
@ -112,7 +103,7 @@
<el-form-item label="时间" class="ysjMsg"> <el-form-item label="时间" class="ysjMsg">
<el-input <el-input
class="ysjMsgMrg" class="ysjMsgMrg"
v-model="formatDateStr" v-model="formInline.producedDate"
placeholder="生产时间" placeholder="生产时间"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@ -126,7 +117,6 @@
<el-radio label="3"></el-radio> <el-radio label="3"></el-radio>
<el-radio label="4"></el-radio> <el-radio label="4"></el-radio>
<el-radio label="5"></el-radio> <el-radio label="5"></el-radio>
<!-- <el-radio label="其他"></el-radio> -->
</el-radio-group> </el-form-item </el-radio-group> </el-form-item
><br /> ><br />
<el-form-item label="坐标系统" class="ysjMsg"> <el-form-item label="坐标系统" class="ysjMsg">
@ -175,7 +165,7 @@
:orderId="orderId" :orderId="orderId"
:productSubType="productSubType" :productSubType="productSubType"
ref="otgCorrectionPanel" ref="otgCorrectionPanel"
v-if="productSubType === 1" v-if="productSubType === 45"
></OtgCorrection> ></OtgCorrection>
<!-- 地表覆盖 --> <!-- 地表覆盖 -->
<Qualitative <Qualitative
@ -189,10 +179,9 @@
:orderId="orderId" :orderId="orderId"
:productSubType="productSubType" :productSubType="productSubType"
ref="qualitativePanel" ref="qualitativePanel"
v-else-if="productSubType === 6 || productSubType === 12" v-else-if="productSubType === 39 || productSubType === 47"
></Qualitative> ></Qualitative>
<!-- 土壤水份等 --> <!-- 土壤水份等 -->
<!-- <SoilMositure :sampleFun="sampleFun" :pixelFun="pixelFun" :pixelNum="pixelNum" :geoWorkSpace="geoWorkSpace" :geoLayerName="geoLayerName" :orderId="orderId" @sendPixelFun="getCldParams" v-else></SoilMositure> -->
<SoilMositure <SoilMositure
:sampleFun="sampleFun" :sampleFun="sampleFun"
:sampleCldFun="sampleCldFun" :sampleCldFun="sampleCldFun"
@ -259,15 +248,6 @@
<el-option label="" value=""></el-option> <el-option label="" value=""></el-option>
<el-option <el-option
label="均值法" label="均值法"
value="0"
v-if="
(globalSampleFun !== 1 && globalSampleFun !== '1') ||
globalSampleFun === null ||
globalSampleFun === ''
"
></el-option>
<el-option
label="最邻近法"
value="1" value="1"
v-if=" v-if="
(globalSampleFun !== 1 && globalSampleFun !== '1') || (globalSampleFun !== 1 && globalSampleFun !== '1') ||
@ -275,9 +255,18 @@
globalSampleFun === '' globalSampleFun === ''
" "
></el-option> ></el-option>
<el-option
label="最邻近法"
value="6"
v-if="
(globalSampleFun !== 1 && globalSampleFun !== '1') ||
globalSampleFun === null ||
globalSampleFun === ''
"
></el-option>
<el-option <el-option
label="克里格法" label="克里格法"
value="2" value="7"
v-if=" v-if="
(globalSampleFun !== 1 && globalSampleFun !== '1') || (globalSampleFun !== 1 && globalSampleFun !== '1') ||
globalSampleFun === null || globalSampleFun === null ||
@ -286,14 +275,14 @@
></el-option> ></el-option>
<el-option <el-option
label="块克里格法" label="块克里格法"
value="3" value="9"
v-if=" v-if="
(globalSampleFun !== 1 && globalSampleFun !== '1') || (globalSampleFun !== 1 && globalSampleFun !== '1') ||
globalSampleFun === null || globalSampleFun === null ||
globalSampleFun === '' globalSampleFun === ''
" "
></el-option> ></el-option>
<el-option label="MSN法" value="4"></el-option> <el-option label="MSN法" value="10"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -321,16 +310,6 @@
> >
</el-option> </el-option>
</el-select> </el-select>
<!-- <div class="selectBox" :model="formInline">
<span
v-for="(index, item) in formInline.truthCheckFun"
:key="index"
:label="item"
:value="item"
class="selTxt"
>{{ truthCheckFunOpt[item].label }}</span
>
</div> -->
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@ -354,11 +333,14 @@ import SoilMositure from "@/components/ration/soilMoisture/index.vue";
import OtgCorrection from "@/components/ration/otgCorrection/index.vue"; import OtgCorrection from "@/components/ration/otgCorrection/index.vue";
import Qualitative from "@/components/ration/qualitative/index.vue"; import Qualitative from "@/components/ration/qualitative/index.vue";
import { import {
getAnalyseMethod,
delSampleData,
upDateAnalyseMethod,
checkReality, checkReality,
addConnectSamples, exportWord,
updateOrderMsg, } from "@/api/lang/pendingOrder";
updateFeature, import qs from "qs";
} from "@/api/pendingOrder";
import { productSubTypeVal, truthFunVal } from "@/lib/contract.js"; import { productSubTypeVal, truthFunVal } from "@/lib/contract.js";
export default { export default {
@ -368,47 +350,6 @@ export default {
OtgCorrection, OtgCorrection,
Qualitative, Qualitative,
}, },
filters: {
orderSourceFilter(orderSource) {
const orderSourceMap = {
0: "用户上传",
1: "历史上传",
2: "平台共享",
};
return orderSourceMap[orderSource];
},
transformByte(size) {
if (!size) {
return "0B";
}
var num = 1024.0;
if (size < num) {
return size + "B";
}
if (size < Math.pow(num, 2)) {
return (size / num).toFixed(2) + "K";
}
if (size < Math.pow(num, 3)) {
return (size / Math.pow(num, 2)).toFixed(2) + "M";
}
if (size < Math.pow(num, 4)) {
return (size / Math.pow(num, 3)).toFixed(2) + "G";
}
return (size / Math.pow(num, 4)).toFixed(2) + "T"; // T
},
formatDate(inputTime) {
if (!inputTime && typeof inputTime !== "number") {
return "";
}
var localTime = "";
inputTime = new Date(inputTime);
const offset = new Date().getTimezoneOffset();
localTime = new Date(inputTime - offset * 60000).toISOString();
localTime = localTime.substr(0, localTime.lastIndexOf("."));
localTime = localTime.replace("T", " ");
return localTime;
},
},
created() { created() {
if ( if (
Object.keys(this.$route.params).length > 0 && Object.keys(this.$route.params).length > 0 &&
@ -469,17 +410,17 @@ export default {
initOrderPMsg() { initOrderPMsg() {
let self = this; let self = this;
const am = (self.allMsg = this.queryParams); const am = (self.allMsg = this.queryParams);
// console.log("传输信息1", self.allMsg);
self.userId = localStorage.userId; self.userId = localStorage.userId;
const om = (self.orderMsg = self.allMsg.orderMsg); const om = (self.orderMsg = self.allMsg.orderMsg);
self.orderId = om.id;
const pdType = om.product_subclass_id; self.orderId = om.orderId;
const valMethodIds = om.validation_method_id; const pdType = om.productSubClassId;
this.productSubType = pdType; this.productSubType = pdType;
self.formInline = am.metaMsg; self.formInline = am.metaMsg;
self.orderData = am.orderData; self.orderData = am.orderData;
self.pixelNum = am.metaMsg.resRatio; self.pixelNum = am.metaMsg.resRatio;
self.geoLayerPos = [ self.geoLayerPos = [
am.metaMsg.minLon, am.metaMsg.minLon,
am.metaMsg.minLat, am.metaMsg.minLat,
@ -489,25 +430,44 @@ export default {
const pm = (this.productMsg = am.productMsg); const pm = (this.productMsg = am.productMsg);
self.geoWorkSpace = pm.geoWorkspace; self.geoWorkSpace = pm.geoWorkspace;
self.geoLayerName = pm.layerName; self.geoLayerName = pm.geoLayerName;
self.tifPath = pm.tifPath; self.tifPath = pm.ftpPath;
if (valMethodIds !== null) { // 赋值真实性检验方法
self.formInline.truthCheckFun = JSON.parse(valMethodIds); getAnalyseMethod(self.orderId).then((res) => {
if (self.formInline.truthCheckFun.length !== []) self.truthFun = true; // console.log('真实性检验',res);
if (res.code === 200) {
let truthFun = res.data.default;
if (res.data.selected.length !== 0) truthFun = res.data.selected;
if (truthFun.length !== 0) {
const tfArr = [];
for (let i in truthFun) {
tfArr.push(truthFun[i].id);
}
self.formInline.truthCheckFun = tfArr;
self.truthFun = true;
}
}
});
// 赋值像元级处理方法
if (om.processMethods !== null) {
const pm = om.processMethods;
const pmVal = Object.keys(pm)[0];
self.pixelFun = pmVal.toString();
} }
if (om.process_method_id !== null)
self.pixelFun = om.process_method_id.toString();
if (this.pixelFun !== "") { if (this.pixelFun !== "") {
this.pdShow = true; this.pdShow = true;
this.$store.commit("setPixelFun", this.pixelFun); this.$store.commit("setPixelFun", this.pixelFun);
} }
if (om.sampling_method_id !== null) // 赋值样本抽样方法
self.sampleFun = om.sampling_method_id + ""; if (om.samplingMethodId !== null)
self.sampleFun = om.samplingMethodId + "";
if (this.sampleFun !== "") { if (this.sampleFun !== "") {
this.$store.commit("setSampleFun", this.sampleFun); this.$store.commit("setSampleFun", this.sampleFun);
} }
if (om.samplingMethodCldId !== null) { if (om.samplingMethodCldId !== null) {
self.sampleCldFun = om.samplingMethodCldId + ""; self.sampleCldFun = om.samplingMethodCldId + "";
} }
@ -519,10 +479,6 @@ export default {
return "background:#FFFFFF"; return "background:#FFFFFF";
} }
}, },
// getCldParams(msg){
// this.pixelFun = msg.funId;
// this.sampleList = msg.splList;
// },
todaichuli() { todaichuli() {
this.$router.push(this.configration.path.daichuli); this.$router.push(this.configration.path.daichuli);
}, },
@ -534,6 +490,7 @@ export default {
var smpVal = undefined; var smpVal = undefined;
var featureMapData = []; var featureMapData = [];
const pdType = this.productSubType; const pdType = this.productSubType;
if (pdType === productSubTypeVal.ACS_ORTHOPHOTO) { if (pdType === productSubTypeVal.ACS_ORTHOPHOTO) {
smpVal = this.$refs.otgCorrectionPanel; smpVal = this.$refs.otgCorrectionPanel;
} else if ( } else if (
@ -545,12 +502,15 @@ export default {
} else { } else {
smpVal = this.$refs.soilMositurePanel; smpVal = this.$refs.soilMositurePanel;
} }
this.sampleList = smpVal.multipleSelection; this.sampleList = smpVal.multipleSelection;
// console.log(this.pixelFun,this.sampleList,featureMapData);
if (featureMapData !== [] || featureMapData.length !== 0) if (featureMapData !== [] || featureMapData.length !== 0)
this.updateCoverType(featureMapData); this.updateCoverType(featureMapData);
const orderId = this.orderMsg.id;
const tcf = this.formInline.truthCheckFun.map((k) => Number(k)); const orderId = this.orderId;
const tcf = this.formInline.truthCheckFun;
if (this.sampleList.length === 0) { if (this.sampleList.length === 0) {
this.$message.error("请选择样本数据"); this.$message.error("请选择样本数据");
return false; return false;
@ -559,16 +519,23 @@ export default {
this.$message.error("真实性检验方法"); this.$message.error("真实性检验方法");
return false; return false;
} }
this.checkRealityWait = true;
// 关联的样本数据入库 // 关联的样本数据入库
this.addCotSamples(this.sampleList, pdType); // const allSampleData = smpVal.allSampleData;
// console.log('传输报告信息',this.sampleList) // this.addCotSamples(this.sampleList,allSampleData,orderId)
//更新真实性检验方法
// this.updateTruthFun(orderId, tcf);
this.checkRealityWait = true;
// 真实性校验方法 // 真实性校验方法
var formData = new FormData(); var formData = new FormData();
formData.append("orderId", orderId); //订单ID formData.append("orderId", orderId); //订单ID
formData.append("productType", this.productSubType); //产品类型 formData.append("productType", this.productSubType); //产品类型
formData.append("isHttpUrl", false); //产品路径 formData.append("isHttpUrl", true); //产品路径
formData.append("dataPath", this.tifPath); //产品路径 // formData.append("dataPath", this.tifPath); //产品路径
formData.append(
"dataPath",
"http://60.10.61.212:18030/inspection/files/4be870ee1a6b458da6c0201f9f217a091652339249444.tif"
); //产品路径
formData.append("samples", JSON.stringify(this.sampleList)); //样本数据 formData.append("samples", JSON.stringify(this.sampleList)); //样本数据
if (this.pixelFun !== "") if (this.pixelFun !== "")
formData.append("pixelHandleType", this.pixelFun); //像元级处理方法（正射校正产品不需要） formData.append("pixelHandleType", this.pixelFun); //像元级处理方法（正射校正产品不需要）
@ -610,19 +577,26 @@ export default {
} }
}); });
}, },
addCotSamples(samplesList, allSampleData, orderId) {
addCotSamples(samplesList, pdType) { for (let i in samplesList) {
// console.log(samplesList,pdType) allSampleData = allSampleData.filter(function (o) {
// const asForm = new FormData(); return o.id !== samplesList[i].id;
// asForm.append("sampleList", JSON.stringify(samplesList)); });
// asForm.append("pdType", pdType); }
// addConnectSamples(asForm).then((res) => { const isDel = [];
// // console.log(res) for (let i in allSampleData) {
// }); isDel.push(allSampleData[i].id);
updateOrderMsg({ }
id: this.orderMsg.id, const dsForm = new FormData();
sample: JSON.stringify(samplesList), dsForm.append("orderId", orderId);
}); dsForm.append("idList", isDel);
delSampleData(dsForm);
},
// 更新真实性检验方法
updateTruthFun(orderId, tcf) {
upDateAnalyseMethod(
qs.stringify({ list: tcf, orderId: orderId }, { indices: false })
);
}, },
updateCoverType(featureMapData) { updateCoverType(featureMapData) {
for (let i in featureMapData) { for (let i in featureMapData) {
@ -630,7 +604,7 @@ export default {
if (fi.typeIdKg !== null) { if (fi.typeIdKg !== null) {
const fParams = new FormData(); const fParams = new FormData();
fParams.append("coverId", fi.id); fParams.append("coverId", fi.id);
fParams.append("kgTypeId", fi.typeIdKg); fParams.append("kgTypeId", Number(fi.typeIdKg));
fParams.append("kgTypeName", fi.typeNameKg); fParams.append("kgTypeName", fi.typeNameKg);
updateFeature(fParams); updateFeature(fParams);
} }
@ -646,38 +620,38 @@ export default {
const tf = truthFunVal; const tf = truthFunVal;
if (opt === pst.ACS_ORTHOPHOTO) { if (opt === pst.ACS_ORTHOPHOTO) {
this.truthCheckFunOpt = [ this.truthCheckFunOpt = [
{ value: tf.ACM_MEANERROR + "", label: "平均误差" }, { value: tf.ACM_MEANERROR, label: "平均误差" },
{ value: tf.ACM_MEANABSOLUTEERROR + "", label: "平均绝对误差" }, { value: tf.ACM_MEANABSOLUTEERROR, label: "平均绝对误差" },
{ value: tf.ACM_RELATIVEERROR + "", label: "相对误差" }, { value: tf.ACM_RELATIVEERROR, label: "相对误差" },
{ value: tf.ACM_MEANRELATIVEERROR + "", label: "平均相对误差" }, { value: tf.ACM_MEANRELATIVEERROR, label: "平均相对误差" },
{ {
value: tf.ACM_MEANABSOLUTERELATIVEERROR + "", value: tf.ACM_MEANABSOLUTERELATIVEERROR,
label: "平均绝对相对误差", label: "平均绝对相对误差",
}, },
{ value: tf.ACM_ROOTMANSQUAREERROR + "", label: "均方根误差" }, { value: tf.ACM_ROOTMANSQUAREERROR, label: "均方根误差" },
{ value: tf.ACM_PLANENESSERROR + "", label: "平面中误差" }, { value: tf.ACM_PLANENESSERROR, label: "平面中误差" },
]; ];
} else if ( } else if (
opt === pst.ACS_TYPESOFLANDCOVER || opt === pst.ACS_TYPESOFLANDCOVER ||
opt === pst.ACS_VEGETATIONPHENOLOGY opt === pst.ACS_VEGETATIONPHENOLOGY
) { ) {
this.truthCheckFunOpt = [ this.truthCheckFunOpt = [
{ value: tf.ACM_ERRORMATRIX + "", label: "误差矩阵" }, { value: tf.ACM_ERRORMATRIX, label: "误差矩阵" },
{ value: tf.ACM_OVERALLACCURACY + "", label: "总体分类精度" }, { value: tf.ACM_OVERALLACCURACY, label: "总体分类精度" },
{ value: tf.ACM_KAPPA + "", label: "Kappa系数" }, { value: tf.ACM_KAPPA, label: "Kappa系数" },
]; ];
} else { } else {
this.truthCheckFunOpt = [ this.truthCheckFunOpt = [
{ value: tf.ACM_MEANERROR + "", label: "平均误差" }, { value: tf.ACM_MEANERROR, label: "平均误差" },
{ value: tf.ACM_MEANABSOLUTEERROR + "", label: "平均绝对误差" }, { value: tf.ACM_MEANABSOLUTEERROR, label: "平均绝对误差" },
{ value: tf.ACM_RELATIVEERROR + "", label: "相对误差" }, { value: tf.ACM_RELATIVEERROR, label: "相对误差" },
{ value: tf.ACM_MEANRELATIVEERROR + "", label: "平均相对误差" }, { value: tf.ACM_MEANRELATIVEERROR, label: "平均相对误差" },
{ {
value: tf.ACM_MEANABSOLUTERELATIVEERROR + "", value: tf.ACM_MEANABSOLUTERELATIVEERROR,
label: "平均绝对相对误差", label: "平均绝对相对误差",
}, },
{ value: tf.ACM_ROOTMANSQUAREERROR + "", label: "均方根误差" }, { value: tf.ACM_ROOTMANSQUAREERROR, label: "均方根误差" },
{ value: tf.ACM_CORRELATIONCOEFFICIENT + "", label: "相关系数" }, { value: tf.ACM_CORRELATIONCOEFFICIENT, label: "相关系数" },
]; ];
} }
}, },
@ -695,27 +669,13 @@ export default {
computed: { computed: {
hasPixelFun: function () { hasPixelFun: function () {
return ( return (
this.productSubType !== 1 && this.productSubType !== 45 &&
this.productSubType !== 6 && this.productSubType !== 39 &&
this.productSubType !== 12 this.productSubType !== 47
); );
}, },
formatDateStr: function () {
let inputTime = this.formInline.producedDate;
if (!inputTime) {
//&& typeof inputTime !== 'number'){
return "";
}
var localTime = "";
inputTime = new Date(inputTime).getTime();
const offset = new Date().getTimezoneOffset();
localTime = new Date(inputTime - offset * 60000).toISOString();
localTime = localTime.substr(0, localTime.lastIndexOf("."));
localTime = localTime.replace("T", " ");
return localTime;
},
globalSampleFun: function () { globalSampleFun: function () {
if (this.allMsg.orderMsg.process_method_id == null) { if (this.allMsg.orderMsg.processMethods == null) {
this.pixelFun = ""; this.pixelFun = "";
} }
return this.$store.state.sampleFun; return this.$store.state.sampleFun;

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

@ -30,14 +30,8 @@
width="180" width="180"
align="center" align="center"
> >
<template slot-scope="scope">
{{ scope.row.orderSource | orderSourceFilter }}
</template>
</el-table-column> </el-table-column>
<el-table-column prop="uploadDate" label="提交时间" align="center"> <el-table-column prop="uploadDate" label="提交时间" align="center">
<template slot-scope="scope">
{{ scope.row.uploadDate | formatDate }}
</template>
</el-table-column> </el-table-column>
<el-table-column prop="fileName" label="文件名" align="center"> <el-table-column prop="fileName" label="文件名" align="center">
</el-table-column> </el-table-column>
@ -47,9 +41,6 @@
sortable sortable
align="center" align="center"
> >
<template slot-scope="scope">
{{ scope.row.fileSize | transformByte }}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="fileFormat" prop="fileFormat"
@ -96,7 +87,7 @@
<el-form-item label="时间" class="ysjMsg" prop="producedDate"> <el-form-item label="时间" class="ysjMsg" prop="producedDate">
<el-input <el-input
class="ysjMsgMrg" class="ysjMsgMrg"
v-model="formatDateStr" v-model="formInline.producedDate"
placeholder="生产时间" placeholder="生产时间"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@ -153,7 +144,7 @@
@removeLayer="removeLayer" @removeLayer="removeLayer"
@addLayer="addLayer" @addLayer="addLayer"
@removeSample="removeSplData" @removeSample="removeSplData"
@addSample="getSplData" @addSample="getSqlData"
></product-info> ></product-info>
<div class="preview"> <div class="preview">
<div <div
@ -161,12 +152,6 @@
@click="pickValue" @click="pickValue"
style="overflow: hidden; position: relative" style="overflow: hidden; position: relative"
></div> ></div>
<!-- <div v-if="shadeIsShow" class="shade" @click="enterPreview">
<svg aria-hidden="true" width="22" height="22" focusable="false" data-prefix="fas" data-icon="hand-pointer" class="svg-inline--fa fa-hand-pointer fa-w-14 fa-lg " role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512">
<path fill="currentColor" d="M448 240v96c0 3.084-.356 6.159-1.063 9.162l-32 136C410.686 499.23 394.562 512 376 512H168a40.004 40.004 0 0 1-32.35-16.473l-127.997-176c-12.993-17.866-9.043-42.883 8.822-55.876 17.867-12.994 42.884-9.043 55.877 8.823L104 315.992V40c0-22.091 17.908-40 40-40s40 17.909 40 40v200h8v-40c0-22.091 17.908-40 40-40s40 17.909 40 40v40h8v-24c0-22.091 17.908-40 40-40s40 17.909 40 40v24h8c0-22.091 17.908-40 40-40s40 17.909 40 40zm-256 80h-8v96h8v-96zm88 0h-8v96h8v-96zm88 0h-8v96h8v-96z"></path>
</svg>
点击进入
</div> -->
</div> </div>
</div> </div>
@ -174,7 +159,7 @@
<div class="box1"> <div class="box1">
<span class="sp1"></span <span class="sp1"></span
><span class="sp2">{{ ><span class="sp2">{{
orderMsg.product_subclass_id == 6 orderMsg.productSubClassId == 39
? "地表覆盖类型表" ? "地表覆盖类型表"
: "植被物候类型表" : "植被物候类型表"
}}</span> }}</span>
@ -282,16 +267,14 @@
<script> <script>
import cu from "@/lib/cesiumUtils"; import cu from "@/lib/cesiumUtils";
import { import {
getProductMsg, getOrderMsg,
getProductMetaMsg, getPendingProductMsg,
getCoverTypes,
orderFeedback, orderFeedback,
updateOrderMsg,
disOrderStatus,
updateOrderStage, updateOrderStage,
getOrderSamples, getSamplesList,
downloadPdf, } from "@/api/lang/pendingOrder";
} from "@/api/pendingOrder"; import { productSubTypeVal } from "@/lib/contract.js";
import qs from "qs"; import qs from "qs";
import ProductInfo from "../../../components/productInfo/index"; import ProductInfo from "../../../components/productInfo/index";
@ -316,54 +299,13 @@ export default {
} }
document.body.scrollTop = 0; document.body.scrollTop = 0;
this.initOrderMsg(); this.initOrderMsg();
this.getSplData();
},
filters: {
orderSourceFilter(orderSource) {
const orderSourceMap = {
0: "用户上传",
1: "历史上传",
2: "平台共享",
};
return orderSourceMap[orderSource];
},
transformByte(size) {
if (!size) {
return "0B";
}
var num = 1024.0;
if (size < num) {
return size + "B";
}
if (size < Math.pow(num, 2)) {
return (size / num).toFixed(2) + "K";
}
if (size < Math.pow(num, 3)) {
return (size / Math.pow(num, 2)).toFixed(2) + "M";
}
if (size < Math.pow(num, 4)) {
return (size / Math.pow(num, 3)).toFixed(2) + "G";
}
return (size / Math.pow(num, 4)).toFixed(2) + "T"; // T
},
formatDate(inputTime) {
if (!inputTime && typeof inputTime !== "number") {
return "";
}
var localTime = "";
inputTime = new Date(inputTime);
const offset = new Date().getTimezoneOffset();
localTime = new Date(inputTime - offset * 60000).toISOString();
localTime = localTime.substr(0, localTime.lastIndexOf("."));
localTime = localTime.replace("T", " ");
return localTime;
},
}, },
data() { data() {
return { return {
queryParams: null, queryParams: null,
orderMsg: "", orderMsg: "",
userId: null, userId: null,
orderId: null,
productMsg: "", productMsg: "",
pageshow: true, pageshow: true,
isShow: false, isShow: false,
@ -437,114 +379,77 @@ export default {
], ],
workSpace: null, workSpace: null,
layerName: null, layerName: null,
shadeIsShow: true, shadeIsShow: true,
tempPos: null, tempPos: null,
}; };
}, },
computed: {
formatDateStr: function () {
let inputTime = this.formInline.producedDate;
if (!inputTime) {
//&& typeof inputTime !== 'number'){
return "";
}
var localTime = "";
inputTime = new Date(inputTime).getTime();
const offset = new Date().getTimezoneOffset();
localTime = new Date(inputTime - offset * 60000).toISOString();
localTime = localTime.substr(0, localTime.lastIndexOf("."));
localTime = localTime.replace("T", " ");
return localTime;
},
},
methods: { methods: {
enterPreview() {
// cu.initCesium("PendPreview");
// this.initOrderMsg();
const res = this.tempPos;
cu.flyToLayerRect(
res.boundBoxMinX,
res.boundBoxMinY,
res.boundingBoxMaxX,
res.boundBoxMaxY
);
this.getSplData();
this.shadeIsShow = false;
},
initOrderMsg() { initOrderMsg() {
const self = this; const self = this;
const om = (self.orderMsg = this.queryParams); const orderId = (self.orderId = this.$route.query.orderId);
// console.log("11111111", om); self.userId = this.$route.query.userId;
this.userId = Number(localStorage.userId); getOrderMsg(orderId).then((res) => {
const orderId = self.orderMsg.id, if (res.code === 200) {
pdType = self.orderMsg.product_subclass_id, self.orderMsg = res.data;
pdUId = self.orderMsg.product_upload_id; console.log("11111111", res.data);
getProductMsg(qs.stringify({ productId: pdUId })).then((res) => { // const psId = res.data.productSubClassId;
// console.log(res[0]) this.getSqlData();
if (res || res.length !== 0) {
const r = res[0]; getPendingProductMsg(orderId).then((res) => {
this.tifPath = r.tifPath; if (res.code === 200) {
sessionStorage.setItem("tifPath", r.tifPath); const pm = (self.productMsg = res.data);
self.productMsg = r; const om = self.orderMsg;
self.orderData = []; // 订单基本信息
self.orderData.push({ self.orderData = [];
orderCode: om.order_code, self.orderData.push({
orderSource: om.order_resource, orderCode: om.orderCode,
uploadDate: om.create_date, orderSource: om.orderResourceName,
fileName: r.fileName, uploadDate: om.createDate,
fileSize: r.fileSize, fileName: pm.fileName,
fileFormat: r.fileFormat, fileSize: pm.fileSize,
}); fileFormat: pm.fileFormat,
getProductMetaMsg(qs.stringify({ dataPath: r.tifPath })).then( });
(res) => { const minLat = parseFloat(Number(pm.minLatitude).toFixed(8));
if (res !== null) { const maxLat = parseFloat(Number(pm.maxLatitude).toFixed(8));
self.formInline = { const minLon = parseFloat(Number(pm.minLongitude).toFixed(8));
satellite: om.satellite_name, const maxLon = parseFloat(Number(pm.maxLongitude).toFixed(8));
load: om.satellite_load_name, // 元数据信息
resRatio: self.formInline = {
res.imageResolution > 0.01 satellite: om.satelliteName,
? res.imageResolution load: om.satelliteLoadName,
: (res.imageResolution * 111194.926).toFixed(2) + "米", producedDate: pm.collectDate,
coordinateSys: res.coordinateSystem, proLevel: om.productLevel + "",
minLat: res.boundBoxMinY.toFixed(8), resRatio:
maxLat: res.boundBoxMaxY.toFixed(8), pm.productSpaceResolution > 0.01
minLon: res.boundBoxMinX.toFixed(8), ? pm.productSpaceResolution + "米"
maxLon: res.boundingBoxMaxX.toFixed(8), : (pm.productSpaceResolution * 111194.926).toFixed(2) +
centerLon: res.centerPosition.x, "米",
centerLat: res.centerPosition.y, coordinateSys: pm.coordinateSystem,
producedDate: r.productDate, minLat: minLat,
proLevel: r.productLevel + "", maxLat: maxLat,
}; minLon: minLon,
//cu.flyToLayer(res.centerPosition.x,res.centerPosition.y) maxLon: maxLon,
// this.tempPos = res; };
cu.flyToLayerRect( // 加载geoserver
res.boundBoxMinX, const geoWS = pm.geoWorkspace;
res.boundBoxMinY, const geoLN = pm.geoLayerName;
res.boundingBoxMaxX, this.workSpace = geoWS;
res.boundBoxMaxY this.layerName = geoLN;
);
cu.addlayer(geoWS, geoLN);
cu.flyToLayerRect(minLon, minLat, maxLon, maxLat);
const proSubId = om.productSubClassId;
// 加载地物关联信息
if (proSubId === 39 || proSubId === 47) {
self.groudClassShow = true;
self.groudClassData = om.landCoverTypeVOList;
} }
} }
); });
const geoWS = r.geoWorkspace;
const geoLN = r.layerName;
this.workSpace = geoWS;
this.layerName = geoLN;
cu.addlayer(geoWS, geoLN);
} }
}); });
if (pdType === 6 || pdType === 12) {
self.groudClassShow = true;
getCoverTypes(orderId).then((res) => {
if (res.msg === "操作成功") {
self.groudClassData = res.data;
}
});
}
}, },
inspection() { inspection() {
// this.pageshow=false
let param = { let param = {
userId: this.userId, userId: this.userId,
orderMsg: this.orderMsg, orderMsg: this.orderMsg,
@ -637,29 +542,34 @@ export default {
}); });
}, },
// 获取样本 // 获取样本
getSplData() { getSqlData() {
getOrderSamples(this.orderMsg.id, this.orderMsg.product_subclass_id).then( const psid = this.orderMsg.productSubClassId;
(res) => { getSamplesList(this.orderId).then((res) => {
if (res.code == 200) { if (res.code == 200) {
const sp = res.data; const sp = res.data.list;
if (sp.length === 0) { console.log(sp);
this.$message({ if (sp.length === 0) {
type: "warning", this.$message({
message: "没有样本数据", type: "warning",
}); message: "没有样本数据",
} else { });
cu.removePoint(); } else {
cu.removePoint();
if (psid === productSubTypeVal.ACS_ORTHOPHOTO) {
for (let i in sp) { for (let i in sp) {
cu.addPoint(sp[i].lon, sp[i].lat, sp[i].alt); cu.addPoint(sp[i].measureLong, sp[i].measureLat, 10);
}
} else {
for (let i in sp) {
cu.addPoint(sp[i].lng, sp[i].lat, 10);
} }
} }
} }
} }
); });
}, },
// 下载产品数据 // 下载产品数据
downLoadPro() { downLoadPro() {
// console.log(this.productMsg);
const zipPath = this.productMsg.filePath; const zipPath = this.productMsg.filePath;
if (zipPath !== null || zipPath !== undefined) { if (zipPath !== null || zipPath !== undefined) {
const pdfName = zipPath.substr(zipPath.lastIndexOf("/") + 1); //截取文件名称字符串 const pdfName = zipPath.substr(zipPath.lastIndexOf("/") + 1); //截取文件名称字符串
@ -674,28 +584,6 @@ export default {
} else { } else {
location.href = zipPath; location.href = zipPath;
} }
// downloadPdf(zipPath).then((res) => {
// // console.log(res);
// if (res.size > 0) {
// const content = res;
// const blob = new Blob([content]);
// const fileName = pdfName;
// if ("download" in document.createElement("a")) {
// // 非IE下载
// const elink = document.createElement("a");
// elink.download = fileName;
// elink.style.display = "none";
// elink.href = URL.createObjectURL(blob);
// document.body.appendChild(elink);
// elink.click();
// URL.revokeObjectURL(elink.href); // 释放URL 对象
// document.body.removeChild(elink);
// } else {
// // IE10+下载
// navigator.msSaveBlob(blob, fileName);
// }
// }
// });
} }
}, },
pickValue() { pickValue() {

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

@ -147,16 +147,6 @@ export default {
localTime = localTime.replace("T", " "); localTime = localTime.replace("T", " ");
return localTime; return localTime;
}, },
userIdFilter(userId) {
const userIdMap = {
1: "默认",
2: "测试员",
3: "陈鹏",
4: "卢慧龙",
5: "郜琪",
};
return userIdMap[userId];
},
}, },
data() { data() {
return { return {
@ -198,18 +188,19 @@ export default {
}, },
changePage(orderMsg) { changePage(orderMsg) {
// this.$router.push("/orderUnprocessed"); // this.$router.push("/orderUnprocessed");
localStorage.setItem( this.$router.push("/orderUnprocessed?orderId=149756&userId=ZZX000011");
this.configration.path.daichuli, // localStorage.setItem(
JSON.stringify(orderMsg) // this.configration.path.daichuli,
); // JSON.stringify(orderMsg)
updateOrderStatus(orderMsg.id).then((res) => { // );
if (res?.code === 401) { // updateOrderStatus(orderMsg.id).then((res) => {
this.$message.warning(res.msg); // if (res?.code === 401) {
return false; // this.$message.warning(res.msg);
} else { // return false;
this.$router.push({ name: "订单反馈", params: orderMsg }); // } else {
} // this.$router.push({ name: "订单反馈", params: orderMsg });
}); // }
// });
}, },
}, },
}; };

14
vue.config.js
View File

@ -21,15 +21,21 @@ module.exports = {
open: false, open: false,
proxy: { proxy: {
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target:'http://192.168.1.104:8086/macApi', target: "http://60.10.61.212:18030",
// target: "http://211.157.180.211:8086/macApi",
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "" ["^" + process.env.VUE_APP_BASE_API]: ""
} }
}, },
[process.env.VUE_APP_MICROWAVE_API]: {
target: "http://192.168.1.104:8086/macApi",
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_MICROWAVE_API]: ""
}
},
[process.env.VUE_APP_REALITY_API]: { [process.env.VUE_APP_REALITY_API]: {
target:'http://192.168.1.104:18092/microwave', target: "http://192.168.1.104:18092/microwave",
// target: "http://211.157.180.211:18092/microwave", // target: "http://211.157.180.211:18092/microwave",
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
@ -37,7 +43,7 @@ module.exports = {
} }
}, },
[process.env.VUE_APP_FILE_API]: { [process.env.VUE_APP_FILE_API]: {
target:'http://192.168.1.104:18093/file', target: "http://192.168.1.104:18093/file",
// target: "http://211.157.180.211:18093/file", // target: "http://211.157.180.211:18093/file",
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {