From 36db61c27d0ab3a39d3f90e7755995c1335971f7 Mon Sep 17 00:00:00 2001
From: duxiaoning <17621883433@163.com>
Date: Wed, 11 Jan 2023 09:15:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=88=90=E4=BF=AE=E6=94=B9=E4=B8=80?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   3 +-
 .env.production                               |   1 +
 .env.staging                                  |   2 +-
 src/api/audit.js                              |   6 +-
 src/api/common.js                             |   8 +-
 src/api/creatOrder.js                         |  10 +-
 src/api/home.js                               |  18 +-
 src/api/lang/pendingOrder.js                  | 189 ++++++++++++
 src/api/pendingOrder.js                       |  34 +--
 src/components/ration/otgCorrection/index.vue | 102 ++-----
 src/components/ration/qualitative/index.vue   |  70 ++---
 src/components/ration/sampleSetting/index.vue |  82 +++--
 src/components/ration/soilMoisture/index.vue  | 117 +++----
 src/components/rtReport/index.vue             |  18 +-
 src/config/config.js                          |  41 +--
 src/lib/contract.js                           |  56 ++--
 src/lib/request-file.js                       |  79 ++---
 src/lib/request-microwave.js                  |  37 +++
 src/lib/request-reality.js                    |  78 ++---
 src/lib/request.js                            |  78 ++---
 src/lib/variateMap.js                         |  96 +++---
 .../Feedback/Inspection/Report/index.vue      |  66 ++--
 .../Daichuli/Feedback/Inspection/index.vue    | 270 +++++++---------
 src/views/Daichuli/Feedback/index.vue         | 288 ++++++------------
 src/views/Daichuli/index.vue                  |  35 +--
 vue.config.js                                 |  14 +-
 26 files changed, 855 insertions(+), 943 deletions(-)
 create mode 100644 src/api/lang/pendingOrder.js
 create mode 100644 src/lib/request-microwave.js

diff --git a/.env.development b/.env.development
index d209ed9..2dca260 100644
--- a/.env.development
+++ b/.env.development
@@ -3,7 +3,6 @@ ENV = 'development'
 
 # base api
 VUE_APP_BASE_API = '/dev-api'
-
+VUE_APP_MICROWAVE_API = '/dev-microwave-api'
 VUE_APP_REALITY_API = '/dev-reality-api'
-
 VUE_APP_FILE_API = '/dev-file-api'
diff --git a/.env.production b/.env.production
index 4aaca46..95a69ff 100644
--- a/.env.production
+++ b/.env.production
@@ -3,5 +3,6 @@ ENV = 'production'
 
 # base api
 VUE_APP_BASE_API = '/prod-api'
+VUE_APP_MICROWAVE_API = '/prod-microwave-api'
 VUE_APP_REALITY_API = '/prod-reality-api'
 VUE_APP_FILE_API = '/prod-file-api'
\ No newline at end of file
diff --git a/.env.staging b/.env.staging
index b3ca03c..543e610 100644
--- a/.env.staging
+++ b/.env.staging
@@ -5,7 +5,7 @@ ENV = 'staging'
 
 # base api
 VUE_APP_BASE_API = '/stage-api'
-
+VUE_APP_MICROWAVE_API = '/stage-microwave-api'
 VUE_APP_REALITY_API = '/stage-reality-api'
 VUE_APP_FILE_API = '/stage-file-api'
 
diff --git a/src/api/audit.js b/src/api/audit.js
index 21fcebd..ae54e61 100644
--- a/src/api/audit.js
+++ b/src/api/audit.js
@@ -1,8 +1,8 @@
-import request from '@/lib/request'
+import microwaveRequest from "@/lib/request-microwave";
 
 // 提交审核信息
 export function orderExamine(data){
-    return request({
+    return microwaveRequest({
         url:'orderExamine/orderExamineMsg',
         method:'post',
         data
@@ -10,7 +10,7 @@ export function orderExamine(data){
 }
 //获取订单审核信息
 export function getExamineMsg(orderId){
-    return request({
+    return microwaveRequest({
         url:'orderExamine/getExamineMsg?orderId='+orderId,
         method:'get'
     })
diff --git a/src/api/common.js b/src/api/common.js
index 782d911..bf32e35 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -1,7 +1,7 @@
-import request from "@/lib/request";
+import microwaveRequest from "@/lib/request-microwave";
 // 获取待检验产品订单列表
 export function getOrderListByStatus(data) {
-    return request({
+    return microwaveRequest({
         url: "orderStatus/getOrderListByStatus",
         method: "post",
         data
@@ -9,7 +9,7 @@ export function getOrderListByStatus(data) {
 }
 // 获取待检验产品订单列表
 export function getOrderListOfPending(data) {
-    return request({
+    return microwaveRequest({
         url: "orderStatus/getOrderListOfPending",
         method: "post",
         headers: { "Content-Type": "multipart/form-data" },
@@ -18,7 +18,7 @@ export function getOrderListOfPending(data) {
 }
 // 获取待检验产品产品值
 export function getProductValue(data) {
-    return request({
+    return microwaveRequest({
         url: "GetValue/GetProductValue",
         method: "post",
         headers: { "Content-Type": "multipart/form-data" },
diff --git a/src/api/creatOrder.js b/src/api/creatOrder.js
index 68263dc..dd9fa3e 100644
--- a/src/api/creatOrder.js
+++ b/src/api/creatOrder.js
@@ -1,7 +1,7 @@
-import request from "@/lib/request";
+import microwaveRequest from "@/lib/request-microwave";
 // 添加产品并且进行数据发布
 export function addProduct(data) {
-    return request({
+    return microwaveRequest({
         url: "/productUpload/uploadProduct",
         method: "post",
         headers: { "Content-Type": "multipart/form-data" },
@@ -10,7 +10,7 @@ export function addProduct(data) {
 }
 // 添加订单
 export function getProductList(pscId, userId, page, limit) {
-    return request({
+    return microwaveRequest({
         url:
             "productUpload/getProductList?productSubclassId=" +
             pscId +
@@ -25,7 +25,7 @@ export function getProductList(pscId, userId, page, limit) {
 }
 // 更新产品的等级与时间
 export function updateProduct(data) {
-    return request({
+    return microwaveRequest({
         url: "/productUpload/updateProductMsg",
         method: "post",
         headers: { "Content-Type": "multipart/form-data" },
@@ -34,7 +34,7 @@ export function updateProduct(data) {
 }
 // 添加订单
 export function addOrder(data) {
-    return request({
+    return microwaveRequest({
         url: "/validationOrder/addOrder",
         method: "post",
         headers: { "Content-Type": "multipart/form-data" },
diff --git a/src/api/home.js b/src/api/home.js
index 31bc361..91490f9 100644
--- a/src/api/home.js
+++ b/src/api/home.js
@@ -1,8 +1,8 @@
-import request from '@/lib/request'
+import microwaveRequest from "@/lib/request-microwave";
 
 // 获取样本数据
 export function getStarSamples(data){
-    return request({
+    return microwaveRequest({
         url:'/readExcel/parseExcel',
         method:'post',
         data
@@ -11,7 +11,7 @@ export function getStarSamples(data){
 
 // 获取lc样本数据
 export function getLcSamples(data){
-    return request({
+    return microwaveRequest({
         url:'/mockSample/getLcSample',
         method:'post',
         data
@@ -20,7 +20,7 @@ export function getLcSamples(data){
 
 // 获取otg样本数据
 export function getOtgSamples(data){
-    return request({
+    return microwaveRequest({
         url:'/mockSample/getOtgSample',
         method:'post',
         data
@@ -29,7 +29,7 @@ export function getOtgSamples(data){
 
 // 获取sol样本数据
 export function getSolSamples(data){
-    return request({
+    return microwaveRequest({
         url:'/mockSample/getSolSample',
         method:'post',
         data
@@ -39,7 +39,7 @@ export function getSolSamples(data){
 // 选中的样本数据入库
 
 export function insertSampleList(data){
-    return request({
+    return microwaveRequest({
         url:'/metaDataOrder/insertSampleList',
         method:'post',
         headers:{'Content-Type':'multipart/form-data'},
@@ -49,7 +49,7 @@ export function insertSampleList(data){
 
 // 地表覆盖类型关联入库
 export function addCoverType(data){
-    return request({
+    return microwaveRequest({
         url:'/landCoverType/addCoverType',
         method:'post',
         headers:{'Content-Type':'multipart/form-data'},
@@ -59,7 +59,7 @@ export function addCoverType(data){
 
 // 地表覆盖类型关联批量入库
 export function addCoverTypeBatch(data){
-    return request({
+    return microwaveRequest({
         url:'/landCoverType/addCoverTypeBatch',
         method:'post',
         data
@@ -68,7 +68,7 @@ export function addCoverTypeBatch(data){
 
 // 地表覆盖类型关联入库
 export function initOrderStage(data){
-    return request({
+    return microwaveRequest({
         url:'orderStatus/initOrderStage',
         method:'post',
         headers:{'Content-Type':'multipart/form-data'},
diff --git a/src/api/lang/pendingOrder.js b/src/api/lang/pendingOrder.js
new file mode 100644
index 0000000..c9d9b35
--- /dev/null
+++ b/src/api/lang/pendingOrder.js
@@ -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"
+    });
+}
diff --git a/src/api/pendingOrder.js b/src/api/pendingOrder.js
index 6b6223e..36d3bf9 100644
--- a/src/api/pendingOrder.js
+++ b/src/api/pendingOrder.js
@@ -1,4 +1,4 @@
-import request from "@/lib/request";
+import microwaveRequest from "@/lib/request-microwave";
 import realityRequest from "@/lib/request-reality";
 import fileRequest from "@/lib/request-file";
 
@@ -31,7 +31,7 @@ export function getProductMetaMsg(data) {
 }
 // 获取待检验产品订单列表
 export function getPendingList(data) {
-    return request({
+    return microwaveRequest({
         url: "validationOrder/getPendingList",
         method: "post",
         headers: { "Content-Type": "multipart/form-data" },
@@ -41,7 +41,7 @@ export function getPendingList(data) {
 
 //更新订单信息
 export function updateOrderMsg(data) {
-    return request({
+    return microwaveRequest({
         url: "validationOrder/update",
         method: "post",
         data
@@ -49,7 +49,7 @@ export function updateOrderMsg(data) {
 }
 // 获取订单信息
 export function getProductMsg(data) {
-    return request({
+    return microwaveRequest({
         url: "validationOrder/getOrderMsg",
         method: "post",
         data
@@ -58,7 +58,7 @@ export function getProductMsg(data) {
 
 //更新订单编辑状态
 export function updateOrderStatus(orderId) {
-    return request({
+    return microwaveRequest({
         url: "/validationOrder/updateTime?id=" + orderId,
         method: "get"
     });
@@ -66,7 +66,7 @@ export function updateOrderStatus(orderId) {
 
 //更新订单编辑状态
 export function disOrderStatus(orderId) {
-    return request({
+    return microwaveRequest({
         url: "/validationOrder/updateByIdTimeNull?id=" + orderId,
         method: "get"
     });
@@ -94,14 +94,14 @@ export function getSamplesByLayer(data) {
 
 // 获取订单关联的所有样本数据
 export function getOrderSamples(orderId, productType) {
-    return request({
+    return microwaveRequest({
         url: "metaDataOrder/getOrderSamples?orderId=" + orderId + "&productType=" + productType,
         method: "post"
     });
 }
 // 根据样本ID删除订单样本数据
 export function deleteOrderSamplesByID(sampleId, productType) {
-    return request({
+    return microwaveRequest({
         url:
             "metaDataOrder/deleteOrderSamplesByID?sampleId=" +
             sampleId +
@@ -112,7 +112,7 @@ export function deleteOrderSamplesByID(sampleId, productType) {
 }
 // 抽样后样本数据入库
 export function addConnectSamples(data) {
-    return request({
+    return microwaveRequest({
         url: "metaDataOrder/updateConnectSamples",
         method: "post",
         headers: { "Content-Type": "multipart/form-data" },
@@ -121,7 +121,7 @@ export function addConnectSamples(data) {
 }
 // 查询订单关联的地物映射关系
 export function getCoverTypes(orderId) {
-    return request({
+    return microwaveRequest({
         url: "landCoverType/getCoverType?orderId=" + orderId,
         method: "post"
     });
@@ -129,7 +129,7 @@ export function getCoverTypes(orderId) {
 
 // 地表覆盖类型与空基类型关联
 export function updateFeature(data) {
-    return request({
+    return microwaveRequest({
         url: "landCoverType/updateCoverType",
         method: "post",
         headers: { "Content-Type": "multipart/form-data" },
@@ -139,7 +139,7 @@ export function updateFeature(data) {
 
 // 订单反馈
 export function orderFeedback(data) {
-    return request({
+    return microwaveRequest({
         url: "ordersFeedback/orderFeedback",
         method: "post",
         headers: { "Content-Type": "multipart/form-data" },
@@ -149,7 +149,7 @@ export function orderFeedback(data) {
 
 // 订单状态更新
 export function updateOrderStage(data) {
-    return request({
+    return microwaveRequest({
         url: "orderStatus/updateOrderStage",
         method: "post",
         headers: { "Content-Type": "multipart/form-data" },
@@ -177,7 +177,7 @@ export function exportWord(data, pdfName, localTiffPath, httpTiffPath, productTy
 
 //下载PDF报告
 export function downloadPdf(url) {
-    return request({
+    return microwaveRequest({
         url: url,
         responseType: "blob",
         method: "GET"
@@ -186,7 +186,7 @@ export function downloadPdf(url) {
 
 // 添加报告信息
 export function addReportMsg(data) {
-    return request({
+    return microwaveRequest({
         url: "validationReport/addReportMsg",
         headers: { "Content-Type": "multipart/form-data" },
         method: "post",
@@ -195,7 +195,7 @@ export function addReportMsg(data) {
 }
 // 查询报告信息
 export function getReportMsg(orderId) {
-    return request({
+    return microwaveRequest({
         url: "validationReport/getReportMsg?orderId=" + orderId,
         method: "get"
     });
@@ -203,7 +203,7 @@ export function getReportMsg(orderId) {
 
 //获取订单处理失败的信息
 export function getFeedbackMsg(orderId) {
-    return request({
+    return microwaveRequest({
         url: "ordersFeedback/getFeedbackMsg?orderId=" + orderId,
         method: "get"
     });
diff --git a/src/components/ration/otgCorrection/index.vue b/src/components/ration/otgCorrection/index.vue
index 8d5be70..22eaf37 100644
--- a/src/components/ration/otgCorrection/index.vue
+++ b/src/components/ration/otgCorrection/index.vue
@@ -7,18 +7,6 @@
       <div class="otgCardContent">
         <el-form :inline="true" :model="simpleForm" class="demo-form-inline">
           <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
               v-model="simpleForm.sampleFun"
               :disabled="sampleFun !== ''"
@@ -75,32 +63,36 @@
           <el-table-column label="序号" type="index" width="70">
           </el-table-column>
           <el-table-column
-            prop="sampleId"
+            prop="samplesId"
             label="样本编号"
             show-overflow-tooltip
           >
           </el-table-column>
           <el-table-column label="纬度(°)" sortable show-overflow-tooltip>
             <template slot-scope="scope">{{
-              scope.row.lat.toFixed(8)
+              parseFloat(scope.row.measureLat.toFixed(8))
             }}</template>
           </el-table-column>
           <el-table-column label="经度(°)" sortable>
             <template slot-scope="scope">{{
-              scope.row.lon.toFixed(8)
+              parseFloat(scope.row.measureLong.toFixed(8))
             }}</template>
           </el-table-column>
-          <!-- <el-table-column label="高程" sortable prop="alt"></el-table-column> -->
           <el-table-column
             label="采样时间"
             sortable
-            prop="dataTime"
+            prop="collectDate"
             show-overflow-tooltip
           >
           </el-table-column>
-          <el-table-column label="选取点纬度" prop="sameLat"></el-table-column>
-          <el-table-column label="选取点经度" prop="sameLon"></el-table-column>
-          <!-- <el-table-column label="选取点高度" prop="sameAlt"></el-table-column> -->
+          <el-table-column
+            label="选取点纬度"
+            prop="sameNameLat"
+          ></el-table-column>
+          <el-table-column
+            label="选取点经度"
+            prop="sameNameLong"
+          ></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope"
               ><i
@@ -110,7 +102,6 @@
             ></template>
           </el-table-column>
         </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 class="sceneShow">
@@ -196,12 +187,19 @@
 <script>
 import Pagination from "@/components/Pagination";
 import OtgProductInfo from "@/components/otgProductInfo";
+// import {
+//   getSampleData,
+//   getOrderSamples,
+//   getSamplesByLayer,
+//   deleteOrderSamplesByID,
+// } from "@/api/pendingOrder";
 import {
+  getSamplesList,
   getSampleData,
-  getOrderSamples,
   getSamplesByLayer,
-  deleteOrderSamplesByID,
-} from "@/api/pendingOrder";
+  setSamePoi,
+} from "@/api/lang/pendingOrder";
+
 import otgCesiumUtils from "@/lib/otgCesiumUtils";
 import SampleSetting from "@/components/ration/sampleSetting/index.vue";
 import WKT from "terraformer-wkt-parser";
@@ -245,20 +243,6 @@ export default {
       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() {
     return {
       simpleForm: {
@@ -286,11 +270,6 @@ export default {
       depthList: [],
     };
   },
-  // watch:{
-  //   geoWorkSpace:function(value){
-  //     otgCesiumUtils.addlayer(value,this.geoLayerName)
-  //   }
-  // },
   mounted() {
     otgCesiumUtils.initCesium(["farViewer", "nearViewer"]);
     otgCesiumUtils.addlayer(this.geoWorkSpace, this.geoLayerName);
@@ -306,7 +285,7 @@ export default {
   },
   created() {
     this.funcOpt = this.configration.funcOpt;
-    this.getSplData();
+    this.getSqlData();
     this.initParam();
   },
   methods: {
@@ -314,7 +293,6 @@ export default {
       this.stepSampling = newVal;
     },
     handleDepthList(newVal) {
-      // console.log('handleDepthList', newVal)
       this.depthList = newVal;
     },
     editDeepSpace() {
@@ -339,7 +317,6 @@ export default {
       } else {
         this.isDeepSpace = false;
       }
-      // this.stepSampling = this.sampleFun == "1" && this?.sampleCldFun == "0";
     },
     changeSampleFun(sfVal) {
       if (Array.isArray(sfVal)) {
@@ -350,9 +327,6 @@ export default {
           this.isDeepSpace = false;
         }
       }
-      // const ssf = Number(sfVal);
-      // if (ssf === 1 && this.sampleCldFun !== '') this.stepSampling = true;
-      // else this.stepSampling = false;
     },
     samplesCk() {
       const self = this;
@@ -365,7 +339,7 @@ export default {
         ssn = self.simpleForm.sampleNum;
       if (ssn == "") {
         this.$message.error("请选择抽样个数");
-        this.getSplData();
+        this.getSqlData();
         return false;
       }
       if (ssn > st) {
@@ -376,9 +350,8 @@ export default {
         this.$message.error("样本个数不可为负数");
         return false;
       }
-      if (Number(ssf[0]) === 1) {
+      if (Number(ssf[0]) === 2) {
         const stepSampParams = self.$refs.sampleSettingPanel;
-        // const hierarchyVal = stepSampParams.hierarchyVal;
         const hierarchyVal = ssf[1];
         if (hierarchyVal === "" || hierarchyVal === undefined) {
           self.stepSampling = true;
@@ -388,15 +361,11 @@ export default {
         ssForm.append("samplesList", JSON.stringify(this.allSampleData));
         ssForm.append("stepType", Number(hierarchyVal));
         ssForm.append("orderID", this.orderId);
-        // ssForm.append("productType",this.productSubType);
         if (hierarchyVal === "0") {
-          // const depthList = stepSampParams.depthList;
           const depthList = this.depthList;
-          // console.log('=====', depthList)
           ssForm.append("condition", JSON.stringify(depthList));
         } else if (hierarchyVal === "2") {
           const jsonContent = JSON.parse(stepSampParams.jsonContent);
-          // const jsonContentWKT = WKT.convert(jsonContent.geometries[0]);
           const jg = jsonContent.geometries;
           const newPolygon = [];
           for (let i in jg) {
@@ -455,9 +424,9 @@ export default {
     tableRowClk(row) {
       this.radioClkMsg = row;
       otgCesiumUtils.removePoint();
-      const lon = row.lon,
-        lat = row.lat,
-        alt = row.alt;
+      const lon = row.measureLong,
+        lat = row.measureLat,
+        alt = 10;
       otgCesiumUtils.addPointToFarViewer(lon, lat, alt);
       otgCesiumUtils.addPointToNearViewer(lon, lat, alt);
       this.ckPoint = false;
@@ -474,7 +443,6 @@ export default {
     },
     // 选择相同的点
     ckSamePoi() {
-      // console.log('选择同名点');
       otgCesiumUtils.drawPoint((point) => {
         this.radioClkMsg.sameLon = Number(point[0]);
         this.radioClkMsg.sameLat = Number(point[1]);
@@ -484,7 +452,6 @@ export default {
     },
     // 保存相同的点
     saveSamePoi() {
-      // console.log("保存同名点成功");
       this.ckPoint = true;
       this.savePoint = true;
       otgCesiumUtils.stopDrowPoi();
@@ -502,14 +469,14 @@ export default {
           alImgDom.src = this.measurePicDistant;
       }
     },
-    getSplData() {
-      getOrderSamples(this.orderId, this.productSubType).then((res) => {
-        // console.log(res)
+    getSqlData() {
+      getSamplesList(this.orderId).then((res) => {
+        console.log("111111111", res);
         if (res.code == 200) {
           this.multipleSelection =
             this.allSampleData =
             this.simpleData =
-              res.data;
+              res.data.list;
           this.loading = false;
           this.$refs.multipleTable.toggleAllSelection();
           let min = Number.MAX_SAFE_INTEGER;
@@ -529,11 +496,6 @@ export default {
     },
     deleteSelected(index, simpleData) {
       simpleData.splice(index, 1);
-      // deleteOrderSamplesByID(sampleId, this.productSubType).then((res) => {
-      //   if (res.code == 200) {
-      //     this.getSplData();
-      //   }
-      // });
     },
     pickValueFar() {
       otgCesiumUtils.handleClickFar();
diff --git a/src/components/ration/qualitative/index.vue b/src/components/ration/qualitative/index.vue
index 8549a96..22e9f75 100644
--- a/src/components/ration/qualitative/index.vue
+++ b/src/components/ration/qualitative/index.vue
@@ -120,7 +120,7 @@
               <el-table-column label="序号" type="index" width="70">
               </el-table-column>
               <el-table-column
-                prop="sampleId"
+                prop="samplesId"
                 label="样本编号"
                 show-overflow-tooltip
               >
@@ -133,7 +133,7 @@
               >
               </el-table-column>
               <el-table-column
-                prop="lon"
+                prop="lng"
                 label="经度"
                 sortable
                 show-overflow-tooltip
@@ -145,9 +145,12 @@
                 show-overflow-tooltip
                 sortable
               >
+                <template slot-scope="scope">{{
+                  scope.row.paramStr | getCoverName
+                }}</template>
               </el-table-column>
               <el-table-column
-                prop="dataTime"
+                prop="collectDate"
                 label="采样时间"
                 sortable
                 show-overflow-tooltip
@@ -221,13 +224,18 @@
 </template>
 
 <script>
+// import {
+//   getCoverTypes,
+//   getSampleData,
+//   getOrderSamples,
+//   getSamplesByLayer,
+// } from "@/api/pendingOrder";
 import {
-  getCoverTypes,
+  getSamplesList,
   getSampleData,
-  getOrderSamples,
   getSamplesByLayer,
-  deleteOrderSamplesByID,
-} from "@/api/pendingOrder";
+} from "@/api/lang/pendingOrder";
+
 import cu from "@/lib/cesiumUtils";
 import SampleSetting from "@/components/ration/sampleSetting/index.vue";
 import WKT from "terraformer-wkt-parser";
@@ -273,17 +281,8 @@ export default {
     },
   },
   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;
+    getCoverName(paramStr) {
+      return JSON.parse(paramStr).covernm;
     },
   },
   data() {
@@ -308,12 +307,6 @@ export default {
       depthList: [],
     };
   },
-  // watch:{
-  //   geoWorkSpace:function(value){
-  //     cu.addlayer(value,this.geoLayerName)
-  //     cu.flyToLayer(this.geoLayerPos[0],this.geoLayerPos[1]);
-  //   }
-  // },
   mounted() {
     cu.initCesium("sceneShowContent");
     cu.handleClick();
@@ -329,8 +322,8 @@ export default {
     }
 
     this.funcOpt = this.configration.funcOpt;
-    this.getCoverType();
-    this.getSplData();
+    // this.getCoverType();
+    this.getSqlData();
     this.initParam();
   },
   methods: {
@@ -447,14 +440,14 @@ export default {
         }
       });
     },
-    getSplData() {
-      // console.log(this.productSubType)
-      getOrderSamples(this.orderId, this.productSubType).then((res) => {
+    getSqlData() {
+      getSamplesList(this.orderId).then((res) => {
+        // console.log("111111111", res);
         if (res.code == 200) {
           this.multipleSelection =
             this.allSampleData =
             this.simpleData =
-              res.data;
+              res.data.list;
           this.loading = false;
           this.$refs.multipleTable.toggleAllSelection();
           let min = Number.MAX_SAFE_INTEGER;
@@ -468,7 +461,7 @@ export default {
           if (this.allSampleData.length > 0) {
             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;
       if (ssn == "") {
         this.$message.error("请选择抽样个数");
-        this.getSplData();
+        this.getSqlData();
         return false;
       }
       if (ssn > st) {
@@ -505,10 +498,8 @@ export default {
         this.$message.error("样本个数不可为负数");
         return false;
       }
-      if (Number(ssf[0]) === 1) {
-        // self.stepSampling = true;
+      if (Number(ssf[0]) === 2) {
         const stepSampParams = self.$refs.sampleSettingPanel;
-        // const hierarchyVal = stepSampParams.hierarchyVal;
         const hierarchyVal = ssf[1];
         if (hierarchyVal === "" || hierarchyVal === undefined) {
           self.stepSampling = true;
@@ -518,15 +509,11 @@ export default {
         ssForm.append("samplesList", JSON.stringify(this.allSampleData));
         ssForm.append("stepType", Number(hierarchyVal));
         ssForm.append("orderID", this.orderId);
-        // ssForm.append("productType",this.productSubType);
         if (hierarchyVal === "0") {
-          // const depthList = stepSampParams.depthList;
           const depthList = this.depthList;
-          // console.log('=====', depthList)
           ssForm.append("condition", JSON.stringify(depthList));
         } else if (hierarchyVal === "2") {
           const jsonContent = JSON.parse(stepSampParams.jsonContent);
-          // const jsonContentWKT = WKT.convert(jsonContent.geometries[0]);
           const jg = jsonContent.geometries;
           const newPolygon = [];
           for (let i in jg) {
@@ -580,11 +567,6 @@ export default {
     },
     deleteSelected(index, simpleData) {
       simpleData.splice(index, 1);
-      // deleteOrderSamplesByID(sampleId, this.productSubType).then((res) => {
-      //   if (res.code == 200) {
-      //     this.getSplData();
-      //   }
-      // });
     },
     pickValue() {
       cu.handleClick();
diff --git a/src/components/ration/sampleSetting/index.vue b/src/components/ration/sampleSetting/index.vue
index 3c4af21..bb84631 100644
--- a/src/components/ration/sampleSetting/index.vue
+++ b/src/components/ration/sampleSetting/index.vue
@@ -1,21 +1,11 @@
 <template>
   <div class="sampleFunParam">
-    <el-dialog title="深度空间分层抽样设置" :visible.sync="stepSampling" width="35%">
-      <!-- <el-select
-        v-model="hierarchyVal"
-        placeholder="分层选择"
-        @change="setHierarchy"
-      >
-        <el-option
-          v-for="item in hierarchyOpt"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        >
-        </el-option>
-      </el-select> -->
+    <el-dialog
+      title="深度空间分层抽样设置"
+      :visible.sync="stepSampling"
+      width="35%"
+    >
       <div class="hint">
-        <!-- <span>{{ hierarchyVal === "0" ? altRangeText : "" }}</span> -->
         <span>{{ altRangeText }}</span>
       </div>
       <div v-if="hierarchyVal === '2'">
@@ -127,7 +117,6 @@ export default {
   },
   data() {
     return {
-      // stepShow: false,
       hierarchyVal: "0",
       hierarchyOpt: [
         {
@@ -138,28 +127,26 @@ export default {
           value: "1",
           label: "场站网空间分层",
         },
-        // , {
-        //   value: '2',
-        //   label: '空间区域分层'
-        // }
       ],
       depthList: [],
       editable: [],
       jsonContent: null,
-      depths: []
+      depths: [],
     };
   },
   watch: {
     stepSampling: function (value) {},
-    '$store.state.altRange': function(value) {
-      const temp = (value === null || value === "") ? [1, 5] : value.split(',');
+    "$store.state.altRange": function (value) {
+      const temp = value === null || value === "" ? [1, 5] : value.split(",");
       this.depths = temp;
-      this.depthList = [{
-        startDepth: this.depths[0],
-        endDepth: this.depths[1],
-      }]
-      this.$emit('handleDepthList', this.depthList)
-    }
+      this.depthList = [
+        {
+          startDepth: this.depths[0],
+          endDepth: this.depths[1],
+        },
+      ];
+      this.$emit("handleDepthList", this.depthList);
+    },
   },
   computed: {
     altRangeText: function () {
@@ -171,42 +158,44 @@ export default {
             ")";
     },
   },
-  created() {},  
+  created() {},
   mounted() {
     this.initParams();
-    this.changeNum(0, 'editStartDepthInput');
-    this.changeNum(0, 'editEndDepthInput');
+    this.changeNum(0, "editStartDepthInput");
+    this.changeNum(0, "editEndDepthInput");
   },
   methods: {
     initParams() {
-      this.depthList = [{
-        startDepth: this.depths[0],
-        endDepth: this.depths[1],
-      }];
-      this.$emit('handleDepthList', this.depthList);
+      this.depthList = [
+        {
+          startDepth: this.depths[0],
+          endDepth: this.depths[1],
+        },
+      ];
+      this.$emit("handleDepthList", this.depthList);
     },
     // 修改地表覆盖
     changeNum(index, className) {
       // tableList为表格数据
       this.editable = new Array(this.depthList.length);
       this.editable[index] = true;
-      // this.saveItem = this.depthList[index];
       this.$set(this.editable, index, true);
-      //让input自动获取焦点
       this.$nextTick(function () {
         var editInputList = document.getElementsByClassName(className);
         editInputList[0]?.children[0]?.focus();
       });
     },
     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) {
-      if(this.depthList.length === 1) return;
+      if (this.depthList.length === 1) return;
       this.depthList.splice(index, 1);
     },
     setHierarchy(val) {
-      // console.log("当前值", val);
       if (val === "0") {
         this.depthList = [
           {
@@ -234,18 +223,15 @@ export default {
       };
     },
     submitSampleFunSet() {
-      // console.log(this.jsonContent)
       if (this.hierarchyVal === "2" && this.jsonContent === null) {
         this.$message.error("请上传深度JSON文件");
         return false;
       }
-      // this.stepShow = false;
-      this.$emit('handleStepSampling', false);
-      this.$emit('handleDepthList', this.depthList);
+      this.$emit("handleStepSampling", false);
+      this.$emit("handleDepthList", this.depthList);
     },
     cancelSampleFunSet() {
-      // this.stepShow = false;
-      this.$emit('handleStepSampling', false);
+      this.$emit("handleStepSampling", false);
     },
   },
 };
diff --git a/src/components/ration/soilMoisture/index.vue b/src/components/ration/soilMoisture/index.vue
index aec923e..a719c24 100644
--- a/src/components/ration/soilMoisture/index.vue
+++ b/src/components/ration/soilMoisture/index.vue
@@ -8,18 +8,6 @@
         <div>
           <el-form :inline="true" :model="simpleForm" class="demo-form-inline">
             <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
                 v-model="simpleForm.sampleFun"
                 :disabled="sampleFun !== ''"
@@ -71,7 +59,7 @@
             <el-table-column label="序号" type="index" width="70">
             </el-table-column>
             <el-table-column
-              prop="sampleId"
+              prop="samplesId"
               label="样本编号"
               show-overflow-tooltip
               min-width="100px;"
@@ -85,22 +73,19 @@
             >
             </el-table-column>
             <el-table-column
-              prop="lon"
+              prop="lng"
               label="经度"
               sortable
               show-overflow-tooltip
             >
             </el-table-column>
-            <el-table-column
-              prop="dataValue"
-              :label="productSubTypeName"
-              show-overflow-tooltip
-              sortable
-              min-width="150px;"
-            >
+            <el-table-column :label="smLabel" show-overflow-tooltip>
+              <template slot-scope="scope">{{
+                scope.row.paramStr | getSampleVal
+              }}</template>
             </el-table-column>
             <el-table-column
-              prop="dataTime"
+              prop="collectDate"
               label="采样时间"
               sortable
               show-overflow-tooltip
@@ -143,11 +128,11 @@
 
 <script>
 import {
+  getSamplesList,
   getSampleData,
-  getOrderSamples,
   getSamplesByLayer,
-  deleteOrderSamplesByID,
-} from "@/api/pendingOrder";
+} from "@/api/lang/pendingOrder";
+
 import cu from "@/lib/cesiumUtils";
 import SampleSetting from "@/components/ration/sampleSetting/index.vue";
 import WKT from "terraformer-wkt-parser";
@@ -192,17 +177,8 @@ export default {
     },
   },
   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;
+    getSampleVal(paramStr) {
+      return JSON.parse(paramStr).featureValue.featureValue;
     },
   },
   data() {
@@ -244,7 +220,6 @@ export default {
       this.stepSampling = newVal;
     },
     handleDepthList(newVal) {
-      // console.log('handleDepthList', newVal)
       this.depthList = newVal;
     },
     editDeepSpace() {
@@ -262,14 +237,13 @@ 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;
       } else {
         this.isDeepSpace = false;
       }
-      // this.stepSampling = this.sampleFun == "1" && this?.sampleCldFun == "0";
     },
     pickValue() {
       cu.handleClick();
@@ -279,7 +253,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;
@@ -308,9 +282,8 @@ export default {
         this.$message.error("样本个数不可为负数");
         return false;
       }
-      if (Number(ssf[0]) === 1) {
+      if (Number(ssf[0]) === 2) {
         const stepSampParams = self.$refs.sampleSettingPanel;
-        // const hierarchyVal = stepSampParams.hierarchyVal;
         const hierarchyVal = ssf[1];
         if (hierarchyVal === "" || hierarchyVal === undefined) {
           self.stepSampling = true;
@@ -320,15 +293,11 @@ export default {
         ssForm.append("samplesList", JSON.stringify(self.allSampleData));
         ssForm.append("stepType", Number(hierarchyVal));
         ssForm.append("orderID", self.orderId);
-        // ssForm.append("productType",this.productSubType);
         if (hierarchyVal === "0") {
-          // const depthList = stepSampParams.depthList;
           const depthList = this.depthList;
-          // console.log('=====', depthList)
           ssForm.append("condition", JSON.stringify(depthList));
         } else if (hierarchyVal === "2") {
           const jsonContent = JSON.parse(stepSampParams.jsonContent);
-          // const jsonContentWKT = WKT.convert(jsonContent.geometries[0]);
           const jg = jsonContent.geometries;
           const newPolygon = [];
           for (let i in jg) {
@@ -357,7 +326,7 @@ export default {
             self.$refs.multipleTable.toggleAllSelection();
             cu.removePoint();
             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();
           cu.removePoint();
           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();
       if (val.length !== 0) {
         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;
     },
     getSplData() {
-      getOrderSamples(this.orderId, this.productSubType).then((res) => {
+      getSamplesList(this.orderId).then((res) => {
         if (res.code == 200) {
-          let rd = res.data;
-          for (const i in rd) {
-            rd[i]["hierarchicalIdentification"] = "0";
+          let rd = res.data.list;
+          if (rd.length > 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) {
       simpleData.splice(index, 1);
-      //   deleteOrderSamplesByID(sampleId, this.productSubType).then((res) => {
-      //     if (res.code == 200) {
-      //       this.getSplData();
-      //     }
-      //   });
     },
   },
   computed: {
-    productSubTypeName: function () {
-      return this.configration.subProductName[this.productSubType];
-    },
     globalSampleFun: function () {
       return this.$store.state.sampleFun;
     },
diff --git a/src/components/rtReport/index.vue b/src/components/rtReport/index.vue
index da6c714..9a5918c 100644
--- a/src/components/rtReport/index.vue
+++ b/src/components/rtReport/index.vue
@@ -234,31 +234,31 @@ export default {
     getProductDes() {
       let prodDes = null;
       switch (this.pdSubType) {
-        case 2:
+        case 46:
           prodDes = "高程值，单位：米";
           break;
-        case 3:
+        case 51:
           prodDes = "后向散射系数,单位：dB";
           break;
-        case 4:
+        case 52:
           prodDes = "延迟相位值";
           break;
-        case 5:
+        case 53:
           prodDes = "形变量，单位：米";
           break;
-        case 7:
+        case 38:
           prodDes = "土壤含水量";
           break;
-        case 8:
+        case 49:
           prodDes = "土壤盐碱度";
           break;
-        case 9:
+        case 50:
           prodDes = "地表粗糙度";
           break;
-        case 10:
+        case 48:
           prodDes = "植被高度值，单位：米";
           break;
-        case 11:
+        case 43:
           prodDes = "叶面积指数";
           break;
       }
diff --git a/src/config/config.js b/src/config/config.js
index aec77d9..8a36ca3 100644
--- a/src/config/config.js
+++ b/src/config/config.js
@@ -33,8 +33,9 @@ const serverUrl = "http://192.168.1.104";
 const urlprefix = {
     pdfUrlPrefix: `${serverUrl}:18085/microwaveData/pdf/`,
     samePoiImgsUrl: `${serverUrl}:18085/microwaveData/samePoiImgs/`,
-    geoserverUrl: `${serverUrl}:8087/geoserver/gwc/service/wmts`,
-    otgGeoServerUrl: `${serverUrl}:8087/geoserver/gwc/service/wmts`
+    geoserverUrl: `http://60.10.61.212:18030/geoserver/gwc/service/wmts`,
+    otgGeoServerUrl: `http://60.10.61.212:18030/geoserver/gwc/service/wmts`,
+    // otgGeoServerUrl: `${serverUrl}:8087/geoserver/gwc/service/wmts`
 };
 
 const subProductName = [
@@ -138,38 +139,38 @@ const funcOpt = [
     {
         name: "随机抽样",
         label: "随机抽样",
-        value: "0",
+        value: "1",
         pixelDealFun: [
             {
                 name: "均值法",
-                value: "0"
-            },
-            {
-                name: "最邻近法",
                 value: "1"
             },
+            {
+                name: "最邻近法",
+                value: "6"
+            },
             {
                 name: "克里格法",
-                value: "2"
+                value: "7"
             },
             {
                 name: "块克里格法",
-                value: "3"
+                value: "9"
             },
             {
                 name: "MSN法",
-                value: "4"
+                value: "10"
             }
         ]
     },
     {
         name: "分层抽样",
         label: "分层抽样",
-        value: "1",
+        value: "2",
         pixelDealFun: [
             {
                 name: "MSN法",
-                value: "4"
+                value: "10"
             }
         ],
         children: [
@@ -186,27 +187,27 @@ const funcOpt = [
     {
         name: "等距抽样",
         label: "等距抽样",
-        value: "2",
+        value: "3",
         pixelDealFun: [
             {
                 name: "均值法",
-                value: "0"
-            },
-            {
-                name: "最邻近法",
                 value: "1"
             },
+            {
+                name: "最邻近法",
+                value: "6"
+            },
             {
                 name: "克里格法",
-                value: "2"
+                value: "7"
             },
             {
                 name: "块克里格法",
-                value: "3"
+                value: "9"
             },
             {
                 name: "MSN法",
-                value: "4"
+                value: "10"
             }
         ]
     }
diff --git a/src/lib/contract.js b/src/lib/contract.js
index 4b110aa..101ed22 100644
--- a/src/lib/contract.js
+++ b/src/lib/contract.js
@@ -1,36 +1,36 @@
 export const productSubTypeVal = {
-    ACS_ORTHOPHOTO: 1, // 正射产品校验
-    ACS_DEM: 2, // 高程产品校验
-    ACS_BACKSCATTERINGCOEFFICIENT: 3, // 后向散射系数产品校验
-    ACS_ATMOSPHERICDELAYCORRECTION: 4, // 大气延迟校正产品校验
-    ACS_DEFORMATION: 5, // 干涉测量形变产品校验
-    ACS_TYPESOFLANDCOVER: 6, // 地表覆盖类型产品校验
-    ACS_SOILMOISTURE: 7, // 土壤水分产品校验
-    ACS_SOILSALINITYINVERSION: 8, // 土壤盐碱度产品校验
-    ACS_SURFACEROUGHNESS: 9, // 地表粗糙度产品校验
-    ACS_GROUNDVEGETATIONHEIGHT: 10, // 植被高度产品校验
-    ACS_GROUNDLEAFAREAINDEX: 11, // 叶面积指数产品校验
-    ACS_VEGETATIONPHENOLOGY: 12 // 植被物候产品校验
+    ACS_ORTHOPHOTO: 45, // 正射产品校验
+    ACS_DEM: 46, // 高程产品校验
+    ACS_BACKSCATTERINGCOEFFICIENT: 51, // 后向散射系数产品校验
+    ACS_ATMOSPHERICDELAYCORRECTION: 52, // 大气延迟校正产品校验
+    ACS_DEFORMATION: 53, // 干涉测量形变产品校验
+    ACS_TYPESOFLANDCOVER: 39, // 地表覆盖类型产品校验
+    ACS_SOILMOISTURE: 38, // 土壤水分产品校验
+    ACS_SOILSALINITYINVERSION: 49, // 土壤盐碱度产品校验
+    ACS_SURFACEROUGHNESS: 50, // 地表粗糙度产品校验
+    ACS_GROUNDVEGETATIONHEIGHT: 48, // 植被高度产品校验
+    ACS_GROUNDLEAFAREAINDEX: 43, // 叶面积指数产品校验
+    ACS_VEGETATIONPHENOLOGY: 47 // 植被物候产品校验
 };
 export const pixelFunVal = {
-    PHM_AVERAGING: 0, // 均值法
-    PHM_NEIGHBOR: 1, // 最邻近法
-    PHM_POINTKRIGING: 2, // 克里格法
-    PHM_BLOCKKRIGING: 3, // 块克里格法
-    PHM_MSN: 4 // MSN法
+    PHM_AVERAGING: 1, // 均值法
+    PHM_NEIGHBOR: 6, // 最邻近法
+    PHM_POINTKRIGING: 7, // 克里格法
+    PHM_BLOCKKRIGING: 9, // 块克里格法
+    PHM_MSN: 10 // MSN法
 };
 export const truthFunVal = {
-    ACM_MEANERROR: 0, // 平均误差
-    ACM_MEANABSOLUTEERROR: 1, // 平均绝对误差
-    ACM_RELATIVEERROR: 2, // 相对误差
-    ACM_MEANRELATIVEERROR: 3, // 平均相对误差
-    ACM_ROOTMANSQUAREERROR: 5, // 均方根误差
+    ACM_MEANERROR: 4, // 平均误差
+    ACM_MEANABSOLUTEERROR: 9, // 平均绝对误差
+    ACM_RELATIVEERROR: 5, // 相对误差
+    ACM_MEANRELATIVEERROR: 8, // 平均相对误差
+    ACM_ROOTMANSQUAREERROR: 6, // 均方根误差
     ACM_CORRELATIONCOEFFICIENT: 7, // 相关系数
-    ACM_ERRORMATRIX: 8, // 误差矩阵（混淆矩阵）
-    ACM_OVERALLACCURACY: 9, // 总体分类精度
-    ACM_KAPPA: 10, // Kappa系数
-    ACM_MEANABSOLUTERELATIVEERROR: 4, // 平均绝对相对误差
-    ACM_PLANENESSERROR: 6, // 平面中误差
+    ACM_ERRORMATRIX: 12, // 误差矩阵（混淆矩阵）
+    ACM_OVERALLACCURACY: 14, // 总体分类精度
+    ACM_KAPPA: 13, // Kappa系数
+    ACM_MEANABSOLUTERELATIVEERROR: 24, // 平均绝对相对误差
+    ACM_PLANENESSERROR: 23, // 平面中误差
     ACM_REALVALLIST: 11,  //真值数组记录
-    ACM_OTGERROR:12,    //正射误差记录
+    ACM_OTGERROR:112,    //正射误差记录
 };
diff --git a/src/lib/request-file.js b/src/lib/request-file.js
index 973921d..2c31da3 100644
--- a/src/lib/request-file.js
+++ b/src/lib/request-file.js
@@ -1,60 +1,39 @@
-import axios from 'axios'
-import { Message } from 'element-ui'
+import axios from "axios";
+import { Message } from "element-ui";
 
 // create an axios instance
 const service = axios.create({
-  baseURL: process.env.VUE_APP_FILE_API, // url = base url + request url
-  // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 5000000 // request timeout
-})
+    baseURL: process.env.VUE_APP_FILE_API, // url = base url + request url
+    timeout: 5000000 // request timeout
+});
 
 // request interceptor
 service.interceptors.request.use(
-  config => {
-    // do something before request is sent
-    // if (store.getters.token) {
-    //   config.headers['X-Token'] = getToken()
-    // }
-    return config
-  },
-  error => {
-    // do something with request error
-    console.log(error) // for debug
-    return Promise.reject(error)
-  }
-)
+    config => {
+        return config;
+    },
+    error => {
+        // do something with request error
+        console.log(error); // for debug
+        return Promise.reject(error);
+    }
+);
 
 // response interceptor
 service.interceptors.response.use(
-  response => {
-    const res = response.data
-    // if the custom code is not 20000, it is judged as an error.
-    // if (res.code !== 200) {
-    //   if(res.code === 500){
-    //     return res
-    //   }
-    //   Message({
-    //     message: res.message || 'Error',
-    //     type: 'error',
-    //     duration: 5 * 1000
-    //   })
-    //   // 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)
-  }
-)
+    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
+export default service;
diff --git a/src/lib/request-microwave.js b/src/lib/request-microwave.js
new file mode 100644
index 0000000..3ef849c
--- /dev/null
+++ b/src/lib/request-microwave.js
@@ -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;
diff --git a/src/lib/request-reality.js b/src/lib/request-reality.js
index ea9eb6a..0f86a8d 100644
--- a/src/lib/request-reality.js
+++ b/src/lib/request-reality.js
@@ -1,60 +1,38 @@
-import axios from 'axios'
-import { Message } from 'element-ui'
+import axios from "axios";
+import { Message } from "element-ui";
 
 // create an axios instance
 const service = axios.create({
-  baseURL: process.env.VUE_APP_REALITY_API, // url = base url + request url
-  // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 5000000 // request timeout
-})
+    baseURL: process.env.VUE_APP_REALITY_API, // url = base url + request url
+    timeout: 5000000 // request timeout
+});
 
 // request interceptor
 service.interceptors.request.use(
-  config => {
-    // do something before request is sent
-    // if (store.getters.token) {
-    //   config.headers['X-Token'] = getToken()
-    // }
-    return config
-  },
-  error => {
-    // do something with request error
-    console.log(error) // for debug
-    return Promise.reject(error)
-  }
-)
+    config => {
+        return config;
+    },
+    error => {
+        console.log(error); // for debug
+        return Promise.reject(error);
+    }
+);
 
 // response interceptor
 service.interceptors.response.use(
-  response => {
-    const res = response.data
-    // if the custom code is not 20000, it is judged as an error.
-    // if (res.code !== 200) {
-    //   if(res.code === 500){
-    //     return res
-    //   }
-    //   Message({
-    //     message: res.message || 'Error',
-    //     type: 'error',
-    //     duration: 5 * 1000
-    //   })
-    //   // 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)
-  }
-)
+    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
+export default service;
diff --git a/src/lib/request.js b/src/lib/request.js
index 52bac40..bdb1862 100644
--- a/src/lib/request.js
+++ b/src/lib/request.js
@@ -1,60 +1,38 @@
-import axios from 'axios'
-import { Message } from 'element-ui'
+import axios from "axios";
+import { Message } from "element-ui";
 
 // create an axios instance
 const service = axios.create({
-  baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
-  // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 5000000 // request timeout
-})
+    baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
+    timeout: 5000000 // request timeout
+});
 
 // request interceptor
 service.interceptors.request.use(
-  config => {
-    // do something before request is sent
-    // if (store.getters.token) {
-    //   config.headers['X-Token'] = getToken()
-    // }
-    return config
-  },
-  error => {
-    // do something with request error
-    console.log(error) // for debug
-    return Promise.reject(error)
-  }
-)
+    config => {
+        return config;
+    },
+    error => {
+        console.log(error); // for debug
+        return Promise.reject(error);
+    }
+);
 
 // response interceptor
 service.interceptors.response.use(
-  response => {
-    const res = response.data
-    // if the custom code is not 20000, it is judged as an error.
-    // if (res.code !== 200) {
-    //   if(res.code === 500){
-    //     return res
-    //   }
-    //   Message({
-    //     message: res.message || 'Error',
-    //     type: 'error',
-    //     duration: 5 * 1000
-    //   })
-    //   // 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)
-  }
-)
+    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
+export default service;
diff --git a/src/lib/variateMap.js b/src/lib/variateMap.js
index 09cd965..1353b01 100644
--- a/src/lib/variateMap.js
+++ b/src/lib/variateMap.js
@@ -1,18 +1,18 @@
 //产品枚举映射
 export function productTypeMap(pdtype) {
     const pdtypeMap = {
-        1: "正射产品",
-        2: "高程产品",
-        3: "后向散射系数产品",
-        4: "大气延迟校正产品",
-        5: "干涉测量形变产品",
-        6: "地表覆盖类型产品",
-        7: "土壤水分产品",
-        8: "土壤盐碱度产品",
-        9: "地表粗糙度产品",
-        10: "植被高度产品",
-        11: "叶面积指数产品",
-        12: "植被物候产品"
+        45: "正射产品",
+        46: "高程产品",
+        51: "后向散射系数产品",
+        52: "大气延迟校正产品",
+        53: "干涉测量形变产品",
+        39: "地表覆盖类型产品",
+        38: "土壤水分产品",
+        49: "土壤盐碱度产品",
+        50: "地表粗糙度产品",
+        48: "植被高度产品",
+        43: "叶面积指数产品",
+        47: "植被物候产品"
     };
     if (pdtype == null) return null;
     else return pdtypeMap[pdtype];
@@ -21,18 +21,18 @@ export function productTypeMap(pdtype) {
 //产品--样本类型映射
 export function productTypeSplMap(pdtype) {
     const pdtypeMap = {
-        1: "正射样本",
-        2: "高程样本",
-        3: "后向散射系数样本",
-        4: "大气延迟校正样本",
-        5: "干涉测量形变样本",
-        6: "地表覆盖类型样本",
-        7: "土壤水分样本",
-        8: "土壤盐碱度样本",
-        9: "地表粗糙度样本",
-        10: "植被高度样本",
-        11: "叶面积指数样本",
-        12: "植被物候样本"
+        45: "正射样本",
+        46: "高程样本",
+        51: "后向散射系数样本",
+        52: "大气延迟校正样本",
+        53: "干涉测量形变样本",
+        39: "地表覆盖类型样本",
+        38: "土壤水分样本",
+        49: "土壤盐碱度样本",
+        50: "地表粗糙度样本",
+        48: "植被高度样本",
+        43: "叶面积指数样本",
+        47: "植被物候样本"
     };
     if (pdtype == null) return null;
     else return pdtypeMap[pdtype];
@@ -41,19 +41,19 @@ export function productTypeSplMap(pdtype) {
 //真实性检验方法映射
 export function truthFunctionsMap(truthFun) {
     const truthFunMap = {
-        0: "平均误差",
-        1: "平均绝对误差",
-        2: "相对误差",
-        3: "平均相对误差",
-        4: "平均绝对相对误差",
-        5: "均方根误差",
-        6: "平面中误差",
+        4: "平均误差",
+        9: "平均绝对误差",
+        5: "相对误差",
+        8: "平均相对误差",
+        24: "平均绝对相对误差",
+        6: "均方根误差",
+        23: "平面中误差",
         7: "相关系数",
-        8: "误差矩阵",
-        9: "总体分类精度",
-        10: "Kappa系数",
+        12: "误差矩阵",
+        14: "总体分类精度",
+        13: "Kappa系数",
         11: "产品真值",
-        12: "正射误差列表"
+        112: "正射误差列表"
     };
     if (truthFun == null) return null;
     else return truthFunMap[truthFun];
@@ -62,9 +62,9 @@ export function truthFunctionsMap(truthFun) {
 // 抽样方法枚举转换
 export function transformSlp(sampleFun) {
     const sampleFunMap = {
-        "0": "随机抽样",
-        "1": "分层抽样",
-        "2": "等距抽样"
+        "1": "随机抽样",
+        "2": "分层抽样",
+        "3": "等距抽样"
     };
     if (sampleFun == null) return null;
     else return sampleFunMap[sampleFun];
@@ -72,11 +72,11 @@ export function transformSlp(sampleFun) {
 // 像元级方法枚举转换
 export function transformPcMethod(pixelDealFun) {
     const pixelDealFunMap = {
-        "0": "均值法",
-        "1": "最邻近法",
-        "2": "克里格法",
-        "3": "块克里格法",
-        "4": "MSN法"
+        "1": "均值法",
+        "6": "最邻近法",
+        "7": "克里格法",
+        "9": "块克里格法",
+        "10": "MSN法"
     };
     if (pixelDealFun == null) return null;
     else return pixelDealFunMap[pixelDealFun];
@@ -84,23 +84,23 @@ export function transformPcMethod(pixelDealFun) {
 
 export const PIXELDEALFUNOPTION = [
     {
-        value: "0",
+        value: "1",
         label: "均值法"
     },
     {
-        value: "1",
+        value: "6",
         label: "最邻近法"
     },
     {
-        value: "2",
+        value: "7",
         label: "克里格法"
     },
     {
-        value: "3",
+        value: "9",
         label: "块克里格法"
     },
     {
-        value: "4",
+        value: "10",
         label: "MSN法"
     }
 ];
diff --git a/src/views/Daichuli/Feedback/Inspection/Report/index.vue b/src/views/Daichuli/Feedback/Inspection/Report/index.vue
index aaa6929..0f67e7f 100644
--- a/src/views/Daichuli/Feedback/Inspection/Report/index.vue
+++ b/src/views/Daichuli/Feedback/Inspection/Report/index.vue
@@ -130,28 +130,29 @@
           >
             <el-table-column type="index" label="序号" width="80">
             </el-table-column>
-            <el-table-column prop="sampleId" label="样本编号" sortable>
+            <el-table-column prop="samplesId" label="样本编号" sortable>
             </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="alt" label="高度"></el-table-column>
-            <el-table-column prop="dataTime" label="采样日期" sortable>
-              <template slot-scope="scope">
+            <!-- <el-table-column prop="alt" label="高度"></el-table-column> -->
+            <el-table-column prop="createTime" label="采样日期" sortable>
+              <!-- <template slot-scope="scope">
                 {{ scope.row.dataTime | formatDate }}
-              </template>
+              </template> -->
             </el-table-column>
             <el-table-column
-              prop="addTime"
+              prop="collectDate"
               label="预处理时间"
               sortable
               align="center"
             >
               <template slot-scope="scope">
-                {{ scope.row.addTime | formatDate }}
+                {{ scope.row.createTime }}
+                <!-- {{ scope.row.addTime | formatDate }} -->
               </template>
             </el-table-column>
             <el-table-column
-              prop="dataValue"
+              prop="reliability"
               label="可信度"
               sortable
               align="center"
@@ -174,13 +175,21 @@ import QtReport from "@/components/qtReport";
 import PdfLoad from "@/components/pdfLoad";
 import cu from "@/lib/cesiumUtils";
 import {
-  downloadPdf,
-  updateOrderStage,
-  updateOrderMsg,
-  disOrderStatus,
-  addReportMsg,
+  // downloadPdf,
+  // updateOrderStage,
+  // updateOrderMsg,
+  // disOrderStatus,
+  // addReportMsg,
   exportWord,
 } from "@/api/pendingOrder";
+
+import {
+  saveValidationRes,
+  saveReport,
+  downloadPdf,
+  updateOrderStage,
+} from "@/api/lang/pendingOrder";
+
 import { productSubTypeVal, truthFunVal } from "@/lib/contract.js";
 import {
   truthFunctionsMap,
@@ -244,7 +253,7 @@ export default {
 
     const sd = this.sampleData;
     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) {
@@ -282,7 +291,7 @@ export default {
     init() {
       const self = this;
       const rpm = (self.reportMsg = this.queryParams);
-      // console.log('sendMsg',rpm);
+      console.log("sendMsg", rpm);
       self.realRes = rpm.reportResult;
       self.pdSubType = rpm.pdSubType;
       const rsl = (self.sampleData = rpm.sampleList);
@@ -318,6 +327,7 @@ export default {
     },
     // 生产报告
     exportPdf(rpm) {
+      console.log("11111111", rpm);
       const self = this;
       const asmo = rpm.orderMsg;
       const asmp = rpm.productMsg;
@@ -381,16 +391,16 @@ export default {
         category: category,
         categoryType: productTypeSplMap(self.pdSubType),
         product: productTypeMap(self.pdSubType),
-        orderID: asmo.order_code,
-        reportMaker: localStorage.userName,
-        orderCreateTime: asmo.create_date,
+        orderID: asmo.orderCode,
+        reportMaker: 'DXN',
+        orderCreateTime: asmo.createDate,
         orderStartTime: crTime.startTime,
         orderEndTime: crTime.endTime,
-        reportCreateTime: asmo.create_date,
-        inspectorName: localStorage.userName,
+        reportCreateTime: asmo.createDate,
+        inspectorName: 'DXN',
         productFileName: asmp.fileName,
         resolution: asmm.resRatio + "",
-        productCreateTime: asmp.productDate,
+        productCreateTime: asmp.collectDate,
         coordinatSeystem: asmm.coordinateSys,
         sampleTimeRequest:
           asmo.simple_start_time + "  -  " + asmo.simple_end_time,
@@ -398,10 +408,10 @@ export default {
         sampleCount: rpm.sampleList.length + "",
         // areaLeftUp: asmm.minLon + "," + asmm.maxLat,
         // areaRightDown: asmm.maxLon + "," + asmm.minLat,
-        minLon: asmm.minLon,
-        maxLon: asmm.maxLon,
-        minLat: asmm.minLat,
-        maxLat: asmm.maxLat,
+        minLon: asmm.minLon + "",
+        maxLon: asmm.maxLon + "",
+        minLat: asmm.minLat + "",
+        maxLat: asmm.maxLat + "",
         inspectionAlgorithm: iat,
         sampleList: JSON.stringify(rpm.sampleList),
         inspectionResultList: iatResArr,
@@ -411,8 +421,8 @@ export default {
         otgError: otgError,
       };
       const pdfName = productTypeMap(self.pdSubType) + "报告";
-      const localTiffPath = rpm.tifPath;
-      const httpTiffPath = null;
+      const localTiffPath = null;
+      const httpTiffPath = rpm.tifPath;
       // console.log("1111111", pdfMsg);
       exportWord(pdfMsg, pdfName, localTiffPath, httpTiffPath, psId).then(
         (res) => {
diff --git a/src/views/Daichuli/Feedback/Inspection/index.vue b/src/views/Daichuli/Feedback/Inspection/index.vue
index ec03e81..1c24c28 100644
--- a/src/views/Daichuli/Feedback/Inspection/index.vue
+++ b/src/views/Daichuli/Feedback/Inspection/index.vue
@@ -35,9 +35,6 @@
             sortable
             align="center"
           >
-            <template slot-scope="scope">
-              {{ scope.row.orderSource | orderSourceFilter }}
-            </template>
           </el-table-column>
           <el-table-column
             prop="uploadDate"
@@ -45,9 +42,6 @@
             sortable
             align="center"
           >
-            <template slot-scope="scope">
-              {{ scope.row.uploadDate | formatDate }}
-            </template>
           </el-table-column>
           <el-table-column
             prop="fileName"
@@ -62,9 +56,6 @@
             sortable
             align="center"
           >
-            <template slot-scope="scope">
-              {{ scope.row.fileSize | transformByte }}
-            </template>
           </el-table-column>
           <el-table-column
             prop="fileFormat"
@@ -112,7 +103,7 @@
             <el-form-item label="时间" class="ysjMsg">
               <el-input
                 class="ysjMsgMrg"
-                v-model="formatDateStr"
+                v-model="formInline.producedDate"
                 placeholder="生产时间"
               ></el-input>
             </el-form-item>
@@ -126,7 +117,6 @@
                 <el-radio label="3"></el-radio>
                 <el-radio label="4"></el-radio>
                 <el-radio label="5"></el-radio>
-                <!-- <el-radio label="其他"></el-radio> -->
               </el-radio-group> </el-form-item
             ><br />
             <el-form-item label="坐标系统" class="ysjMsg">
@@ -175,7 +165,7 @@
         :orderId="orderId"
         :productSubType="productSubType"
         ref="otgCorrectionPanel"
-        v-if="productSubType === 1"
+        v-if="productSubType === 45"
       ></OtgCorrection>
       <!-- 地表覆盖 -->
       <Qualitative
@@ -189,10 +179,9 @@
         :orderId="orderId"
         :productSubType="productSubType"
         ref="qualitativePanel"
-        v-else-if="productSubType === 6 || productSubType === 12"
+        v-else-if="productSubType === 39 || productSubType === 47"
       ></Qualitative>
       <!-- 土壤水份等 -->
-      <!-- <SoilMositure :sampleFun="sampleFun" :pixelFun="pixelFun" :pixelNum="pixelNum" :geoWorkSpace="geoWorkSpace" :geoLayerName="geoLayerName" :orderId="orderId" @sendPixelFun="getCldParams" v-else></SoilMositure>  -->
       <SoilMositure
         :sampleFun="sampleFun"
         :sampleCldFun="sampleCldFun"
@@ -259,15 +248,6 @@
                     <el-option label="" value=""></el-option>
                     <el-option
                       label="均值法"
-                      value="0"
-                      v-if="
-                        (globalSampleFun !== 1 && globalSampleFun !== '1') ||
-                        globalSampleFun === null ||
-                        globalSampleFun === ''
-                      "
-                    ></el-option>
-                    <el-option
-                      label="最邻近法"
                       value="1"
                       v-if="
                         (globalSampleFun !== 1 && globalSampleFun !== '1') ||
@@ -275,9 +255,18 @@
                         globalSampleFun === ''
                       "
                     ></el-option>
+                    <el-option
+                      label="最邻近法"
+                      value="6"
+                      v-if="
+                        (globalSampleFun !== 1 && globalSampleFun !== '1') ||
+                        globalSampleFun === null ||
+                        globalSampleFun === ''
+                      "
+                    ></el-option>
                     <el-option
                       label="克里格法"
-                      value="2"
+                      value="7"
                       v-if="
                         (globalSampleFun !== 1 && globalSampleFun !== '1') ||
                         globalSampleFun === null ||
@@ -286,14 +275,14 @@
                     ></el-option>
                     <el-option
                       label="块克里格法"
-                      value="3"
+                      value="9"
                       v-if="
                         (globalSampleFun !== 1 && globalSampleFun !== '1') ||
                         globalSampleFun === null ||
                         globalSampleFun === ''
                       "
                     ></el-option>
-                    <el-option label="MSN法" value="4"></el-option>
+                    <el-option label="MSN法" value="10"></el-option>
                   </el-select>
                 </el-form-item>
               </el-form>
@@ -321,16 +310,6 @@
                 >
                 </el-option>
               </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>
         </div>
@@ -354,11 +333,14 @@ import SoilMositure from "@/components/ration/soilMoisture/index.vue";
 import OtgCorrection from "@/components/ration/otgCorrection/index.vue";
 import Qualitative from "@/components/ration/qualitative/index.vue";
 import {
+  getAnalyseMethod,
+  delSampleData,
+  upDateAnalyseMethod,
   checkReality,
-  addConnectSamples,
-  updateOrderMsg,
-  updateFeature,
-} from "@/api/pendingOrder";
+  exportWord,
+} from "@/api/lang/pendingOrder";
+import qs from "qs";
+
 import { productSubTypeVal, truthFunVal } from "@/lib/contract.js";
 
 export default {
@@ -368,47 +350,6 @@ export default {
     OtgCorrection,
     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() {
     if (
       Object.keys(this.$route.params).length > 0 &&
@@ -469,17 +410,17 @@ export default {
     initOrderPMsg() {
       let self = this;
       const am = (self.allMsg = this.queryParams);
-      // console.log("传输信息1", self.allMsg);
       self.userId = localStorage.userId;
       const om = (self.orderMsg = self.allMsg.orderMsg);
-      self.orderId = om.id;
-      const pdType = om.product_subclass_id;
-      const valMethodIds = om.validation_method_id;
+
+      self.orderId = om.orderId;
+      const pdType = om.productSubClassId;
       this.productSubType = pdType;
 
       self.formInline = am.metaMsg;
       self.orderData = am.orderData;
       self.pixelNum = am.metaMsg.resRatio;
+
       self.geoLayerPos = [
         am.metaMsg.minLon,
         am.metaMsg.minLat,
@@ -489,25 +430,44 @@ export default {
 
       const pm = (this.productMsg = am.productMsg);
       self.geoWorkSpace = pm.geoWorkspace;
-      self.geoLayerName = pm.layerName;
-      self.tifPath = pm.tifPath;
+      self.geoLayerName = pm.geoLayerName;
+      self.tifPath = pm.ftpPath;
 
-      if (valMethodIds !== null) {
-        self.formInline.truthCheckFun = JSON.parse(valMethodIds);
-        if (self.formInline.truthCheckFun.length !== []) self.truthFun = true;
+      // 赋值真实性检验方法
+      getAnalyseMethod(self.orderId).then((res) => {
+        // 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 !== "") {
         this.pdShow = true;
         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 !== "") {
         this.$store.commit("setSampleFun", this.sampleFun);
       }
+
       if (om.samplingMethodCldId !== null) {
         self.sampleCldFun = om.samplingMethodCldId + "";
       }
@@ -519,10 +479,6 @@ export default {
         return "background:#FFFFFF";
       }
     },
-    // getCldParams(msg){
-    //   this.pixelFun = msg.funId;
-    //   this.sampleList = msg.splList;
-    // },
     todaichuli() {
       this.$router.push(this.configration.path.daichuli);
     },
@@ -534,6 +490,7 @@ export default {
       var smpVal = undefined;
       var featureMapData = [];
       const pdType = this.productSubType;
+
       if (pdType === productSubTypeVal.ACS_ORTHOPHOTO) {
         smpVal = this.$refs.otgCorrectionPanel;
       } else if (
@@ -545,12 +502,15 @@ export default {
       } else {
         smpVal = this.$refs.soilMositurePanel;
       }
+
       this.sampleList = smpVal.multipleSelection;
-      // console.log(this.pixelFun,this.sampleList,featureMapData);
+
       if (featureMapData !== [] || featureMapData.length !== 0)
         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) {
         this.$message.error("请选择样本数据");
         return false;
@@ -559,16 +519,23 @@ export default {
         this.$message.error("真实性检验方法");
         return false;
       }
-      this.checkRealityWait = true;
       // 关联的样本数据入库
-      this.addCotSamples(this.sampleList, pdType);
-      // console.log('传输报告信息',this.sampleList)
+      // const allSampleData = smpVal.allSampleData;
+      // this.addCotSamples(this.sampleList,allSampleData,orderId)
+      //更新真实性检验方法
+      // this.updateTruthFun(orderId, tcf);
+
+      this.checkRealityWait = true;
       // 真实性校验方法
       var formData = new FormData();
       formData.append("orderId", orderId); //订单ID
       formData.append("productType", this.productSubType); //产品类型
-      formData.append("isHttpUrl", false); //产品路径
-      formData.append("dataPath", this.tifPath); //产品路径
+      formData.append("isHttpUrl", true); //产品路径
+      // 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)); //样本数据
       if (this.pixelFun !== "")
         formData.append("pixelHandleType", this.pixelFun); //像元级处理方法（正射校正产品不需要）
@@ -610,19 +577,26 @@ export default {
         }
       });
     },
-
-    addCotSamples(samplesList, pdType) {
-      // console.log(samplesList,pdType)
-      // const asForm = new FormData();
-      // asForm.append("sampleList", JSON.stringify(samplesList));
-      // asForm.append("pdType", pdType);
-      // addConnectSamples(asForm).then((res) => {
-      //   // console.log(res)
-      // });
-      updateOrderMsg({
-        id: this.orderMsg.id,
-        sample: JSON.stringify(samplesList),
-      });
+    addCotSamples(samplesList, allSampleData, orderId) {
+      for (let i in samplesList) {
+        allSampleData = allSampleData.filter(function (o) {
+          return o.id !== samplesList[i].id;
+        });
+      }
+      const isDel = [];
+      for (let i in allSampleData) {
+        isDel.push(allSampleData[i].id);
+      }
+      const dsForm = new FormData();
+      dsForm.append("orderId", orderId);
+      dsForm.append("idList", isDel);
+      delSampleData(dsForm);
+    },
+    // 更新真实性检验方法
+    updateTruthFun(orderId, tcf) {
+      upDateAnalyseMethod(
+        qs.stringify({ list: tcf, orderId: orderId }, { indices: false })
+      );
     },
     updateCoverType(featureMapData) {
       for (let i in featureMapData) {
@@ -630,7 +604,7 @@ export default {
         if (fi.typeIdKg !== null) {
           const fParams = new FormData();
           fParams.append("coverId", fi.id);
-          fParams.append("kgTypeId", fi.typeIdKg);
+          fParams.append("kgTypeId", Number(fi.typeIdKg));
           fParams.append("kgTypeName", fi.typeNameKg);
           updateFeature(fParams);
         }
@@ -646,38 +620,38 @@ export default {
       const tf = truthFunVal;
       if (opt === pst.ACS_ORTHOPHOTO) {
         this.truthCheckFunOpt = [
-          { value: tf.ACM_MEANERROR + "", label: "平均误差" },
-          { value: tf.ACM_MEANABSOLUTEERROR + "", label: "平均绝对误差" },
-          { value: tf.ACM_RELATIVEERROR + "", label: "相对误差" },
-          { value: tf.ACM_MEANRELATIVEERROR + "", label: "平均相对误差" },
+          { value: tf.ACM_MEANERROR, label: "平均误差" },
+          { value: tf.ACM_MEANABSOLUTEERROR, label: "平均绝对误差" },
+          { value: tf.ACM_RELATIVEERROR, label: "相对误差" },
+          { value: tf.ACM_MEANRELATIVEERROR, label: "平均相对误差" },
           {
-            value: tf.ACM_MEANABSOLUTERELATIVEERROR + "",
+            value: tf.ACM_MEANABSOLUTERELATIVEERROR,
             label: "平均绝对相对误差",
           },
-          { value: tf.ACM_ROOTMANSQUAREERROR + "", label: "均方根误差" },
-          { value: tf.ACM_PLANENESSERROR + "", label: "平面中误差" },
+          { value: tf.ACM_ROOTMANSQUAREERROR, label: "均方根误差" },
+          { value: tf.ACM_PLANENESSERROR, label: "平面中误差" },
         ];
       } else if (
         opt === pst.ACS_TYPESOFLANDCOVER ||
         opt === pst.ACS_VEGETATIONPHENOLOGY
       ) {
         this.truthCheckFunOpt = [
-          { value: tf.ACM_ERRORMATRIX + "", label: "误差矩阵" },
-          { value: tf.ACM_OVERALLACCURACY + "", label: "总体分类精度" },
-          { value: tf.ACM_KAPPA + "", label: "Kappa系数" },
+          { value: tf.ACM_ERRORMATRIX, label: "误差矩阵" },
+          { value: tf.ACM_OVERALLACCURACY, label: "总体分类精度" },
+          { value: tf.ACM_KAPPA, label: "Kappa系数" },
         ];
       } else {
         this.truthCheckFunOpt = [
-          { value: tf.ACM_MEANERROR + "", label: "平均误差" },
-          { value: tf.ACM_MEANABSOLUTEERROR + "", label: "平均绝对误差" },
-          { value: tf.ACM_RELATIVEERROR + "", label: "相对误差" },
-          { value: tf.ACM_MEANRELATIVEERROR + "", label: "平均相对误差" },
+          { value: tf.ACM_MEANERROR, label: "平均误差" },
+          { value: tf.ACM_MEANABSOLUTEERROR, label: "平均绝对误差" },
+          { value: tf.ACM_RELATIVEERROR, label: "相对误差" },
+          { value: tf.ACM_MEANRELATIVEERROR, label: "平均相对误差" },
           {
-            value: tf.ACM_MEANABSOLUTERELATIVEERROR + "",
+            value: tf.ACM_MEANABSOLUTERELATIVEERROR,
             label: "平均绝对相对误差",
           },
-          { value: tf.ACM_ROOTMANSQUAREERROR + "", label: "均方根误差" },
-          { value: tf.ACM_CORRELATIONCOEFFICIENT + "", label: "相关系数" },
+          { value: tf.ACM_ROOTMANSQUAREERROR, label: "均方根误差" },
+          { value: tf.ACM_CORRELATIONCOEFFICIENT, label: "相关系数" },
         ];
       }
     },
@@ -695,27 +669,13 @@ export default {
   computed: {
     hasPixelFun: function () {
       return (
-        this.productSubType !== 1 &&
-        this.productSubType !== 6 &&
-        this.productSubType !== 12
+        this.productSubType !== 45 &&
+        this.productSubType !== 39 &&
+        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 () {
-      if (this.allMsg.orderMsg.process_method_id == null) {
+      if (this.allMsg.orderMsg.processMethods == null) {
         this.pixelFun = "";
       }
       return this.$store.state.sampleFun;
diff --git a/src/views/Daichuli/Feedback/index.vue b/src/views/Daichuli/Feedback/index.vue
index 70d62f9..51f36fc 100644
--- a/src/views/Daichuli/Feedback/index.vue
+++ b/src/views/Daichuli/Feedback/index.vue
@@ -30,14 +30,8 @@
             width="180"
             align="center"
           >
-            <template slot-scope="scope">
-              {{ scope.row.orderSource | orderSourceFilter }}
-            </template>
           </el-table-column>
           <el-table-column prop="uploadDate" label="提交时间" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.uploadDate | formatDate }}
-            </template>
           </el-table-column>
           <el-table-column prop="fileName" label="文件名" align="center">
           </el-table-column>
@@ -47,9 +41,6 @@
             sortable
             align="center"
           >
-            <template slot-scope="scope">
-              {{ scope.row.fileSize | transformByte }}
-            </template>
           </el-table-column>
           <el-table-column
             prop="fileFormat"
@@ -96,7 +87,7 @@
             <el-form-item label="时间" class="ysjMsg" prop="producedDate">
               <el-input
                 class="ysjMsgMrg"
-                v-model="formatDateStr"
+                v-model="formInline.producedDate"
                 placeholder="生产时间"
               ></el-input>
             </el-form-item>
@@ -153,7 +144,7 @@
           @removeLayer="removeLayer"
           @addLayer="addLayer"
           @removeSample="removeSplData"
-          @addSample="getSplData"
+          @addSample="getSqlData"
         ></product-info>
         <div class="preview">
           <div
@@ -161,12 +152,6 @@
             @click="pickValue"
             style="overflow: hidden; position: relative"
           ></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>
 
@@ -174,7 +159,7 @@
         <div class="box1">
           <span class="sp1"></span
           ><span class="sp2">{{
-            orderMsg.product_subclass_id == 6
+            orderMsg.productSubClassId == 39
               ? "地表覆盖类型表"
               : "植被物候类型表"
           }}</span>
@@ -282,16 +267,14 @@
 <script>
 import cu from "@/lib/cesiumUtils";
 import {
-  getProductMsg,
-  getProductMetaMsg,
-  getCoverTypes,
+  getOrderMsg,
+  getPendingProductMsg,
   orderFeedback,
-  updateOrderMsg,
-  disOrderStatus,
   updateOrderStage,
-  getOrderSamples,
-  downloadPdf,
-} from "@/api/pendingOrder";
+  getSamplesList,
+} from "@/api/lang/pendingOrder";
+import { productSubTypeVal } from "@/lib/contract.js";
+
 import qs from "qs";
 import ProductInfo from "../../../components/productInfo/index";
 
@@ -316,54 +299,13 @@ export default {
     }
     document.body.scrollTop = 0;
     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() {
     return {
       queryParams: null,
       orderMsg: "",
       userId: null,
+      orderId: null,
       productMsg: "",
       pageshow: true,
       isShow: false,
@@ -437,114 +379,77 @@ export default {
       ],
       workSpace: null,
       layerName: null,
-
       shadeIsShow: true,
       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: {
-    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() {
       const self = this;
-      const om = (self.orderMsg = this.queryParams);
-      // console.log("11111111", om);
-      this.userId = Number(localStorage.userId);
-      const orderId = self.orderMsg.id,
-        pdType = self.orderMsg.product_subclass_id,
-        pdUId = self.orderMsg.product_upload_id;
-      getProductMsg(qs.stringify({ productId: pdUId })).then((res) => {
-        // console.log(res[0])
-        if (res || res.length !== 0) {
-          const r = res[0];
-          this.tifPath = r.tifPath;
-          sessionStorage.setItem("tifPath", r.tifPath);
-          self.productMsg = r;
-          self.orderData = [];
-          self.orderData.push({
-            orderCode: om.order_code,
-            orderSource: om.order_resource,
-            uploadDate: om.create_date,
-            fileName: r.fileName,
-            fileSize: r.fileSize,
-            fileFormat: r.fileFormat,
-          });
-          getProductMetaMsg(qs.stringify({ dataPath: r.tifPath })).then(
-            (res) => {
-              if (res !== null) {
-                self.formInline = {
-                  satellite: om.satellite_name,
-                  load: om.satellite_load_name,
-                  resRatio:
-                    res.imageResolution > 0.01
-                      ? res.imageResolution
-                      : (res.imageResolution * 111194.926).toFixed(2) + "米",
-                  coordinateSys: res.coordinateSystem,
-                  minLat: res.boundBoxMinY.toFixed(8),
-                  maxLat: res.boundBoxMaxY.toFixed(8),
-                  minLon: res.boundBoxMinX.toFixed(8),
-                  maxLon: res.boundingBoxMaxX.toFixed(8),
-                  centerLon: res.centerPosition.x,
-                  centerLat: res.centerPosition.y,
-                  producedDate: r.productDate,
-                  proLevel: r.productLevel + "",
-                };
-                //cu.flyToLayer(res.centerPosition.x,res.centerPosition.y)
-                // this.tempPos = res;
-                cu.flyToLayerRect(
-                  res.boundBoxMinX,
-                  res.boundBoxMinY,
-                  res.boundingBoxMaxX,
-                  res.boundBoxMaxY
-                );
+      const orderId = (self.orderId = this.$route.query.orderId);
+      self.userId = this.$route.query.userId;
+      getOrderMsg(orderId).then((res) => {
+        if (res.code === 200) {
+          self.orderMsg = res.data;
+          console.log("11111111", res.data);
+          // const psId = res.data.productSubClassId;
+          this.getSqlData();
+
+          getPendingProductMsg(orderId).then((res) => {
+            if (res.code === 200) {
+              const pm = (self.productMsg = res.data);
+              const om = self.orderMsg;
+              // 订单基本信息
+              self.orderData = [];
+              self.orderData.push({
+                orderCode: om.orderCode,
+                orderSource: om.orderResourceName,
+                uploadDate: om.createDate,
+                fileName: pm.fileName,
+                fileSize: pm.fileSize,
+                fileFormat: pm.fileFormat,
+              });
+              const minLat = parseFloat(Number(pm.minLatitude).toFixed(8));
+              const maxLat = parseFloat(Number(pm.maxLatitude).toFixed(8));
+              const minLon = parseFloat(Number(pm.minLongitude).toFixed(8));
+              const maxLon = parseFloat(Number(pm.maxLongitude).toFixed(8));
+              // 元数据信息
+              self.formInline = {
+                satellite: om.satelliteName,
+                load: om.satelliteLoadName,
+                producedDate: pm.collectDate,
+                proLevel: om.productLevel + "",
+                resRatio:
+                  pm.productSpaceResolution > 0.01
+                    ? pm.productSpaceResolution + "米"
+                    : (pm.productSpaceResolution * 111194.926).toFixed(2) +
+                      "米",
+                coordinateSys: pm.coordinateSystem,
+                minLat: minLat,
+                maxLat: maxLat,
+                minLon: minLon,
+                maxLon: maxLon,
+              };
+              // 加载geoserver
+              const geoWS = pm.geoWorkspace;
+              const geoLN = pm.geoLayerName;
+              this.workSpace = geoWS;
+              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() {
-      // this.pageshow=false
       let param = {
         userId: this.userId,
         orderMsg: this.orderMsg,
@@ -637,29 +542,34 @@ export default {
       });
     },
     // 获取样本
-    getSplData() {
-      getOrderSamples(this.orderMsg.id, this.orderMsg.product_subclass_id).then(
-        (res) => {
-          if (res.code == 200) {
-            const sp = res.data;
-            if (sp.length === 0) {
-              this.$message({
-                type: "warning",
-                message: "没有样本数据",
-              });
-            } else {
-              cu.removePoint();
+    getSqlData() {
+      const psid = this.orderMsg.productSubClassId;
+      getSamplesList(this.orderId).then((res) => {
+        if (res.code == 200) {
+          const sp = res.data.list;
+          console.log(sp);
+          if (sp.length === 0) {
+            this.$message({
+              type: "warning",
+              message: "没有样本数据",
+            });
+          } else {
+            cu.removePoint();
+            if (psid === productSubTypeVal.ACS_ORTHOPHOTO) {
               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() {
-      // console.log(this.productMsg);
       const zipPath = this.productMsg.filePath;
       if (zipPath !== null || zipPath !== undefined) {
         const pdfName = zipPath.substr(zipPath.lastIndexOf("/") + 1); //截取文件名称字符串
@@ -674,28 +584,6 @@ export default {
         } else {
           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() {
diff --git a/src/views/Daichuli/index.vue b/src/views/Daichuli/index.vue
index ea732fa..16b7721 100644
--- a/src/views/Daichuli/index.vue
+++ b/src/views/Daichuli/index.vue
@@ -147,16 +147,6 @@ export default {
       localTime = localTime.replace("T", " ");
       return localTime;
     },
-    userIdFilter(userId) {
-      const userIdMap = {
-        1: "默认",
-        2: "测试员",
-        3: "陈鹏",
-        4: "卢慧龙",
-        5: "郜琪",
-      };
-      return userIdMap[userId];
-    },
   },
   data() {
     return {
@@ -198,18 +188,19 @@ export default {
     },
     changePage(orderMsg) {
       // this.$router.push("/orderUnprocessed");
-      localStorage.setItem(
-        this.configration.path.daichuli,
-        JSON.stringify(orderMsg)
-      );
-      updateOrderStatus(orderMsg.id).then((res) => {
-        if (res?.code === 401) {
-          this.$message.warning(res.msg);
-          return false;
-        } else {
-          this.$router.push({ name: "订单反馈", params: orderMsg });
-        }
-      });
+      this.$router.push("/orderUnprocessed?orderId=149756&userId=ZZX000011");
+      // localStorage.setItem(
+      //   this.configration.path.daichuli,
+      //   JSON.stringify(orderMsg)
+      // );
+      // updateOrderStatus(orderMsg.id).then((res) => {
+      //   if (res?.code === 401) {
+      //     this.$message.warning(res.msg);
+      //     return false;
+      //   } else {
+      //     this.$router.push({ name: "订单反馈", params: orderMsg });
+      //   }
+      // });
     },
   },
 };
diff --git a/vue.config.js b/vue.config.js
index 8132e03..1ece598 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -21,15 +21,21 @@ module.exports = {
         open: false,
         proxy: {
             [process.env.VUE_APP_BASE_API]: {
-                target:'http://192.168.1.104:8086/macApi',
-                // target: "http://211.157.180.211:8086/macApi",
+                target: "http://60.10.61.212:18030",
                 changeOrigin: true,
                 pathRewrite: {
                     ["^" + 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]: {
-                target:'http://192.168.1.104:18092/microwave',
+                target: "http://192.168.1.104:18092/microwave",
                 // target: "http://211.157.180.211:18092/microwave",
                 changeOrigin: true,
                 pathRewrite: {
@@ -37,7 +43,7 @@ module.exports = {
                 }
             },
             [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",
                 changeOrigin: true,
                 pathRewrite: {