集成区域英文报告接口，配置其他接口路径配置

.env.development

@@ -6,3 +6,4 @@ 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'
+VUE_APP_QUYU_API = '/dev-quyu-api'

.env.production

@@ -6,3 +6,4 @@ 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'
+VUE_APP_QUYU_API = '/prod-quyu-api'

.env.staging

@@ -8,4 +8,5 @@ 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'
+VUE_APP_QUYU_API = '/stage-quyu-api'
 

src/api/lang/quyu.js

@@ -0,0 +1,46 @@
+import requestQy from "@/lib/requestQy";
+// 报告信息传给区域
+// 其他类型
+export function otherPdfMsg(data) {
+    return requestQy({
+        url: "zxsOtherReportWb/saveOtherReport",
+        method: "post",
+        headers: { "tenant-id": 1 },
+        data
+    });
+}
+// 数值类型---叶面积
+export function laiPdfMsg(data) {
+    return requestQy({
+        url: "zxsNumericalReportWb/saveNumericalReport",
+        method: "post",
+        headers: { "tenant-id": 1 },
+        data
+    });
+}
+// 正射类型
+export function otgPdfMsg(data) {
+    return requestQy({
+        url: "zxsGeomReportWb/saveGeomReport",
+        method: "post",
+        headers: { "tenant-id": 1 },
+        data
+    });
+}
+// 信息类型--地表覆盖
+export function coverPdfMsg(data) {
+    return requestQy({
+        url: "zxsCategoryReportWb/saveCategoryReport",
+        method: "post",
+        headers: { "tenant-id": 1 },
+        data
+    });
+}
+
+// 测试接口
+export function getTestData() {
+    return requestQy({
+        url: "region/region/xtgzXmb/queryYJXMListPoint2",
+        method: "get"
+    });
+}

src/components/rtReport/index.vue

@@ -262,7 +262,7 @@ export default {
                     prodDes = "厘米";
                     break;
                 case productSubTypeVal.ACS_GROUNDVEGETATIONHEIGHT:
-                    prodDes = "单位：米";
+                    prodDes = "厘米";
                     break;
                 case productSubTypeVal.ACS_GROUNDLEAFAREAINDEX:
                     prodDes = "LAI值";
@@ -340,7 +340,7 @@ export default {
                 observedValues.push(errorVala[i].cre_deviation);
                 predictedValues.push(errorVala[i].cre_imageValue);
             }
-            // const x_limit = Math.abs(Math.max(...xArr) / xArr.length);
+            const x_limit = Math.abs((Math.max(...xArr) - Math.min(...xArr)) / xArr.length);
             //多项式回归
             let wcpf = data.map(a=>{
                 return Math.pow((a[1]-a[0]),2)
@@ -434,13 +434,13 @@ export default {
                             name: "erExpression",
                             icon: "circle",
                         },
-                        {
+                        // {
-                          name: "r2",
+                        //   name: "r2",
-                          icon: "circle",
+                        //   icon: "circle",
-                          itemStyle: {
+                        //   itemStyle: {
-                                color:"#FFF"
+                        //         color:"#FFF"
-                            }
+                        //     }
-                        },
+                        // },
                         {
                             name:"RMSE",
                             icon: "circle",
@@ -458,7 +458,7 @@ export default {
                 xAxis: {
                     name: "像元值（" + this.getProductDes() + "）",
                     nameLocation: "middle",
-                    // min: Number((Math.min(...xArr) - x_limit).toFixed(5)),
+                    min: Number((Math.min(...xArr) - x_limit).toFixed(5)),
                     // max: Number((Math.max(...xArr) + x_limit).toFixed(5)),
                     nameTextStyle: {
                         lineHeight: 30,

src/lib/request-file.js

@@ -3,7 +3,8 @@ import { Message } from "element-ui";
 
 // create an axios instance
 const service = axios.create({
-    baseURL: 'https://caplos.aircas.ac.cn/dqserver3/file/', // url = base url + request url
+    baseURL: process.env.VUE_APP_FILE_API, // url = base url + request url
+    // baseURL: 'https://caplos.aircas.ac.cn/dqserver3/file/', // url = base url + request url
     timeout: 5000000 // request timeout
 });
 

src/lib/request-microwave.js

@@ -3,7 +3,8 @@ import { Message } from "element-ui";
 
 // create an axios instance
 const service = axios.create({
-    baseURL: 'http://10.0.31.126:8086/macApi/', // url = base url + request url
+    baseURL: process.env.VUE_APP_MICROWAVE_API, // url = base url + request url
+    // baseURL: 'http://10.0.31.126:8086/macApi/', // url = base url + request url
     timeout: 5000000 // request timeout
 });
 

src/lib/request-reality.js

@@ -3,7 +3,8 @@ import { Message } from "element-ui";
 
 // create an axios instance
 const service = axios.create({
-    baseURL: 'https://caplos.aircas.ac.cn/dqserver2/microwave/', // url = base url + request url
+    baseURL: process.env.VUE_APP_REALITY_API, // url = base url + request url
+    // baseURL: 'https://caplos.aircas.ac.cn/dqserver2/microwave/', // url = base url + request url
     timeout: 5000000 // request timeout
 });
 

src/lib/request.js

@@ -3,6 +3,7 @@ import { Message } from "element-ui";
 
 // create an axios instance
 const service = axios.create({
+    // baseURL: process.env.VUE_APP_BASE_API,
     baseURL: "https://caplos.aircas.ac.cn/lxyweb/", // url = base url + request url
     timeout: 5000000 // request timeout
 });

src/lib/requestQy.js

@@ -0,0 +1,39 @@
+import axios from "axios";
+import { Message } from "element-ui";
+
+// create an axios instance
+const service = axios.create({
+    // baseURL: process.env.VUE_APP_QUYU_API, // url = base url + request url
+    baseURL: 'https://caplos.aircas.ac.cn/RCRSVATS/qygzt/admin-api/system/',
+    timeout: 5000000 // request timeout
+});
+
+// request interceptor
+service.interceptors.request.use(
+    config => {
+        return config;
+    },
+    error => {
+        console.log(error); // for debug
+        return Promise.reject(error);
+    }
+);
+
+// response interceptor
+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;

src/lib/utils.js

@@ -153,6 +153,7 @@ function DegreesCoverttoDuFenMiao(degrees) {
 export function getNowFormatDate() {
     let date = new Date(),
         year = date.getFullYear(),
+        // month = date.getMonth() - 4,
         month = date.getMonth() + 1,
         strDate = date.getDate();
     return `${year}年${month}月${strDate}日`;

src/router/index.js

@@ -131,7 +131,8 @@ VueRouter.prototype.push = function push(location) {
 }
 
 const router = new VueRouter({
-  mode:'hash',
+  mode:'history', //调试
+  // mode:'hash', //部署
   routes
 })
 

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

@@ -114,7 +114,7 @@ import {
   exportWord,
   resetCheck,
 } from "@/api/lang/pendingOrder";
-
+import { otgPdfMsg, coverPdfMsg, otherPdfMsg } from "../../../../../api/lang/quyu";
 import { productSubTypeVal, truthFunVal } from "@/lib/contract.js";
 import {
   truthFunctionsMap,
@@ -166,6 +166,9 @@ export default {
       },
       realRes: undefined,
       base64Data: null,
+      orderDealTimeQy: '',
+      sampleUintQy: '',
+      qyReportMsg: null
     };
   },
   mounted() {
@@ -391,6 +394,7 @@ export default {
         projStr: rpm.projStr,
         sampleFun: rpm.sampleFun
       };
+      this.qyReportMsg = pdfMsg;
       const pdfName = productTypeMap(self.pdSubType) + "报告";
       exportWord(
         pdfMsg,
@@ -403,6 +407,8 @@ export default {
           const pdfName = ru.substr(pos + 1);
           self.pdfPath = this.configration.urlprefix.pdfUrlPrefix + pdfName;
           self.pdfLoading = false;
+          self.orderDealTimeQy = res.orderDealTime;
+          self.sampleUintQy = res.sampleUint;
         }
       });
     },
@@ -442,6 +448,7 @@ export default {
       //     message: "提交成功，检验完成",
       //     type: "success",
       //   });
+
       const os = 2; //审核完成
       this.updateOrder(os);
       // 上传报告
@@ -458,10 +465,12 @@ export default {
               type: "success",
               message: "订单处理成功",
             });
-            window.location.href = `${DAICHULI_URL}?token=${rpm.token}`;
+            this.submitReportMsg();
           }
         });
       }
+
+
       // }
       // });
     },
@@ -488,6 +497,48 @@ export default {
         )
       );
     },
+    submitReportMsg() {
+      const psId = this.pdSubType;
+      const psVal = productSubTypeVal;
+      let qyReportOpt = this.qyReportMsg;
+      qyReportOpt["inspecionMethod"] = "基于实测数据的直接检验";
+      qyReportOpt["orderDealTime"] = this.orderDealTimeQy;
+      qyReportOpt["productType"] = this.pdSubType;
+      switch (psId) {
+        case psVal.ACS_ORTHOPHOTO:
+          qyReportOpt["sampleUnit"] = this.sampleUintQy;
+          qyReportOpt["sampleimgFd"] = qyReportOpt.sampleImgFd;
+          otgPdfMsg(qyReportOpt).then(res=>{
+            console.log(11111111,res);
+            if(res.code == 200 && res.data =="保存成功") window.location.href = `${DAICHULI_URL}?token=${this.reportMsg.token}`;
+          })
+          break;
+        case psVal.ACS_TYPESOFLANDCOVER:
+        case psVal.ACS_VEGETATIONPHENOLOGY:
+          qyReportOpt["sampleimgFd"] = qyReportOpt.sampleImgFd;
+          coverPdfMsg(qyReportOpt).then(res=>{
+            console.log(11111111,res);
+            if(res.code == 200 && res.data =="保存成功") window.location.href = `${DAICHULI_URL}?token=${this.reportMsg.token}`;
+          })
+          break;
+        case psVal.ACS_DEM:
+        case psVal.ACS_BACKSCATTERINGCOEFFICIENT:
+        case psVal.ACS_ATMOSPHERICDELAYCORRECTION:
+        case psVal.ACS_DEFORMATION:
+        case psVal.ACS_SOILMOISTURE:
+        case psVal.ACS_SURFACEROUGHNESS:
+        case psVal.ACS_SOILSALINITYINVERSION:
+        case psVal.ACS_GROUNDVEGETATIONHEIGHT:
+        case psVal.ACS_GROUNDLEAFAREAINDEX:
+          qyReportOpt["sampleUnit"] = this.sampleUintQy;
+          qyReportOpt["sampleimgFd"] = qyReportOpt.sampleImgFd;
+          otherPdfMsg(qyReportOpt).then(res=>{
+            console.log(11111111,res);
+            if(res.code == 200 && res.data =="保存成功") window.location.href = `${DAICHULI_URL}?token=${this.reportMsg.token}`;
+          })
+          break;
+      }
+    },
     pickValue() {
       cu.handleClick();
     },

vue.config.js

@@ -17,7 +17,7 @@ module.exports = {
     lintOnSave: false, // 在保存代码的时候开启eslint代码检查机制
     devServer: {
         // 实时保存，编译的配置段
-        host:'0.0.0.0',
+        host: '0.0.0.0',
         port: 8085, // http服务的端口号码设定
         open: false,
         proxy: {
@@ -36,8 +36,8 @@ module.exports = {
                 }
             },
             [process.env.VUE_APP_REALITY_API]: {
-                // target: "http://192.168.88.199:18092/microwave",
+                target: "http://192.168.88.199:18092/microwave",
-                target: "https://124.16.188.131:28092/microwave",
+                // target: "https://124.16.188.131:28092/microwave",
                 // target: "http://192.168.1.227:18092/microwave",
                 changeOrigin: true,
                 pathRewrite: {
@@ -45,14 +45,21 @@ module.exports = {
                 }
             },
             [process.env.VUE_APP_FILE_API]: {
-                // target: "http://192.168.88.199:18093/file",
+                target: "http://192.168.88.199:18093/file",
-                target: "https://124.16.188.131:28093/file",
+                // target: "https://124.16.188.131:28093/file",
                 // target: "http://192.168.1.227:18093/file",
                 changeOrigin: true,
                 pathRewrite: {
                     ["^" + process.env.VUE_APP_FILE_API]: ""
                 }
-            }
+            },
+            [process.env.VUE_APP_QUYU_API]: {
+                target: "https://caplos.aircas.ac.cn/RCRSVATS/qygzt/admin-api/system/",
+                changeOrigin: true,
+                pathRewrite: {
+                    ["^" + process.env.VUE_APP_QUYU_API]: ""
+                }
+            },
         }
     },
     configureWebpack: {