提交正射与土水修改

src/components/ration/otgCorrection/index.vue

@@ -312,6 +312,7 @@ export default {
           }
         });
       } else {
+        console.log('111111',st);
         const spFrom = new FormData();
         spFrom.append("sampleFun", Number(ssf[0])); //抽样方法
         spFrom.append("minNum", 0);
@@ -406,7 +407,7 @@ export default {
           if (this.allSampleData.length > 0) {
             this.$store.commit("setAltRange", min + "," + (max + 1));
           }
-          this.simpleDataTotal = this.total = res.data.length;
+          this.simpleDataTotal = this.total = res.data.list.length;
         }
       });
     },

src/config/config.js

@@ -28,13 +28,14 @@ const url = {
     vpSamplePath: `${newPrefix}/Vegetation_Phenology_Sample.xlsx` //Vegetation_Phenology_Sample.xlsx,// 植被物候12
 };
   const serverUrl = "http://10.0.36.121";
+  const langServerUrl = "http://10.0.3.157"
 // const serverUrl = "http://192.168.1.104";
 //   const serverUrl = "http://211.157.180.211";
 const urlprefix = {
-    pdfUrlPrefix: `${serverUrl}:18085/microwaveData/pdf/`,
+    pdfUrlPrefix: `${serverUrl}:8085/microwaveData/pdf/`,
-    samePoiImgsUrl: `${serverUrl}:18085/microwaveData/samePoiImgs/`,
+    samePoiImgsUrl: `${serverUrl}:8085/microwaveData/samePoiImgs/`,
-    geoserverUrl: `http://10.0.3.157:18030/geoserver/gwc/service/wmts`,
+    geoserverUrl: `${langServerUrl}:18030/geoserver/gwc/service/wmts`,
-    otgGeoServerUrl: `http://10.0.3.157:18030/geoserver/gwc/service/wmts`,
+    otgGeoServerUrl: `${langServerUrl}:18030/geoserver/gwc/service/wmts`,
     // otgGeoServerUrl: `${serverUrl}:8087/geoserver/gwc/service/wmts`
 };
 

src/views/Daichuli/Feedback/Inspection/index.vue

@@ -196,7 +196,7 @@
         v-else
       ></SoilMositure>
       <!-- 真实性检验方法 -->
-      <div class="cardfive" v-if="!hasPixelFun">
+      <div class="cardfive">
         <div class="box1">
           <span class="sp1"></span><span class="sp2">真实性检验方法</span>
         </div>
@@ -433,22 +433,22 @@ export default {
       self.geoLayerName = pm.geoLayerName;
       self.tifPath = pm.ftpPath;
 
-      // 赋值真实性检验方法
+      // // 赋值真实性检验方法
-      getAnalyseMethod(self.orderId).then((res) => {
+      // getAnalyseMethod(self.orderId).then((res) => {
-        // console.log('真实性检验',res);
+      //   // console.log('真实性检验',res);
-        if (res.code === 200) {
+      //   if (res.code === 200) {
-          let truthFun = res.data.default;
+      //     let truthFun = res.data.default;
-          if (res.data.selected.length !== 0) truthFun = res.data.selected;
+      //     if (res.data.selected.length !== 0) truthFun = res.data.selected;
-          if (truthFun.length !== 0) {
+      //     if (truthFun.length !== 0) {
-            const tfArr = [];
+      //       const tfArr = [];
-            for (let i in truthFun) {
+      //       for (let i in truthFun) {
-              tfArr.push(truthFun[i].id);
+      //         tfArr.push(truthFun[i].id);
-            }
+      //       }
-            self.formInline.truthCheckFun = tfArr;
+      //       self.formInline.truthCheckFun = tfArr;
-            self.truthFun = true;
+      //       self.truthFun = true;
-          }
+      //     }
-        }
+      //   }
-      });
+      // });
 
       // 赋值像元级处理方法
       if (om.processMethods !== null) {

src/views/Daichuli/Feedback/index.vue

@@ -10,44 +10,19 @@
         <div class="box1">
           <span class="sp1"></span><span class="sp2">订单信息</span>
         </div>
-        <el-table
+        <el-table :data="orderData" :header-cell-style="{ background: '#E4E9F1' }" :cell-style="tableRowClassName"
-          :data="orderData"
+          style="width: 98%; margin-left: 1%; margin-top: 15px" :default-sort="{ prop: 'date', order: 'descending' }">
-          :header-cell-style="{ background: '#E4E9F1' }"
+          <el-table-column prop="orderCode" label="订单编号" width="180" align="center">
-          :cell-style="tableRowClassName"
-          style="width: 98%; margin-left: 1%; margin-top: 15px"
-          :default-sort="{ prop: 'date', order: 'descending' }"
-        >
-          <el-table-column
-            prop="orderCode"
-            label="订单编号"
-            width="180"
-            align="center"
-          >
           </el-table-column>
-          <el-table-column
+          <el-table-column prop="orderSource" label="订单来源" width="180" align="center">
-            prop="orderSource"
-            label="订单来源"
-            width="180"
-            align="center"
-          >
           </el-table-column>
           <el-table-column prop="uploadDate" label="提交时间" align="center">
           </el-table-column>
           <el-table-column prop="fileName" label="文件名" align="center">
           </el-table-column>
-          <el-table-column
+          <el-table-column prop="fileSize" label="文件大小" sortable align="center">
-            prop="fileSize"
-            label="文件大小"
-            sortable
-            align="center"
-          >
           </el-table-column>
-          <el-table-column
+          <el-table-column prop="fileFormat" label="文件格式" sortable align="center">
-            prop="fileFormat"
-            label="文件格式"
-            sortable
-            align="center"
-          >
           </el-table-column>
           <el-table-column label="元数据" align="center">
             <el-button type="primary" @click="changePage">查看</el-button>
@@ -59,37 +34,18 @@
           <span class="sp1"></span><span class="sp2">元数据查看</span>
         </div>
         <div class="cstop">
-          <el-form
+          <el-form :inline="true" :model="formInline" class="demo-form-inline" :disabled="true">
-            :inline="true"
-            :model="formInline"
-            class="demo-form-inline"
-            :disabled="true"
-          >
             <el-form-item label="卫星" class="ysjMsg">
-              <el-input
+              <el-input class="ysjMsgMrg" v-model="formInline.satellite" placeholder="卫星名称"></el-input>
-                class="ysjMsgMrg"
-                v-model="formInline.satellite"
-                placeholder="卫星名称"
-              ></el-input>
             </el-form-item>
             <el-form-item label="载荷名称" class="ysjMsg">
-              <el-input
+              <el-input v-model="formInline.load" placeholder="载荷方式"></el-input>
-                v-model="formInline.load"
-                placeholder="载荷方式"
-              ></el-input>
             </el-form-item>
             <el-form-item label="空间分辨率" class="ysjMsg2">
-              <el-input
+              <el-input v-model="formInline.resRatio" placeholder="空间分辨率"></el-input>
-                v-model="formInline.resRatio"
-                placeholder="空间分辨率"
-              ></el-input>
             </el-form-item>
             <el-form-item label="时间" class="ysjMsg" prop="producedDate">
-              <el-input
+              <el-input class="ysjMsgMrg" v-model="formInline.producedDate" placeholder="生产时间"></el-input>
-                class="ysjMsgMrg"
-                v-model="formInline.producedDate"
-                placeholder="生产时间"
-              ></el-input>
             </el-form-item>
             <el-form-item label="级别" prop="resource" class="ysjMsg2">
               <el-radio-group v-model="formInline.proLevel">
@@ -97,100 +53,57 @@
                 <el-radio label="4"></el-radio>
                 <el-radio label="5"></el-radio>
                 <!-- <el-radio label="其他"></el-radio> -->
-              </el-radio-group> </el-form-item
+              </el-radio-group> </el-form-item><br />
-            ><br />
             <el-form-item label="坐标系统" class="ysjMsg">
-              <el-input
+              <el-input v-model="formInline.coordinateSys" placeholder="坐标系统"></el-input>
-                v-model="formInline.coordinateSys"
-                placeholder="坐标系统"
-              ></el-input>
             </el-form-item>
             <el-form-item label="最小纬度" class="ysjMsg">
-              <el-input
+              <el-input v-model="formInline.minLat" placeholder="最小纬度"></el-input>
-                v-model="formInline.minLat"
-                placeholder="最小纬度"
-              ></el-input>
             </el-form-item>
             <el-form-item label="最大纬度" class="ysjMsg2">
-              <el-input
+              <el-input style="margin-left: 6px" v-model="formInline.maxLat" placeholder="最大纬度"></el-input>
-                style="margin-left: 6px"
-                v-model="formInline.maxLat"
-                placeholder="最大纬度"
-              ></el-input>
             </el-form-item>
             <el-form-item label="最小经度" class="ysjMsg">
-              <el-input
+              <el-input v-model="formInline.minLon" placeholder="最小经度"></el-input>
-                v-model="formInline.minLon"
-                placeholder="最小经度"
-              ></el-input>
             </el-form-item>
             <el-form-item label="最大经度" class="ysjMsg2">
-              <el-input
+              <el-input v-model="formInline.maxLon" placeholder="最大经度"></el-input>
-                v-model="formInline.maxLon"
-                placeholder="最大经度"
-              ></el-input>
             </el-form-item>
           </el-form>
         </div>
       </div>
       <div class="daichuli1">
         <div class="box1">
-          <span class="sp1"></span><span class="sp2">待检验产品预览</span
+          <span class="sp1"></span><span class="sp2">待检验产品预览</span><el-button type="primary" size="small"
-          ><el-button type="primary" size="small" @click="downLoadPro"
+            @click="downLoadPro">下载</el-button>
-            >下载</el-button
-          >
         </div>
-        <product-info
+        <product-info @removeLayer="removeLayer" @addLayer="addLayer" @removeSample="removeSplData"
-          @removeLayer="removeLayer"
+          @addSample="getSqlData"></product-info>
-          @addLayer="addLayer"
-          @removeSample="removeSplData"
-          @addSample="getSqlData"
-        ></product-info>
         <div class="preview">
-          <div
+          <div id="PendPreview" @click="pickValue" style="overflow: hidden; position: relative"></div>
-            id="PendPreview"
-            @click="pickValue"
-            style="overflow: hidden; position: relative"
-          ></div>
         </div>
       </div>
 
       <div class="daichuli1" v-if="groudClassShow">
         <div class="box1">
-          <span class="sp1"></span
+          <span class="sp1"></span><span class="sp2">{{
-          ><span class="sp2">{{
             orderMsg.productSubClassId == 39
               ? "地表覆盖类型表"
               : "植被物候类型表"
           }}</span>
         </div>
-        <el-table
+        <el-table :data="groudClassData" :header-cell-style="{ background: '#E4E9F1' }" :cell-style="tableRowClassName"
-          :data="groudClassData"
+          style="width: 98%; margin-left: 1%; margin-top: 15px" height="200">
-          :header-cell-style="{ background: '#E4E9F1' }"
-          :cell-style="tableRowClassName"
-          style="width: 98%; margin-left: 1%; margin-top: 15px"
-          height="200"
-        >
           <el-table-column label="序号" align="center" type="index" width="100">
           </el-table-column>
-          <el-table-column
+          <el-table-column prop="typeName" label="地物类型名称" align="center"></el-table-column>
-            prop="typeName"
+          <el-table-column prop="typeId" label="像素实际值" align="center"></el-table-column>
-            label="地物类型名称"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="typeId"
-            label="像素实际值"
-            align="center"
-          ></el-table-column>
         </el-table>
       </div>
 
       <div class="dealGrp">
         <el-button type="primary" @click="inspection">处理</el-button>
-        <el-button type="primary" @click="dialogFormVisible = true"
+        <el-button type="primary" @click="dialogFormVisible = true">无法处理</el-button>
-          >无法处理</el-button
-        >
         <el-button type="primary" @click="todaichuli">取消</el-button>
       </div>
       <!-- 无法处理弹窗 -->
@@ -199,65 +112,35 @@
           <div class="box1">
             <span class="sp1"></span><span class="sp2">反馈信息</span>
           </div>
-          <el-form
+          <el-form :inline="true" :model="unDeal" class="demo-form-inline" ref="feedbackForm" label-width="100px">
-            :inline="true"
-            :model="unDeal"
-            class="demo-form-inline"
-            ref="feedbackForm"
-            label-width="100px"
-          >
             <el-form-item label="反馈结果">
               <el-radio-group v-model="unDeal.udMsg">
                 <el-radio label="无法处理"></el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item
+            <el-form-item label="原因" prop="udReason" :rules="[{ message: ' ', required: true }]">
-              label="原因"
-              prop="udReason"
-              :rules="[{ message: ' ', required: true }]"
-            >
               <el-select v-model="unDeal.udReason" placeholder="选择原因">
-                <el-option
+                <el-option v-for="item in udrOptions" :key="item.value" :label="item.label" :value="item.value">
-                  v-for="item in udrOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="图片上传">
               <div class="tupian">
-                <el-upload
+                <el-upload class="upload-demo" action="/" accept=".jpg,.jpeg,.png" :before-upload="beforeUpload"
-                  class="upload-demo"
+                  :http-request="uploadImgFile" :on-remove="removeUploadFile" list-type="picture">
-                  action="/"
+                  <el-button size="small" type="white"><i class="el-icon-upload"></i>上传图片</el-button>
-                  accept=".jpg,.jpeg,.png"
-                  :before-upload="beforeUpload"
-                  :http-request="uploadImgFile"
-                  :on-remove="removeUploadFile"
-                  list-type="picture"
-                >
-                  <el-button size="small" type="white"
-                    ><i class="el-icon-upload"></i>上传图片</el-button
-                  >
                 </el-upload>
               </div>
             </el-form-item>
             <div class="beizhu">
               <el-form-item label="备注">
-                <el-input
+                <el-input type="textarea" v-model="unDeal.remark" style="margin-left: -40px"></el-input>
-                  type="textarea"
-                  v-model="unDeal.remark"
-                  style="margin-left: -40px"
-                ></el-input>
               </el-form-item>
             </div>
           </el-form>
           <div slot="footer" class="dialog-footer">
             <el-button type="primary" @click="subFeedback">保存</el-button>
-            <el-button type="primary" @click="dialogFormVisible = false"
+            <el-button type="primary" @click="dialogFormVisible = false">取 消</el-button>
-              >取 消</el-button
-            >
           </div>
         </el-dialog>
       </div>
@@ -385,17 +268,16 @@ export default {
     };
   },
   methods: {
-    initOrderMsg() {
+    async initOrderMsg() {
       const self = this;
       const token = this.$route.query.token;
-      // const userMsg = await getUserInfo(token);
+      const userMsg = await getUserInfo(token);
-      // //       userid: "ZZX-yg000087"
+      if (userMsg.code === 200) {
-      // // username: "yhhuser@163.com"
+        self.userId = userMsg.data.userid;
+      }
+      //       userid: "ZZX-yg000087"
+      // username: "yhhuser@163.com"
       const orderId = (self.orderId = this.$route.query.orderId);
-      // if (res.code === 200) {
-      //   self.userId = userMsg.data.userid;
-      // }
-      self.userId = this.$route.query.userId;
       getOrderMsg(orderId).then((res) => {
         if (res.code === 200) {
           self.orderMsg = res.data;
@@ -430,7 +312,7 @@ export default {
                   pm.productSpaceResolution > 0.01
                     ? pm.productSpaceResolution + "米"
                     : (pm.productSpaceResolution * 111194.926).toFixed(2) +
-                      "米",
+                    "米",
                 coordinateSys: pm.coordinateSystem,
                 minLat: minLat,
                 maxLat: maxLat,
@@ -774,7 +656,7 @@ export default {
   background-color: #354595;
 }
 
-/deep/.cstop .el-radio__input.is-checked + .el-radio__label {
+/deep/.cstop .el-radio__input.is-checked+.el-radio__label {
   color: #606266;
 }
 

src/views/Daichuli/index.vue

@@ -159,20 +159,8 @@ export default {
       }
     },
     changePage(orderMsg) {
-      // this.$router.push("/orderUnprocessed");
+      // 正射：150424   土水：150208
-      this.$router.push("/orderUnprocessed?orderId=150375&token=WEB*1673425993482@L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19");
+      this.$router.push("/orderUnprocessed?orderId=150166&token=WEB*1673425993482@L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19");
-      // 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 });
-      //   }
-      // });
     },
   },
 };