空天院修改

src/api/lang/pendingOrder.js

@@ -187,3 +187,16 @@ export function downloadPdf(url) {
         method: "GET"
     });
 }
+
+/**
+ * @Descripttion 根据token获取用户信息
+ * @param {*} token
+ * @return {*}
+ */
+export async function getUserInfo(token) {
+    return request({
+        url: '/app/logincheck?token=' + token,
+        method: 'get',
+        baseURL: 'http://10.0.3.157:18030/yunguan-app'
+    })
+}

src/components/ration/otgCorrection/index.vue

@@ -7,54 +7,24 @@
       <div class="otgCardContent">
         <el-form :inline="true" :model="simpleForm" class="demo-form-inline">
           <el-form-item style="margin-left: 15px">
-            <el-cascader
+            <el-cascader v-model="simpleForm.sampleFun" :disabled="sampleFun !== ''" :options="funcOpt" size="mini"
-              v-model="simpleForm.sampleFun"
+              placeholder="请选择抽样方法" popper-class="cascader-popper" @change="changeSampleFun" clearable
-              :disabled="sampleFun !== ''"
+              :show-all-levels="false"></el-cascader>
-              :options="funcOpt"
+            <el-button v-if="isDeepSpace" class="edit-btn" plain size="mini" type="primary" icon="el-icon-edit-outline"
-              size="mini"
+              @click="editDeepSpace"></el-button>
-              placeholder="请选择抽样方法"
-              popper-class="cascader-popper"
-              @change="changeSampleFun"
-              clearable
-              :show-all-levels="false"
-            ></el-cascader>
-            <el-button
-              v-if="isDeepSpace"
-              class="edit-btn"
-              plain
-              size="mini"
-              type="primary"
-              icon="el-icon-edit-outline"
-              @click="editDeepSpace"
-            ></el-button>
           </el-form-item>
           <el-form-item>
-            <el-input
+            <el-input v-model="simpleForm.sampleNum" size="mini" placeholder="请输入样本个数"></el-input>
-              v-model="simpleForm.sampleNum"
-              size="mini"
-              placeholder="请输入样本个数"
-            ></el-input>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="samplesCk">确定</el-button>
           </el-form-item>
         </el-form>
-        <el-table
+        <el-table ref="multipleTable" v-loading="loading" element-loading-text="拼命加载中"
-          ref="multipleTable"
+          element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" :data="simpleData"
-          v-loading="loading"
+          tooltip-effect="dark" :header-cell-style="headerRowClass"
-          element-loading-text="拼命加载中"
+          style="width: 98%; margin-left: 1%; margin-top: 15px" highlight-current-row @current-change="tableRowClk"
-          element-loading-spinner="el-icon-loading"
+          :stripe="true" :cell-style="tableRowClassName" height="370">
-          element-loading-background="rgba(0, 0, 0, 0.8)"
-          :data="simpleData"
-          tooltip-effect="dark"
-          :header-cell-style="headerRowClass"
-          style="width: 98%; margin-left: 1%; margin-top: 15px"
-          highlight-current-row
-          @current-change="tableRowClk"
-          :stripe="true"
-          :cell-style="tableRowClassName"
-          height="370"
-        >
           <el-table-column label width="35">
             <template slot-scope="scope">
               <el-radio :label="scope.row" v-model="radioClkMsg"></el-radio>
@@ -62,11 +32,7 @@
           </el-table-column>
           <el-table-column label="序号" type="index" width="70">
           </el-table-column>
-          <el-table-column
+          <el-table-column prop="samplesId" label="样本编号" show-overflow-tooltip>
-            prop="samplesId"
-            label="样本编号"
-            show-overflow-tooltip
-          >
           </el-table-column>
           <el-table-column label="纬度(°)" sortable show-overflow-tooltip>
             <template slot-scope="scope">{{
@@ -78,28 +44,13 @@
               parseFloat(scope.row.measureLong.toFixed(8))
             }}</template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="采样时间" sortable prop="collectDate" show-overflow-tooltip>
-            label="采样时间"
-            sortable
-            prop="collectDate"
-            show-overflow-tooltip
-          >
           </el-table-column>
-          <el-table-column
+          <el-table-column label="选取点纬度" prop="sameNameLat"></el-table-column>
-            label="选取点纬度"
+          <el-table-column label="选取点经度" prop="sameNameLong"></el-table-column>
-            prop="sameNameLat"
-          ></el-table-column>
-          <el-table-column
-            label="选取点经度"
-            prop="sameNameLong"
-          ></el-table-column>
           <el-table-column label="操作">
-            <template slot-scope="scope"
+            <template slot-scope="scope"><i class="el-icon-delete"
-              ><i
+                @click="deleteSelected(scope.$index, simpleData)"></i></template>
-                class="el-icon-delete"
-                @click="deleteSelected(scope.$index, simpleData)"
-              ></i
-            ></template>
           </el-table-column>
         </el-table>
       </div>
@@ -124,75 +75,39 @@
       </div>
       <div class="sscPre">
         <div class="sceneShowContent" style="position: relative">
-          <otg-product-info
+          <otg-product-info @removeLayer="removeLayer('far')" @addLayer="addLayer('far')"></otg-product-info>
-            @removeLayer="removeLayer('far')"
+          <div id="farViewer" style="height: 100%; width: 100%" @click="pickValueFar"></div>
-            @addLayer="addLayer('far')"
-          ></otg-product-info>
-          <div
-            id="farViewer"
-            style="height: 100%; width: 100%"
-            @click="pickValueFar"
-          ></div>
         </div>
         <div class="sceneShowContent" style="position: relative">
           <div id="nearViewer" style="height: 100%; width: 100%"></div>
-          <otg-product-info
+          <otg-product-info @removeLayer="removeLayer('near')" @addLayer="addLayer('near')"></otg-product-info>
-            @removeLayer="removeLayer('near')"
-            @addLayer="addLayer('near')"
-          ></otg-product-info>
           <div class="poiCK">
-            <el-button type="primary" :disabled="ckPoint" @click="ckSamePoi"
+            <el-button type="primary" :disabled="ckPoint" @click="ckSamePoi">选取点</el-button>
-              >选取点</el-button
+            <el-button type="primary" style="margin: 5px 0px" :disabled="savePoint" @click="saveSamePoi">保存点</el-button>
-            >
-            <el-button
-              type="primary"
-              style="margin: 5px 0px"
-              :disabled="savePoint"
-              @click="saveSamePoi"
-              >保存点</el-button
-            >
           </div>
         </div>
         <div class="sceneShowContent" style="position: relative">
           <div style="height: 100%">
-            <img
+            <img id="alImg" src="static/images/otg3.png" style="height: 100%; width: 100%" alt="fzImg" />
-              id="alImg"
-              src="static/images/otg3.png"
-              style="height: 100%; width: 100%"
-              alt="fzImg"
-            />
           </div>
           <div class="imgCtrl">
             <el-radio-group v-model="imgChoose" @change="changeImg">
               <el-radio label="pointPs">点之记</el-radio><br />
-              <el-radio label="nearImg" style="margin: 5px 0 5px 0"
+              <el-radio label="nearImg" style="margin: 5px 0 5px 0">近景</el-radio><br />
-                >近景</el-radio
-              ><br />
               <el-radio label="farImg">远景</el-radio>
             </el-radio-group>
           </div>
         </div>
       </div>
     </div>
-    <SampleSetting
+    <SampleSetting :stepSampling="stepSampling" @handleStepSampling="handleStepSampling"
-      :stepSampling="stepSampling"
+      @handleDepthList="handleDepthList" :sampleCldFun="sampleCldFun" ref="sampleSettingPanel"></SampleSetting>
-      @handleStepSampling="handleStepSampling"
-      @handleDepthList="handleDepthList"
-      :sampleCldFun="sampleCldFun"
-      ref="sampleSettingPanel"
-    ></SampleSetting>
   </div>
 </template>
 
 <script>
 import Pagination from "@/components/Pagination";
 import OtgProductInfo from "@/components/otgProductInfo";
-// import {
-//   getSampleData,
-//   getOrderSamples,
-//   getSamplesByLayer,
-//   deleteOrderSamplesByID,
-// } from "@/api/pendingOrder";
 import {
   getSamplesList,
   getSampleData,
@@ -431,21 +346,22 @@ export default {
       otgCesiumUtils.addPointToNearViewer(lon, lat, alt);
       this.ckPoint = false;
       const cus = this.configration.urlprefix.samePoiImgsUrl;
-      if (row.collectPointSignpic !== null) {
+      if (row.collectPointSignPic !== null) {
-        this.collectPointSignPic = cus + row.collectPointSignpic;
+        console.log('111111', row.collectPointSignPic);
+        this.collectPointSignPic = row.collectPointSignPic;
         var alImgDom = document.getElementById("alImg");
         alImgDom.src = this.collectPointSignPic;
       }
-      if (row.measureClose !== null)
+      if (row.measurePicClose !== null)
-        this.measurePicClose = cus + row.measureClose;
+        this.measurePicClose = row.measurePicClose;
-      if (row.measureDistant !== null)
+      if (row.measurePicDistant !== null)
-        this.measurePicDistant = cus + row.measureDistant;
+        this.measurePicDistant = row.measurePicDistant;
     },
     // 选择相同的点
     ckSamePoi() {
       otgCesiumUtils.drawPoint((point) => {
-        this.radioClkMsg.sameLon = Number(point[0]);
+        this.radioClkMsg.sameNameLong = Number(point[0]);
-        this.radioClkMsg.sameLat = Number(point[1]);
+        this.radioClkMsg.sameNameLat = Number(point[1]);
         this.radioClkMsg.sameAlt = Number(point[2]);
       });
       this.savePoint = false;
@@ -526,30 +442,36 @@ export default {
   font-size: 20px;
   margin-top: 20px;
 }
+
 /deep/.otgCard .el-form-item {
   margin-bottom: 0;
 }
+
 .otgCardContent {
   margin: 15px;
   height: 450px;
 }
+
 .sceneShow {
   width: 100%;
   background-color: white;
   margin-top: 20px;
   padding-bottom: 15px;
 }
+
 .sscPre {
   display: flex;
   align-items: center;
   justify-content: center;
 }
+
 .sceneShowContent {
   margin: 5px 15px 0 15px;
   width: 33%;
   height: 360px;
   background-color: rgb(110, 110, 207);
 }
+
 .imgCtrl {
   position: absolute;
   bottom: 3px;
@@ -559,6 +481,7 @@ export default {
   background-color: #aaaaaa;
   padding: 4px 0 0 10px;
 }
+
 .poiCK {
   position: absolute;
   bottom: 1px;
@@ -567,6 +490,7 @@ export default {
   background-color: #aaaaaa;
   padding: 4px 0 0 10px;
 }
+
 .sscTitle {
   margin: 15px 15px 0 15px;
   width: 33%;
@@ -576,6 +500,7 @@ export default {
   font-weight: bold;
   color: gray;
 }
+
 .sscCircle {
   width: 14px;
   height: 14px;
@@ -583,11 +508,13 @@ export default {
   background-color: #0072e5;
   margin: 0 4px 0 4px;
 }
+
 .box1 {
   height: 40px;
   line-height: 40px;
   border-bottom: 1px solid rgb(205, 205, 205, 0.5);
 }
+
 .sp1 {
   display: inline-block;
   width: 7px;
@@ -598,6 +525,7 @@ export default {
   margin-left: 20px;
   margin-top: 8px;
 }
+
 .sp2 {
   margin-left: 10px;
   font-size: 20px;
@@ -605,6 +533,7 @@ export default {
   color: #354595;
   vertical-align: top;
 }
+
 // 分层抽样弹出框设置
 /deep/.sampleFunParam .el-upload-dragger .el-icon-upload {
   margin: 0;
@@ -612,9 +541,11 @@ export default {
   font-size: 20px;
   color: black;
 }
+
 .sampleFunParam .upload-demo {
   display: inline-block;
 }
+
 /deep/.sampleFunParam .el-upload-dragger {
   width: 150px;
   height: 35px;
@@ -622,6 +553,7 @@ export default {
   margin-top: 20px;
   border: 1px solid #d9d9d9;
 }
+
 /deep/.sampleFunParam .el-dialog__body {
   padding: 20px 10px;
   text-align: center;

src/config/config.js

@@ -27,14 +27,14 @@ const url = {
     srSamplePath: `${newPrefix}/Surface_Roughness_Sample.xlsx`, // 地表粗糙度9
     vpSamplePath: `${newPrefix}/Vegetation_Phenology_Sample.xlsx` //Vegetation_Phenology_Sample.xlsx,// 植被物候12
 };
-//   const serverUrl = "http://10.0.36.121";
+  const serverUrl = "http://10.0.36.121";
-const serverUrl = "http://192.168.1.104";
+// const serverUrl = "http://192.168.1.104";
 //   const serverUrl = "http://211.157.180.211";
 const urlprefix = {
     pdfUrlPrefix: `${serverUrl}:18085/microwaveData/pdf/`,
     samePoiImgsUrl: `${serverUrl}:18085/microwaveData/samePoiImgs/`,
-    geoserverUrl: `http://60.10.61.212:18030/geoserver/gwc/service/wmts`,
+    geoserverUrl: `http://10.0.3.157:18030/geoserver/gwc/service/wmts`,
-    otgGeoServerUrl: `http://60.10.61.212:18030/geoserver/gwc/service/wmts`,
+    otgGeoServerUrl: `http://10.0.3.157:18030/geoserver/gwc/service/wmts`,
     // otgGeoServerUrl: `${serverUrl}:8087/geoserver/gwc/service/wmts`
 };
 

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

@@ -256,7 +256,7 @@ export default {
       cu.addPoint(sd[i].lng, sd[i].lat, 10);
     }
 
-    if (this.pdSubType === 6 || this.pdSubType === 12) {
+    if (this.pdSubType === 39 || this.pdSubType === 47) {
       this.base64Data = this.$refs.reportQT.myCharts.getDataURL();
     } else {
       this.base64Data = this.$refs.reportRT.myCharts.getDataURL();

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

@@ -531,11 +531,7 @@ export default {
       formData.append("orderId", orderId); //订单ID
       formData.append("productType", this.productSubType); //产品类型
       formData.append("isHttpUrl", true); //产品路径
-      // formData.append("dataPath", this.tifPath); //产品路径
+      formData.append("dataPath", this.tifPath); //产品路径
-      formData.append(
-        "dataPath",
-        "http://60.10.61.212:18030/inspection/files/4be870ee1a6b458da6c0201f9f217a091652339249444.tif"
-      ); //产品路径
       formData.append("samples", JSON.stringify(this.sampleList)); //样本数据
       if (this.pixelFun !== "")
         formData.append("pixelHandleType", this.pixelFun); //像元级处理方法（正射校正产品不需要）

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>
@@ -272,6 +155,7 @@ import {
   orderFeedback,
   updateOrderStage,
   getSamplesList,
+  getUserInfo
 } from "@/api/lang/pendingOrder";
 import { productSubTypeVal } from "@/lib/contract.js";
 
@@ -384,10 +268,16 @@ export default {
     };
   },
   methods: {
-    initOrderMsg() {
+    async initOrderMsg() {
+      const token = this.$route.query.token;
+      const userMsg = await getUserInfo(token)
       const self = this;
+      //       userid: "ZZX-yg000087"
+      // username: "yhhuser@163.com"
       const orderId = (self.orderId = this.$route.query.orderId);
-      self.userId = this.$route.query.userId;
+      if (res.code === 200) {
+        self.userId = userMsg.data.userid;
+      }
       getOrderMsg(orderId).then((res) => {
         if (res.code === 200) {
           self.orderMsg = res.data;
@@ -547,7 +437,6 @@ export default {
       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",
@@ -561,7 +450,7 @@ export default {
               }
             } else {
               for (let i in sp) {
-                cu.addPoint(sp[i].lng, sp[i].lat, 10);
+                cu.addPoint(sp[i].lng, sp[i].lat, JSON.parse(sp[i].paramStr).alt);
               }
             }
           }
@@ -607,6 +496,7 @@ export default {
 .Fade-leave-to {
   opacity: 0;
 }
+
 .Fade-enter-to,
 .Fade-leave {
   opacity: 1;
@@ -623,6 +513,7 @@ export default {
   font-size: 20px;
   padding-bottom: 10px;
 }
+
 .daichuli1 {
   width: 100%;
   background-color: white;
@@ -630,12 +521,14 @@ export default {
   margin-top: 20px;
   padding-bottom: 15px;
 }
+
 .daichuli2 {
   width: 100%;
   background-color: white;
   font-size: 20px;
   margin-top: 20px;
 }
+
 .sp1 {
   display: inline-block;
   width: 7px;
@@ -645,17 +538,20 @@ export default {
   left: 20px;
   top: 6px;
 }
+
 .sp2 {
   margin-left: 30px;
   font-size: 20px;
   font-weight: 700;
   color: #354595;
 }
+
 .box1 {
   height: 40px;
   line-height: 40px;
   border-bottom: 1px solid rgb(205, 205, 205, 0.5);
 }
+
 /deep/.daichuli .el-button--primary {
   color: #fff;
   background-color: #409eff;
@@ -663,10 +559,12 @@ export default {
   width: 100px;
   height: 30px;
 }
+
 /deep/.daichuli .el-button--primary:focus {
   background-color: #354595;
   border-color: #354595;
 }
+
 /deep/ .daichuli1 .el-button--primary {
   color: #fff;
   background-color: #409eff;
@@ -677,6 +575,7 @@ export default {
   position: relative;
   top: -3px;
 }
+
 #PendPreview {
   width: 98%;
   height: 600px;
@@ -684,12 +583,14 @@ export default {
   margin-left: 1%;
   margin-top: -60px;
 }
+
 .dealGrp {
   // margin-top: 20px;
   text-align: center;
   width: 100%;
   background-color: white;
 }
+
 /deep/.dealGrp .el-button--primary {
   width: 170px;
   height: 35px;
@@ -698,25 +599,31 @@ export default {
   margin-left: 10px;
   border-color: #354595;
 }
+
 /deep/.daichuli1 .el-button--primary:hover {
   background-color: #354595;
 }
+
 /deep/.daichuli1 .el-button--primary:focus {
   background-color: #6979cc;
   border-color: #6979cc;
 }
+
 .cstop {
   margin-top: 20px;
   margin-bottom: 0;
   position: relative;
   text-align: center;
 }
+
 .ysjMsg {
   width: 18%;
 }
+
 .ysjMsgMrg {
   margin-left: 14px;
 }
+
 .ysjMsg2 {
   width: 20%;
 }
@@ -725,30 +632,38 @@ export default {
   width: 140px;
   height: 33px;
 }
+
 /deep/.cstop .el-form--inline .el-form-item__label {
   text-align: justify;
   // text-align-last: justify;
   font-size: 15px;
 }
+
 /deep/.cstop .el-radio {
   margin-right: 10px;
 }
+
 /deep/.cstop .el-radio__inner::after {
   background-color: #354595;
 }
+
 /deep/.cstop .el-radio__input.is-checked .el-radio__inner {
   border-color: #354595;
   background: white;
 }
+
 /deep/.cstop .el-radio__input.is-disabled .el-radio__inner {
   border-color: #354595;
 }
+
 /deep/.cstop .el-radio__input.is-disabled.is-checked .el-radio__inner::after {
   background-color: #354595;
 }
-/deep/.cstop .el-radio__input.is-checked + .el-radio__label {
+
+/deep/.cstop .el-radio__input.is-checked+.el-radio__label {
   color: #606266;
 }
+
 /deep/.cstop .el-radio__inner {
   border: 2px solid #354595;
 }
@@ -760,9 +675,11 @@ export default {
   top: 10px;
   z-index: 9999;
 }
+
 /deep/.unableDeal .el-radio {
   padding: 0 30px 0 20px;
 }
+
 /deep/.unableDeal .el-select .el-input {
   width: 180px;
 }
@@ -771,22 +688,28 @@ export default {
   font-size: 20px;
   color: black;
 }
+
 .upload-demo {
   display: inline-block;
 }
+
 .el-upload-dragger {
   margin-left: 0px;
 }
+
 /deep/.unableDeal .el-upload-dragger .el-icon-upload {
   margin: 0;
   line-height: 30px;
 }
+
 /deep/.unableDeal .el-form-item {
   margin-bottom: 0;
 }
+
 /deep/.unableDeal .el-input__inner {
   height: 35px;
 }
+
 /deep/.unableDeal .el-upload-dragger {
   width: 150px;
   height: 35px;
@@ -794,14 +717,17 @@ export default {
   margin-top: 20px;
   border: 1px solid #d9d9d9;
 }
+
 /deep/.unableDeal .el-textarea__inner {
   margin-left: 40px;
   margin-top: 20px;
 }
+
 .sp3 {
   position: relative;
   top: -13px;
 }
+
 // /deep/.el-textarea__inner{
 //   margin-left: 70px;
 //   margin-top: 20px;
@@ -809,23 +735,28 @@ export default {
 /deep/.beizhu .el-form-item__label {
   margin-top: 20px;
 }
+
 /deep/.dialog-footer {
   text-align: center;
 }
+
 /deep/.dialog-footer .el-button--primary {
   width: 150px;
   height: 35px;
   background-color: #354595;
   border-color: #354595;
 }
+
 /deep/.el-button {
   line-height: 0;
 }
+
 .imgPreview {
   width: 178px;
   height: 178px;
   display: block;
 }
+
 .preview {
   width: 98%;
   height: 600px;
@@ -833,6 +764,7 @@ export default {
   margin-top: -60px;
   position: relative;
 }
+
 .shade {
   position: absolute;
   left: 0px;

src/views/Daichuli/index.vue

@@ -8,38 +8,20 @@
         <div class="box1">
           <span class="sp1"></span><span class="sp2">订单查询</span>
         </div>
-        <OrderSearch
+        <OrderSearch :getOrderList="getOrderList" ref="orderSearchPanel" @initPage="initPage"></OrderSearch>
-          :getOrderList="getOrderList"
-          ref="orderSearchPanel"
-          @initPage="initPage"
-        ></OrderSearch>
       </div>
       <div class="daichuli1">
         <div class="box1">
           <span class="sp1"></span><span class="sp2">查询结果</span>
         </div>
-        <el-table
+        <el-table :header-cell-style="{ background: '#E4E9F1' }" :cell-style="tableRowClassName" :data="pendingData"
-          :header-cell-style="{ background: '#E4E9F1' }"
+          style="width: 98%; margin-left: 1%; margin-top: 15px">
-          :cell-style="tableRowClassName"
+          <el-table-column prop="orderCode" label="订单编号" width="180" align="center">
-          :data="pendingData"
-          style="width: 98%; margin-left: 1%; margin-top: 15px"
-        >
-          <el-table-column
-            prop="orderCode"
-            label="订单编号"
-            width="180"
-            align="center"
-          >
             <template slot-scope="scope">
               {{ scope.row.order_code }}
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column prop="uploadDate" label="提交日期" width="180" align="center">
-            prop="uploadDate"
-            label="提交日期"
-            width="180"
-            align="center"
-          >
             <template slot-scope="scope">
               {{ scope.row.create_date | formatDate }}
             </template>
@@ -78,23 +60,13 @@
           </el-table-column>
           <el-table-column label="操作" align="center">
             <template slot-scope="scope">
-              <el-button
+              <el-button type="primary" icon="el-icon-search" @click="changePage(scope.row)">订单处理</el-button>
-                type="primary"
-                icon="el-icon-search"
-                @click="changePage(scope.row)"
-                >订单处理</el-button
-              >
             </template>
           </el-table-column>
         </el-table>
         <div class="block">
-          <Pagination
+          <Pagination :page-sizes="[6, 12, 18]" :total="pageForm.total" :page.sync="pageForm.page"
-            :page-sizes="[6, 12, 18]"
+            :limit.sync="pageForm.limit" @pagination="getOrderList" />
-            :total="pageForm.total"
-            :page.sync="pageForm.page"
-            :limit.sync="pageForm.limit"
-            @pagination="getOrderList"
-          />
         </div>
       </div>
     </div>
@@ -188,7 +160,7 @@ export default {
     },
     changePage(orderMsg) {
       // this.$router.push("/orderUnprocessed");
-      this.$router.push("/orderUnprocessed?orderId=149756&userId=ZZX000011");
+      this.$router.push("/orderUnprocessed?orderId=150375&token=WEB*1673425993482@L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19");
       // localStorage.setItem(
       //   this.configration.path.daichuli,
       //   JSON.stringify(orderMsg)
@@ -211,6 +183,7 @@ export default {
 .Fade-leave-to {
   opacity: 0;
 }
+
 .Fade-enter-to,
 .Fade-leave {
   opacity: 1;
@@ -226,12 +199,14 @@ export default {
   background-color: white;
   font-size: 16px;
 }
+
 .daichuli1 {
   width: 100%;
   background-color: white;
   font-size: 20px;
   margin-top: 20px;
 }
+
 .sp1 {
   display: inline-block;
   width: 7px;
@@ -241,15 +216,18 @@ export default {
   left: 20px;
   top: 6px;
 }
+
 /deep/.el-icon-arrow-up:before {
   content: "\e78f";
 }
+
 .sp2 {
   margin-left: 30px;
   font-size: 20px;
   font-weight: 700;
   color: #354595;
 }
+
 .box1 {
   height: 40px;
   line-height: 40px;
@@ -262,9 +240,11 @@ export default {
   height: 35px;
   line-height: 30px;
 }
+
 /deep/.el-range-editor.el-input__inner {
   padding: 1px 10px;
 }
+
 // /deep/.daichuli .el-select {
 //   width: 270px;
 // }
@@ -277,6 +257,7 @@ export default {
   height: 35px;
   line-height: 35px;
 }
+
 // /deep/.daichuli .el-input__inner {
 //   width: 270px;
 //   height: 35px;
@@ -285,39 +266,48 @@ export default {
 .sp31 {
   display: inline-block;
 }
+
 /deep/.daichuli .el-input {
   width: 270px;
 }
+
 .box28 {
   text-align: center;
 }
+
 /deep/.daichuli .el-button--primary {
   width: 170px;
   height: 35px;
   // margin-top: 20px;
   margin-bottom: 20px;
 }
+
 /deep/.el-button {
   line-height: 0;
 }
+
 .block {
   margin-top: 20px;
   padding-bottom: 20px;
   text-align: center;
 }
+
 /deep/.daichuli1 .el-button--primary {
   color: #354595;
   background-color: transparent;
   border-color: transparent;
 }
+
 /deep/.daichuli1 .el-button--primary:hover {
   background-color: #409eff;
   color: #fff;
 }
+
 /deep/.el-input__icon {
   line-height: 35px;
 }
-/deep/.el-table th > .cell {
+
+/deep/.el-table th>.cell {
   font-size: 16px;
 }
 </style>

vue.config.js

@@ -21,21 +21,21 @@ module.exports = {
         open: false,
         proxy: {
             [process.env.VUE_APP_BASE_API]: {
-                target: "http://60.10.61.212:18030",
+                target: "http://10.0.3.157:18030",
                 changeOrigin: true,
                 pathRewrite: {
                     ["^" + process.env.VUE_APP_BASE_API]: ""
                 }
             },
             [process.env.VUE_APP_MICROWAVE_API]: {
-                target: "http://192.168.1.104:8086/macApi",
+                target: "http://10.0.36.121: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://10.0.36.121:18092/microwave",
                 // target: "http://211.157.180.211:18092/microwave",
                 changeOrigin: true,
                 pathRewrite: {
@@ -43,7 +43,7 @@ module.exports = {
                 }
             },
             [process.env.VUE_APP_FILE_API]: {
-                target: "http://192.168.1.104:18093/file",
+                target: "http://10.0.36.121:18093/file",
                 // target: "http://211.157.180.211:18093/file",
                 changeOrigin: true,
                 pathRewrite: {