diff --git a/src/components/qtReport/index.vue b/src/components/qtReport/index.vue index f0ffcb8..d99d6de 100644 --- a/src/components/qtReport/index.vue +++ b/src/components/qtReport/index.vue @@ -8,47 +8,23 @@
- + - - - + + - + + - + + - + +
@@ -56,8 +32,7 @@
- {{ pdSubTypeName }}误差结果图 + {{ pdSubTypeName }}误差结果图
@@ -103,8 +78,8 @@ export default { initParam() { if (this.realRes !== undefined) { this.pdSubTypeName = productTypeMap(this.pdSubType); - this.errorMatrix = this.realRes.report["" + 8 + ""] - ? this.realRes.report["" + 8 + ""] + this.errorMatrix = this.realRes.report["" + 12 + ""] + ? this.realRes.report["" + 12 + ""] : []; this.preResults = this.realRes.results ? this.realRes.results : {}; } @@ -174,17 +149,20 @@ export default { width: 100%; height: 100%; } + .realResult { width: 100%; height: calc(55% - 5px); background-color: white; margin-bottom: 5px; } + .groudCoverType { width: 100%; height: 45%; background-color: white; } + .resContent { // border: 1px black solid; height: calc(100% - 60px); @@ -192,48 +170,58 @@ export default { margin: 10px; font-size: 20px; overflow-y: scroll; + .rptitle { display: block; float: left; font-size: 16px; + span { color: #354595; font-weight: bold; } } + .sampling { width: calc(40% - 6px); text-align: start; margin-left: 6px; } + .pixelDeal { width: calc(60% - 6px); text-align: end; margin-right: 6px; } } + /deep/.resContent .el-tabs__header { margin: 0; } + /deep/.resContent .el-tabs__item { padding: 0 13px; } + .gctContent { border: 1px black solid; height: calc(100% - 60px); width: calc(100% - 20px); margin: 10px; } + #qtReportEchart { width: 100%; height: 100%; position: relative; } + .box1 { height: 40px; line-height: 40px; border-bottom: 1px solid rgb(205, 205, 205, 0.5); } + .sp1 { display: inline-block; width: 7px; @@ -243,6 +231,7 @@ export default { margin-left: 20px; margin-top: 8px; } + .sp2 { margin-left: 10px; font-size: 20px; diff --git a/src/components/ration/otgCorrection/index.vue b/src/components/ration/otgCorrection/index.vue index dd1f48b..949798a 100644 --- a/src/components/ration/otgCorrection/index.vue +++ b/src/components/ration/otgCorrection/index.vue @@ -225,7 +225,7 @@ export default { const ssf = Number(this.simpleForm.sampleFun[0]); if ( this.simpleForm.sampleFun.length >= 1 && - ssf === 1 && + ssf === 2 && Number(this.simpleForm.sampleFun[1]) === 0 ) { this.isDeepSpace = true; @@ -236,7 +236,7 @@ export default { changeSampleFun(sfVal) { if (Array.isArray(sfVal)) { const ssf = Number(sfVal[0]); - if (sfVal.length >= 1 && ssf === 1 && Number(sfVal[1]) === 0) { + if (sfVal.length >= 1 && ssf === 2 && Number(sfVal[1]) === 0) { this.isDeepSpace = true; } else { this.isDeepSpace = false; diff --git a/src/components/ration/qualitative/index.vue b/src/components/ration/qualitative/index.vue index 22e9f75..827a184 100644 --- a/src/components/ration/qualitative/index.vue +++ b/src/components/ration/qualitative/index.vue @@ -2,56 +2,30 @@
- {{ - productSubType == 6 ? "地表覆盖类型表" : "植被物候类型表" + {{ + productSubType == 39 ? "地表覆盖类型表" : "植被物候类型表" }}
- + - + - + - + - +
@@ -62,108 +36,45 @@ 样本库
- + - - + + - + 确定 - + - + - + - + - + - + - +
@@ -174,24 +85,15 @@
目标分辨率：{{ pixelNum }} - + - + - - - - - + + + + + @@ -203,23 +105,13 @@
- 待检验产品及样本分布结果 + 待检验产品及样本分布结果
-
+
- + @@ -279,6 +171,9 @@ export default { productSubType: { require: true, }, + featureMapData: { + require: true, + } }, filters: { getCoverName(paramStr) { @@ -287,7 +182,7 @@ export default { }, data() { return { - featureMapData: [], + // featureMapData: [], rfNameOpt: [], simpleForm: { sampleFun: "", @@ -315,9 +210,9 @@ export default { cu.flyToLayerRect(gp[0], gp[1], gp[2], gp[3]); }, created() { - if (this.productSubType === 6) { + if (this.productSubType === 39) { this.rfNameOpt = this.configration.groTypeName; - } else if (this.productSubType === 12) { + } else if (this.productSubType === 47) { this.rfNameOpt = this.configration.vegetationPhenologyGroTypeName; } @@ -351,7 +246,7 @@ export default { const ssf = Number(this.simpleForm.sampleFun[0]); if ( this.simpleForm.sampleFun.length >= 1 && - ssf === 1 && + ssf === 2 && Number(this.simpleForm.sampleFun[1]) === 0 ) { this.isDeepSpace = true; @@ -360,7 +255,7 @@ export default { } // this.stepSampling = this.sampleFun == "1" && this?.sampleCldFun == "0"; }, - onSubmit() {}, + onSubmit() { }, tableRowClassName({ rowIndex }) { if ((rowIndex + 1) % 2 !== 0) { return "background:#F5F7FA;text-align:center"; @@ -375,7 +270,8 @@ export default { cu.removePoint(); if (val.length !== 0) { for (let i in val) { - cu.addPoint(val[i].lon, val[i].lat, val[i].alt); + const alt = JSON.parse(val[i].paramStr).alt; + cu.addPoint(val[i].lng, val[i].lat, alt !== "null" ? alt : 10); } } this.multipleSelection = val; @@ -447,7 +343,7 @@ export default { this.multipleSelection = this.allSampleData = this.simpleData = - res.data.list; + res.data.list; this.loading = false; this.$refs.multipleTable.toggleAllSelection(); let min = Number.MAX_SAFE_INTEGER; @@ -469,7 +365,7 @@ export default { if (Array.isArray(sfVal)) { const ssf = Number(sfVal[0]); 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; } else { this.isDeepSpace = false; @@ -541,7 +437,8 @@ export default { self.$refs.multipleTable.toggleAllSelection(); cu.removePoint(); for (let i in dl) { - cu.addPoint(dl[i].lon, dl[i].lat, dl[i].alt); + const alt = JSON.parse(dl[i].paramStr).alt; + cu.addPoint(dl[i].lng, dl[i].lat, alt !== "null" ? alt : 10); } } }); @@ -560,7 +457,8 @@ export default { self.$refs.multipleTable.toggleAllSelection(); cu.removePoint(); for (let i in dl) { - cu.addPoint(dl[i].lon, dl[i].lat, dl[i].alt); + const alt = JSON.parse(dl[i].paramStr).alt; + cu.addPoint(dl[i].lng, dl[i].lat, alt !== "null" ? alt : 10); } }); } @@ -582,19 +480,23 @@ export default { background-color: white; margin-top: 10px; } + /deep/.featureMap .el-select .el-input__inner { height: 35px; } + .qualiteSample { margin-top: 10px; margin-bottom: 10px; } + .qsLeft { width: 56%; height: 500px; float: left; margin-right: 4px; } + .qsRight { width: calc(44% - 4px); height: 500px; @@ -602,15 +504,18 @@ export default { float: left; margin-bottom: 10px; } + .smps { height: 500px; background-color: white; margin-bottom: 5px; } + /deep/.smps .el-form-item { margin-left: 15px; margin-bottom: 10px; } + // /deep/.smps .el-table th > .cell { // font-size: 15px; // } @@ -622,9 +527,11 @@ export default { height: 165px; background-color: white; } + /deep/.pixelDeal .el-form-item { margin-left: 15px; } + .cardsp { display: block; margin-left: 17px; @@ -632,16 +539,19 @@ export default { color: #606266; line-height: 40px; } + #sceneShowContent { margin: 10px; height: calc(100% - 60px); background-color: rgb(110, 110, 207); } + .box1 { height: 40px; line-height: 40px; border-bottom: 1px solid rgb(205, 205, 205, 0.5); } + .sp1 { display: inline-block; width: 7px; @@ -651,6 +561,7 @@ export default { margin-left: 20px; margin-top: 8px; } + .sp2 { margin-left: 10px; font-size: 20px; @@ -658,6 +569,7 @@ export default { color: #354595; vertical-align: top; } + // 分层抽样弹出框设置 /deep/.sampleFunParam .el-upload-dragger .el-icon-upload { margin: 0; @@ -665,9 +577,11 @@ export default { font-size: 20px; color: black; } + .sampleFunParam .upload-demo { display: inline-block; } + /deep/.sampleFunParam .el-upload-dragger { width: 150px; height: 35px; @@ -675,6 +589,7 @@ export default { margin-top: 20px; border: 1px solid #d9d9d9; } + /deep/.sampleFunParam .el-dialog__body { padding: 20px 10px; text-align: center; diff --git a/src/components/reportTable/index.vue b/src/components/reportTable/index.vue index 99ccf19..4498180 100644 --- a/src/components/reportTable/index.vue +++ b/src/components/reportTable/index.vue @@ -1,35 +1,12 @@ --> - + - + @@ -413,12 +338,12 @@ export default { categoryType: productTypeSplMap(self.pdSubType), product: productTypeMap(self.pdSubType), orderID: asmo.orderCode, - reportMaker: "DXN", + reportMaker: "dxn", orderCreateTime: asmo.createDate, orderStartTime: crTime.startTime, orderEndTime: crTime.endTime, reportCreateTime: asmo.createDate, - inspectorName: "DXN", + inspectorName: "dxn", productFileName: asmp.fileName, resolution: asmm.resRatio + "", productCreateTime: asmp.collectDate, @@ -444,7 +369,6 @@ export default { const pdfName = productTypeMap(self.pdSubType) + "报告"; const localTiffPath = null; const httpTiffPath = rpm.tifPath; - // console.log("1111111", pdfMsg); exportWord(pdfMsg, pdfName, localTiffPath, httpTiffPath, psId).then( (res) => { if (res.msg === "success") { @@ -522,7 +446,7 @@ export default { reExamine() { const os = 8; this.updateOrder(os); - this.$router.push({ name: "待处理的检验订单" }); + // this.$router.push(`http://10.0.3.157:18030/kjwebAdmin/#/Order/DJYOrder?orderid=${this.reportMsg.orderId}&token=WEB%2a1673425993482%40L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19`); }, // 更新订单状态 updateOrder(orderStatus) { @@ -561,33 +485,39 @@ export default { height: 1000px; margin-bottom: 10px; } + .rphLeft { width: calc(50% - 5px); height: 100%; float: left; margin-right: 5px; } + .rphRight { width: 50%; height: 100%; float: left; background-color: white; } + .pdfContent { background-color: #343537; height: calc(100% - 60px); margin: 10px; border: 1px solid #343537; + .pdfPage { width: 100%; height: 100%; } } + .rpShow { padding-top: 20px; background-color: white; width: 100%; height: 650px; + .earth { width: 98%; height: 400px; @@ -596,12 +526,14 @@ export default { margin-bottom: 10px; } } + .rpBottom { position: relative; display: block; margin-top: 20px; text-align: center; } + /deep/.rpBottom { .el-button--primary { width: 170px; @@ -612,11 +544,13 @@ export default { border-color: #354595; } } + .box1 { height: 40px; line-height: 40px; border-bottom: 1px solid rgb(205, 205, 205, 0.5); } + .sp1 { display: inline-block; width: 7px; @@ -626,6 +560,7 @@ export default { margin-left: 20px; margin-top: 8px; } + .sp2 { margin-left: 10px; font-size: 20px; @@ -640,12 +575,15 @@ export default { position: relative; text-align: center; } + .ysjMsg { width: 18%; } + .ysjMsgMrg { margin-left: 14px; } + .ysjMsg2 { width: 20%; } @@ -654,30 +592,38 @@ export default { width: 140px; height: 33px; } + /deep/.cstop .el-form--inline .el-form-item__label { text-align: justify; // text-align-last: justify; font-size: 15px; } + /deep/.cstop .el-radio { margin-right: 10px; } + /deep/.cstop .el-radio__inner::after { background-color: #354595; } + /deep/.cstop .el-radio__input.is-checked .el-radio__inner { border-color: #354595; background: white; } + /deep/.cstop .el-radio__input.is-disabled .el-radio__inner { border-color: #354595; } + /deep/.cstop .el-radio__input.is-disabled.is-checked .el-radio__inner::after { background-color: #354595; } -/deep/.cstop .el-radio__input.is-checked + .el-radio__label { + +/deep/.cstop .el-radio__input.is-checked+.el-radio__label { color: #606266; } + /deep/.cstop .el-radio__inner { border: 2px solid #354595; } @@ -696,17 +642,20 @@ export default { /deep/.el-tabs__item:hover { color: black; } -/deep/.el-tabs--card > .el-tabs__header .el-tabs__item.is-active { + +/deep/.el-tabs--card>.el-tabs__header .el-tabs__item.is-active { color: white; background-color: #409eff; border-color: #409eff; } + /deep/.el-tabs__nav-scroll { text-align: center; margin-bottom: 10px; // display: block; } -/deep/.el-tabs--card > .el-tabs__header .el-tabs__nav { + +/deep/.el-tabs--card>.el-tabs__header .el-tabs__nav { display: block; left: 41.5%; // transform: translateX(-50%); @@ -714,11 +663,13 @@ export default { // text-align: center; position: relative; } -/deep/.el-tabs--card > .el-tabs__header { + +/deep/.el-tabs--card>.el-tabs__header { border-bottom: 0; // border-bottom: 1px solid #E4E7ED; } -/deep/.el-tabs--card > .el-tabs__header .el-tabs__nav { + +/deep/.el-tabs--card>.el-tabs__header .el-tabs__nav { border-bottom: 1px solid #e4e7ed; } diff --git a/src/views/Daichuli/Feedback/Inspection/index.vue b/src/views/Daichuli/Feedback/Inspection/index.vue index 70080b7..7d50b6b 100644 --- a/src/views/Daichuli/Feedback/Inspection/index.vue +++ b/src/views/Daichuli/Feedback/Inspection/index.vue @@ -4,65 +4,25 @@ -
+
订单信息
- - + + - + - + - + - + - + 查看 @@ -75,126 +35,56 @@ 元数据查看
- + - + - + - + - + - + -
+
- + - + - + - + - +
- + - + - +
@@ -202,29 +92,15 @@
- - + +
- 取消 - 确定 + 取消 + 确定
@@ -238,50 +114,29 @@ 目标分辨率：{{ pixelNum }} - + - - - - + + + + @@ -296,18 +151,8 @@
- - + + @@ -315,12 +160,8 @@
- 取消 - 确定 + 取消 + 确定
@@ -337,7 +178,6 @@ import { delSampleData, upDateAnalyseMethod, checkReality, - exportWord, } from "@/api/lang/pendingOrder"; import qs from "qs"; @@ -354,7 +194,7 @@ export default { if ( Object.keys(this.$route.params).length > 0 && sessionStorage.getItem("prePage") === - this.configration.path.orderUnprocessed + this.configration.path.orderUnprocessed ) { this.queryParams = this.$route.params; } else { @@ -377,6 +217,7 @@ export default { isShow: false, truthFun: false, productSubType: undefined, + featureMapData: [], orderId: undefined, userId: null, formInline: { @@ -415,8 +256,9 @@ export default { self.orderId = om.orderId; const pdType = om.productSubClassId; - this.productSubType = pdType; + self.productSubType = pdType; + self.featureMapData = om.landCoverTypeVOList self.formInline = am.metaMsg; self.orderData = am.orderData; self.pixelNum = am.metaMsg.resRatio; @@ -428,7 +270,7 @@ export default { am.metaMsg.maxLat, ]; - const pm = (this.productMsg = am.productMsg); + const pm = (self.productMsg = am.productMsg); self.geoWorkSpace = pm.geoWorkspace; self.geoLayerName = pm.geoLayerName; self.tifPath = pm.ftpPath; @@ -456,16 +298,16 @@ export default { const pmVal = Object.keys(pm)[0]; self.pixelFun = pmVal.toString(); } - if (this.pixelFun !== "") { - this.pdShow = true; - this.$store.commit("setPixelFun", this.pixelFun); + if (self.pixelFun !== "") { + self.pdShow = true; + self.$store.commit("setPixelFun", self.pixelFun); } // 赋值样本抽样方法 if (om.samplingMethodId !== null) self.sampleFun = om.samplingMethodId + ""; - if (this.sampleFun !== "") { - this.$store.commit("setSampleFun", this.sampleFun); + if (self.sampleFun !== "") { + self.$store.commit("setSampleFun", self.sampleFun); } if (om.samplingMethodCldId !== null) { @@ -505,8 +347,8 @@ export default { this.sampleList = smpVal.multipleSelection; - if (featureMapData !== [] || featureMapData.length !== 0) - this.updateCoverType(featureMapData); + // if (featureMapData !== [] || featureMapData.length !== 0) + // this.updateCoverType(featureMapData); const orderId = this.orderId; const tcf = this.formInline.truthCheckFun; @@ -688,6 +530,7 @@ export default { .Fade-leave-to { opacity: 0; } + .Fade-enter-to, .Fade-leave { opacity: 1; @@ -702,53 +545,66 @@ export default { width: 140px; height: 33px; } + /deep/.el-form--inline .el-form-item__label { text-align: justify; // text-align-last: justify; font-size: 15px; } + .shbtn:hover, .shbtn:active, .shbtn:focus { background-color: rgba(97, 115, 206, 0.5); } + .shbtn { width: 150px; height: 35px; background-color: #354595; border: 0; } + .btngroup { margin-bottom: 20px; // margin-left: 40%; text-align: center; } + /deep/.el-textarea__inner { margin-left: 20px; width: 98%; } + /deep/.el-textarea__inner:focus { border-color: #354595; } + /deep/.el-radio { margin-right: 10px; } + /deep/.el-radio__inner::after { background-color: #354595; } + /deep/.el-radio__input.is-checked .el-radio__inner { border-color: #354595; background: white; } + /deep/.el-radio__input.is-disabled .el-radio__inner { border-color: #354595; } + /deep/.el-radio__input.is-disabled.is-checked .el-radio__inner::after { background-color: #354595; } -/deep/.el-radio__input.is-checked + .el-radio__label { + +/deep/.el-radio__input.is-checked+.el-radio__label { color: #606266; } + /deep/.el-radio__inner { border: 2px solid #354595; } @@ -756,23 +612,28 @@ export default { /deep/.el-icon-close:before { content: none; } + /deep/.el-tag .el-icon-close { width: 0; height: 0; } + /deep/.cardfive .el-form-item { margin-top: 15px; width: 100%; } + /deep/.cardfive .el-form--inline .el-form-item__content { width: 90%; height: 60px; } + /deep/.cardfive .el-select { width: 100%; height: 60px; line-height: 60px; } + /deep/.cardfive .el-input--suffix .el-input__inner { width: 100%; height: 60px; @@ -784,13 +645,16 @@ export default { line-height: 60px; margin-left: 20px; } + /deep/.cardfive .el-button--primary:hover { background-color: #354595; } + /deep/.cardfive .el-button--primary:focus { background-color: #6979cc; border-color: #6979cc; } + .box2 { margin-top: 10px; margin-bottom: 10px; @@ -798,6 +662,7 @@ export default { width: 300px; display: inline-block; } + .bxtitle { margin-top: 2.5px; display: inline-block; @@ -807,35 +672,43 @@ export default { text-align: justify; text-align-last: justify; } + .bxinput { display: inline-block; vertical-align: top; width: 200px; } + /deep/.cardfive .el-input__inner { height: 60px; } + .cstop { margin-top: 20px; margin-bottom: 0; position: relative; text-align: center; } + .ysjMsg { width: 18%; } + .ysjMsgMrg { margin-left: 14px; } + .ysjMsg2 { width: 20%; } + .cardsecond { width: 100%; background-color: white; font-size: 20px; margin-top: 20px; } + .cardfrist { width: 100%; background-color: white; @@ -843,17 +716,20 @@ export default { padding-bottom: 15px; // margin-top: 20px; } + .cardfive { margin-top: 20px; background-color: white; padding: 0 0 10px 0; clear: both; } + .box1 { height: 40px; line-height: 40px; border-bottom: 1px solid rgb(205, 205, 205, 0.5); } + .sp1 { display: inline-block; width: 7px; @@ -864,6 +740,7 @@ export default { margin-left: 20px; margin-top: 8px; } + .sp11 { display: inline-block; width: 7px; @@ -874,6 +751,7 @@ export default { margin-left: 24px; margin-top: 8px; } + .sp2 { margin-left: 10px; font-size: 20px; @@ -881,6 +759,7 @@ export default { color: #354595; vertical-align: top; } + .sp22 { margin-left: 10px; font-size: 20px; @@ -888,58 +767,71 @@ export default { color: #354595; vertical-align: top; } + .page { /* height: 1000px; */ width: 100%; /* background-color: goldenrod; */ } + /deep/.el-button { line-height: 0; } + .leftCard { width: 54%; height: 230px; background-color: white; float: left; } + .rightCard { width: 46%; height: 230px; background-color: white; float: left; } + .pixelDeal { height: 165px; background-color: white; } + /deep/.leftCard .el-form-item { margin-top: 15px; width: 100%; } + /deep/.leftCard .el-input__inner { height: 38px; } + /deep/.leftCard .el-select { width: 100%; height: 38px; line-height: 38px; } + /deep/.leftCard .el-form--inline .el-form-item__content { width: 50%; height: 38px; } + /deep/.leftCard .el-form--inline .el-form-item__label { height: 38px; line-height: 38px; margin-left: 20px; } + /deep/.rightCard .demo-form-inline .el-form-item { margin-top: 15px; width: 100%; } + /deep/.rightCard .demo-form-inline .el-form-item__content { width: 80%; } + /deep/.rightCard .demo-form-inline .el-select { width: 100%; } @@ -971,6 +863,7 @@ export default { color: #606266; line-height: 40px; } + .selectBox { height: 65px; width: 100%; @@ -978,6 +871,7 @@ export default { border: 1px solid #dcdfe6; line-height: 22px; } + .selTxt { background-color: #f4f4f5; border-color: #e9e9eb; diff --git a/src/views/Daichuli/Feedback/index.vue b/src/views/Daichuli/Feedback/index.vue index b9c23a7..7a467f2 100644 --- a/src/views/Daichuli/Feedback/index.vue +++ b/src/views/Daichuli/Feedback/index.vue @@ -96,8 +96,8 @@ style="width: 98%; margin-left: 1%; margin-top: 15px" height="200"> - - + +