+
@@ -402,36 +265,15 @@
-
-
+
+
-
+
@@ -439,27 +281,16 @@
-
+
取消
- 确定
+ 确定
@@ -653,6 +484,7 @@ export default {
isSaveMateData: false,
groTypeName: [],
groundFeature: "",
+ kgTypeNameArr: [],
};
},
beforeCreate() {
@@ -671,6 +503,7 @@ export default {
this.groundFeature = tempFlag;
if (tempFlag === 6) {
this.groTypeName = this.configration.groTypeName;
+ this.kgTypeNameArr = this.configration.kgTypeNameArr;
} else if (tempFlag === 12) {
this.groTypeName = this.configration.vegetationPhenologyGroTypeName;
}
@@ -817,14 +650,18 @@ export default {
});
// 添加地表覆盖物类型
if (this.grdCoverList.length > 0) {
+ console.log(this.grdCoverList, 'this.gradCoverList');
+
const temp = this.grdCoverList.map((item) => {
return {
...item,
orderId,
};
});
+ console.log(temp,'temp');
+
addCoverTypeBatch(temp).then((res) => {
- // console.log(res);
+ console.log(res,'addCoverTypeBatch');
this.grdCoverList = [];
});
}
@@ -1046,7 +883,8 @@ export default {
},
addLaCovT() {
const firstLabel = this.groTypeName[0].label;
- this.pData.grdCoverData.push({ groClaName: firstLabel, pixelNum: "1" });
+ const firstLabel2 = this.kgTypeNameArr[0].label;
+ this.pData.grdCoverData.push({ groClaName: firstLabel, typeNameKg: firstLabel2, pixelNum: "1" });
},
removeLaCovT(index) {
this.pData.grdCoverData.splice(index, 1);
@@ -1084,6 +922,9 @@ export default {
const tempPixel = coverTypeList.filter(
(coverType) => coverType.typeId === item.pixelNum
);
+ const kgType = coverTypeList.filter(
+ (coverType) => coverType.typeNameKg === item.typeNameKg
+ )
if (tempCoverType.length > 0) {
this.$message({
type: "warning",
@@ -1101,9 +942,12 @@ export default {
coverTypeList.push({
typeName: item.groClaName,
typeId: item.pixelNum,
+ typeNameKg: item.typeNameKg
});
}
this.grdCoverList = coverTypeList;
+ console.log(this.grdCoverList, "this.grdCoverList");
+
}
const upf = {
@@ -1214,6 +1058,7 @@ export default {
// margin-top: 10px;
margin-bottom: 10px;
text-align: center;
+
/deep/.el-button--primary {
width: 240px;
margin: 0 60px;
@@ -1221,11 +1066,13 @@ export default {
background-color: #354595;
border-color: #354595;
}
+
/deep/.el-button--primary:hover {
color: #fff;
background-color: #6d7ab6;
border-color: #6d7ab6;
}
+
/deep/.el-button--primary.is-disabled {
color: #fff;
background-color: #6d7ab6;
@@ -1237,28 +1084,35 @@ export default {
// margin-top: 10px;
// margin-bottom: 10px;
text-align: center;
+
/deep/.el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: #354595;
}
}
+
.table {
border-top: 3px solid gainsboro;
padding-top: 10px;
+
/deep/.el-table th {
padding: 6px 0;
}
+
/deep/.el-table td {
padding: 5px 0;
}
+
/deep/.el-checkbox__input.is-checked .el-checkbox__inner {
background-color: #354595;
border-color: #354595;
}
+
/deep/.el-checkbox__input.is-indeterminate .el-checkbox__inner {
background-color: #354595;
border-color: #354595;
}
}
+
.cardbottom {
width: 100%;
// height: 300px;
@@ -1268,67 +1122,81 @@ export default {
z-index: 9;
border-radius: 4px;
}
+
/deep/.el-button {
padding: 8px 15px;
}
+
.btngr {
text-align: center;
padding: 15px;
+
/deep/.el-button--primary {
color: #fff;
background-color: #354595;
border-color: #354595;
}
+
/deep/.el-button--primary:hover {
color: #fff;
background-color: #6d7ab6;
border-color: #6d7ab6;
}
+
/deep/.el-button--primary.is-disabled {
color: #fff;
background-color: #6d7ab6;
border-color: #6d7ab6;
}
}
+
.line {
height: 30px;
line-height: 30px;
position: relative;
margin-top: 10px;
margin-bottom: 10px;
+
.sp1 {
display: inline-block;
vertical-align: top;
position: absolute;
left: 0;
}
+
.inp1 {
display: inline-block;
vertical-align: top;
width: 135px;
position: absolute;
right: 0;
+
/deep/.el-input__inner {
height: 30px;
width: 150px;
}
}
+
.sel1 {
display: inline-block;
vertical-align: top;
width: 135px;
position: absolute;
right: 0;
+
/deep/.el-input__inner {
height: 30px;
width: 150px;
}
+
border-color: transparent;
}
}
+
.showcard {
margin-left: 15px;
margin-right: 15px;
+
// height: 300px;
// border-top: 2px solid gainsboro;
.left {
@@ -1338,6 +1206,7 @@ export default {
width: 45%;
// background-color: gold;
}
+
.right {
display: inline-block;
vertical-align: top;
@@ -1347,36 +1216,45 @@ export default {
// background-color: gold;
}
}
+
/deep/.el-slider__bar {
background-color: #354595;
}
+
/deep/.el-slider__button {
border-color: #354595;
}
+
.slidercloud {
display: inline-block;
vertical-align: top;
width: 420px;
}
+
.line1 {
display: inline-block;
}
+
.line2 {
display: inline-block;
margin-left: 20px;
}
+
.timeCardlineinput {
display: inline-block;
width: 150px;
+
/deep/.el-input__inner {
height: 30px;
width: 125px;
}
+
/deep/.el-date-editor.el-input,
.el-date-editor.el-input__inner {
margin-left: 45px;
}
}
+
/deep/.line2 .el-icon-time:before {
content: "\e78e";
}
@@ -1384,12 +1262,15 @@ export default {
/deep/.el-select .el-input.is-focus .el-input__inner {
border-color: #354595;
}
+
.cardlineinput2 {
display: inline-block;
width: 200px;
+
/deep/.el-input__inner {
height: 30px;
}
+
/deep/.el-input__inner:focus {
border-color: #354595;
}
@@ -1398,6 +1279,7 @@ export default {
.cardlineinput {
display: inline-block;
width: 150px;
+
/deep/.el-input__inner {
height: 30px;
width: 125px;
@@ -1411,11 +1293,13 @@ export default {
// font-size: 14px;
margin-right: 15px;
}
+
.cardline {
margin-left: 15px;
height: 40px;
line-height: 40px;
}
+
// .radiolabel {
// // color: #606266;
// // font-size: 14px;
@@ -1426,34 +1310,43 @@ export default {
margin-left: 4px;
margin-right: 20px;
}
+
.imageTime:after {
content: "*";
color: #f56c6c;
margin-left: 4px;
margin-right: 20px;
}
+
.radiogroup {
margin-left: 60px;
}
+
/deep/.el-radio__inner {
border: 1px solid #606266;
}
+
/deep/.el-radio__inner::after {
background-color: #354595;
}
+
/deep/.el-radio__input.is-checked .el-radio__inner {
border: 2.5px solid #354595;
background: white;
}
-/deep/.el-radio__input.is-checked + .el-radio__label {
+
+/deep/.el-radio__input.is-checked+.el-radio__label {
color: #606266;
}
+
.cardbtngroup {
padding: 10px;
text-align: center;
+
.el-button {
margin: 0 30px;
}
+
/deep/.el-button--primary.is-disabled,
.el-button--primary.is-disabled:active,
.el-button--primary.is-disabled:focus,
@@ -1463,9 +1356,11 @@ export default {
border-color: gainsboro;
}
}
-/deep/.el-table th > .cell {
+
+/deep/.el-table th>.cell {
color: #354595;
}
+
.cardgroup {
width: 550px;
position: absolute;
@@ -1474,29 +1369,34 @@ export default {
top: 70px;
}
-/deep/.cardgroup .el-table th > .cell {
+/deep/.cardgroup .el-table th>.cell {
color: #354595;
font-size: 13px;
}
-/deep/.cardgroup .el-table td > .cell {
+
+/deep/.cardgroup .el-table td>.cell {
font-size: 12px;
}
+
.card {
background-color: white;
z-index: 2;
border-radius: 4px;
border: none;
}
+
.cardtable {
border-top: 2px solid gainsboro;
padding-top: 10px;
}
+
.cardheader {
height: 44px;
// margin-top: 10px;
background-color: white;
line-height: 44px;
border-radius: 4px;
+
.s1 {
font-size: 25px;
font-family: "PingFangSC-Medium", sans-serif;
@@ -1504,6 +1404,7 @@ export default {
margin-left: 20px;
font-weight: 600;
}
+
.s2 {
position: absolute;
// top: 10px;
@@ -1513,6 +1414,7 @@ export default {
color: #354595;
cursor: pointer;
}
+
.s3 {
position: absolute;
top: 10px;
@@ -1521,12 +1423,14 @@ export default {
cursor: pointer;
}
}
+
.cardheader2 {
height: 40px;
background-color: #e4e9f1;
line-height: 40px;
border-radius: 4px;
position: relative;
+
.s3 {
font-size: 18px;
font-family: "PingFangSC-Medium", sans-serif;
@@ -1534,6 +1438,7 @@ export default {
margin-left: 15px;
font-weight: bolder;
}
+
.s4 {
position: absolute;
top: 5px;
@@ -1542,40 +1447,49 @@ export default {
cursor: pointer;
}
}
+
/deep/.searchParams .el-dialog__body {
padding: 10px 15px;
}
+
// /deep/.searchParams .el-range-editor.el-input__inner {
// width: 240px;
// }
/deep/.searchParams .el-input {
width: 80px;
}
+
/deep/.searchParams .el-input__inner {
height: 35px;
line-height: 35px;
}
+
/deep/.searchParams .el-dialog__footer {
text-align: center;
}
+
/deep/.polarization .el-input {
width: 140px;
}
+
.box1 {
height: 40px;
line-height: 40px;
margin-bottom: 10px;
+
.sp1 {
font-size: 18px;
margin-left: 10px;
font-weight: 600;
}
}
+
.sp2 {
font-size: 16px;
margin-right: 10px;
margin-left: 10px;
}
+
/deep/.cardgroup .el-input--suffix .el-input__inner {
padding-right: 20px;
}
diff --git a/src/components/orderSearch/index.vue b/src/components/orderSearch/index.vue
index 99f1f8e..6a3b79f 100644
--- a/src/components/orderSearch/index.vue
+++ b/src/components/orderSearch/index.vue
@@ -1,40 +1,19 @@
-
+
-
+
-
-
+
+
@@ -42,12 +21,7 @@
-
+
@@ -56,17 +30,8 @@
-
-
+
+
@@ -74,12 +39,7 @@
-
+
@@ -87,12 +47,7 @@
-
+
@@ -106,17 +61,8 @@
-
-
+
+
@@ -166,6 +112,7 @@ export default {
return {
value1: [new Date(2000, 10, 10, 10, 10), new Date(2000, 10, 11, 10, 10)],
searchForm: {
+ submitDateArr: [],
submitDate: "",
satellite: "",
load: "",
@@ -242,9 +189,12 @@ export default {
};
},
methods: {
- getDate(){
- this.searchForm.submitDate = this.searchForm.submitDate.join(',');
- console.log(this.searchForm.submitDate,'this.searchForm.submitDate');
+ getDate() {
+ if (this.searchForm.submitDateArr !== null) {
+ this.searchForm.submitDate = this.searchForm.submitDateArr.join(',');
+ }else{
+ this.searchForm.submitDate = '';
+ }
},
// 根据卫星选择载荷
bindLoad(val) {
@@ -291,21 +241,26 @@ export default {
height: 35px;
line-height: 30px;
}
+
/deep/.el-range-editor.el-input__inner {
padding: 1px 10px;
}
+
/deep/ .el-input {
width: 270px;
}
+
.submitSearch {
text-align: center;
}
+
/deep/.submitSearch .el-button--primary {
width: 160px;
height: 35px;
// margin-top: 20px;
margin-bottom: 20px;
}
+
/deep/.el-button {
line-height: 0;
}
@@ -341,5 +296,4 @@ export default {
// .el-date-table td .cell {
// width: 100%;
// }
-// }
-
+// }
diff --git a/src/components/qtReport/index.vue b/src/components/qtReport/index.vue
index b1eb0b5..019ce0f 100644
--- a/src/components/qtReport/index.vue
+++ b/src/components/qtReport/index.vue
@@ -72,21 +72,22 @@ export default {
mounted() {
this.myCharts = this.$echarts.init(this.$refs.chart);
if (this.realRes.rocCoordinateValues !== undefined)
- console.log("2222222", this.realRes.report["" + 12 + ""]);
this.drawPie(this.realRes.rocCoordinateValues);
},
methods: {
initParam() {
if (this.realRes !== undefined) {
this.pdSubTypeName = productTypeMap(this.pdSubType);
- this.errorMatrix = this.realRes.report["" + 12 + ""]
- ? this.realRes.report["" + 12 + ""]
+ this.errorMatrix = this.realRes.report["" + 8 + ""]
+ ? this.realRes.report["" + 8 + ""]
: [];
this.preResults = this.realRes.results ? this.realRes.results : {};
+ console.log(this.errorMatrix,'this.errorMatrix');
+
}
},
drawPie(rocVal) {
- let tableData = this.realRes.report["" + 12 + ""];
+ let tableData = this.realRes.report["" + 8 + ""];
let newTableData = this.deepClone(tableData);
let xArr = newTableData.pop();
let yArr = newTableData.pop();
diff --git a/src/components/ration/otgCorrection/index.vue b/src/components/ration/otgCorrection/index.vue
index 252208c..3a8446c 100644
--- a/src/components/ration/otgCorrection/index.vue
+++ b/src/components/ration/otgCorrection/index.vue
@@ -22,8 +22,9 @@
+ tooltip-effect="dark" :header-cell-style="headerRowClass"
+ style="width: 98%; margin-left: 1%; margin-top: 15px" highlight-current-row @current-change="tableRowClk"
+ :stripe="true" :cell-style="tableRowClassName" height="370">
@@ -31,22 +32,22 @@
-
+
{{
- parseFloat(scope.row.measureLat.toFixed(8))
+ parseFloat(scope.row.lat.toFixed(8))
}}
{{
- parseFloat(scope.row.measureLong.toFixed(8))
+ parseFloat(scope.row.lon.toFixed(8))
}}
-
+
-
-
+
+
@@ -123,14 +124,7 @@
diff --git a/src/views/Daichuli/Feedback/Inspection/index.vue b/src/views/Daichuli/Feedback/Inspection/index.vue
index ef0b78c..0df5f1b 100644
--- a/src/views/Daichuli/Feedback/Inspection/index.vue
+++ b/src/views/Daichuli/Feedback/Inspection/index.vue
@@ -76,14 +76,14 @@
+ :microwaveDataJson="microwaveDataJson" ref="otgCorrectionPanel" v-if="productSubType === 1">
+ v-else-if="productSubType === 6 || productSubType === 12">
{
if (res.code === 200) {
- window.location.href = `${DAICHULI_URL}?orderid=${this.orderId}&token=${this.token}`;
+ this.$router.push('/daituli')
}
})
},
@@ -339,9 +337,6 @@ export default {
var smpVal = undefined;
var featureMapData = [];
const pdType = this.productSubType;
- console.log(this.$refs.otgCorrectionPanel,'$refs.otgCorrectionPanel');
- console.log(this.$refs.qualitativePanel,'$refs.qualitativePanel');
- console.log(this.$refs.soilMositurePanel,'$refs.soilMositurePanel');
if (pdType === productSubTypeVal.ACS_ORTHOPHOTO) {
smpVal = this.$refs.otgCorrectionPanel;
} else if (
@@ -353,11 +348,13 @@ export default {
} else {
smpVal = this.$refs.soilMositurePanel;
}
-
- this.sampleList = smpVal.multipleSelection;
+ console.log(smpVal,'smpval');
- // if (featureMapData !== [] || featureMapData.length !== 0)
- // this.updateCoverType(featureMapData);
+ this.sampleList = smpVal.multipleSelection;
+ console.log(this.sampleList,'this.sampleList');
+
+ if (featureMapData.length !== 0 || featureMapData.length !== 0)
+ this.updateCoverType(featureMapData);
const orderId = this.orderId;
//真实性检验方法
const tcf = this.formInline.truthCheckFun;
@@ -387,8 +384,7 @@ export default {
formData.append("isHttpUrl", false); //产品路径
formData.append("dataPath", this.tifPath); //产品路径
formData.append("samples", JSON.stringify(this.sampleList)); //样本数据
- if (this.pixelFun !== "")
- formData.append("pixelHandleType", this.pixelFun); //像元级处理方法（正射校正产品不需要）
+ if (this.pixelFun !== "") formData.append("pixelHandleType", this.pixelFun); //像元级处理方法（正射校正产品不需要）
formData.append("truthCheckFuns", JSON.stringify(tcf)); //真实性校验
formData.append("featureMapping", JSON.stringify(featureMapData));
formData.append("microwaveDataJson", this.microwaveDataJson); //特殊参数设置
@@ -431,19 +427,18 @@ export default {
orderId: this.orderId,
userId: this.userId,
userName: this.userName,
- token: this.token,
orderMsg: this.orderMsg,
productMsg: this.productMsg,
imgRes: imgRes,
pixelHandleMsg: pixelHandleMsg,
- projStr: res.projStr,
+ projStr: this.formInline.coordinateSys,
sampleFun: theSampleFun,
sampleNum: rm.sampleNum,
simpleEndTime: this.orderMsg.simpleEndTime,
simpleStartTime: this.orderMsg.simpleStartTime,
};
- console.log(reportMsg,'reportMsg');
-
+ console.log(reportMsg, 'reportMsg');
+
localStorage.setItem(
this.configration.path.inspection,
JSON.stringify(reportMsg)
@@ -467,7 +462,11 @@ export default {
},
screenCapture(allSampel, gp) {
+ console.log(6666666666666);
+
return new Promise((resolve) => {
+ console.log(777777777777);
+
const allLon = [], allLat = [];
if (this.productSubType === productSubTypeVal.ACS_ORTHOPHOTO) {
for (let i in allSampel) {
@@ -480,6 +479,8 @@ export default {
allLat.push(allSampel[i].lat);
}
}
+ console.log(88888888888888);
+
const sampleExtent = [Math.min(...allLon), Math.min(...allLat), Math.max(...allLon), Math.max(...allLat)]
this.setViewToRect(sampleExtent[0], sampleExtent[1], sampleExtent[2], sampleExtent[3]);
@@ -587,8 +588,8 @@ export default {
if (fi.typeIdKg !== null) {
const fParams = new FormData();
fParams.append("coverId", fi.id);
- fParams.append("kgTypeId", Number(fi.typeIdKg));
- fParams.append("kgTypeName", fi.typeNameKg);
+ fParams.append("kgTypeId",fi.typeIdKg);
+ fParams.append("typeNameKg", fi.typeNameKg);
updateFeature(fParams);
}
}
@@ -671,9 +672,9 @@ export default {
computed: {
hasPixelFun: function () {
return (
- this.productSubType !== 45 &&
- this.productSubType !== 39 &&
- this.productSubType !== 47
+ this.productSubType !== 1 &&
+ this.productSubType !== 6 &&
+ this.productSubType !== 12
);
},
globalSampleFun: function () {
@@ -690,7 +691,6 @@ export default {