e2e

package-lock.json

@@ -1916,49 +1916,6 @@
         "webpack-merge": "^5.7.3",
         "webpack-virtual-modules": "^0.4.2",
         "whatwg-fetch": "^3.6.2"
-      },
-      "dependencies": {
-        "@vue/vue-loader-v15": {
-          "version": "npm:vue-loader@15.10.0",
-          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.0.tgz",
-          "integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==",
-          "dev": true,
-          "requires": {
-            "@vue/component-compiler-utils": "^3.1.0",
-            "hash-sum": "^1.0.2",
-            "loader-utils": "^1.1.0",
-            "vue-hot-reload-api": "^2.3.0",
-            "vue-style-loader": "^4.1.0"
-          },
-          "dependencies": {
-            "hash-sum": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
-              "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-              "dev": true
-            }
-          }
-        },
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.0.tgz",
-          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
-        }
       }
     },
     "@vue/cli-shared-utils": {
@@ -2104,6 +2061,47 @@
         }
       }
     },
+    "@vue/vue-loader-v15": {
+      "version": "npm:vue-loader@15.11.1",
+      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.11.1.tgz",
+      "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
+      "dev": true,
+      "requires": {
+        "@vue/component-compiler-utils": "^3.1.0",
+        "hash-sum": "^1.0.2",
+        "loader-utils": "^1.1.0",
+        "vue-hot-reload-api": "^2.3.0",
+        "vue-style-loader": "^4.1.0"
+      },
+      "dependencies": {
+        "hash-sum": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
+          "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+          "dev": true
+        },
+        "json5": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.2",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz",
+          "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        }
+      }
+    },
     "@vue/web-component-wrapper": {
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",

src/api/views/ooclApi.js

@@ -149,8 +149,42 @@ const PTemFrequency = (data) => {
     },
   });
 };
+// 港口查询
+const portQuery = (data) => {
+  return request({
+    data: {
+      url: "/api/rate/port/query",
+      method: "POST",
+      data,
+      headers: { Authorization: localStorage.getItem("token") },
+    },
+  });
+};
+//E2E查询
+const E2EQuery = (data) => {
+  return request({
+    data: {
+      url: "/api/rate/E2E/spot/query",
+      method: "POST",
+      data,
+      headers: { Authorization: localStorage.getItem("token") },
+    },
+  });
+};
+//E2E附加费查询
+const surchargeE2EQuery = (data) => {
+  return request({
+    data: {
+      url: "/api/rate/E2E/surcharge/query",
+      method: "POST",
+      data,
+      headers: { Authorization: localStorage.getItem("token") },
+    },
+  });
+};
 export {
   GetToken,
+  portQuery,
   SpotQueryV1,
   CityQuery,
   TemList,
@@ -164,4 +198,6 @@ export {
   BookingCreate,
   GTemFrequency,
   PTemFrequency,
+  E2EQuery,
+  surchargeE2EQuery
 };

src/components/Nav.vue

@@ -9,6 +9,7 @@
         </div>
       </div>
       <div class="header-navbar">
+        <a href="/#/E2E" class="gray-header-item hidden-xs-only"> E2E </a>
         <a href="/#/Spot" class="gray-header-item hidden-xs-only"> 运价查询 </a>
         <a href="/#/tem" class="gray-header-item hidden-xs-only">模板管理</a>
         <a href="/#/Booking" class="gray-header-item">订舱记录</a>

src/utils/axios.js

@@ -9,6 +9,7 @@ export default ({ data }) => {
   } else {
     baseURL = process.env.VUE_APP_AXIOS_BASEURL;
   }
+  console.log(baseURL)
   const server = axios.create({
     baseURL,
     timeout: 60000,

src/utils/routes.js

@@ -4,6 +4,7 @@ import Login from "../views/Login/Index.vue";
 import Spot from "../views/Spot/Index.vue";
 import Tem from "../views/tem/Index.vue";
 import Booking from "../views/booking/Index.vue";
+import E2E from "../views/E2E/Index.vue";
 
 export const routes = [
   { path: "/", redirect: "/Login" },
@@ -13,6 +14,7 @@ export const routes = [
   { path: "/Tem", component: Tem },
   { path: "/Booking", component: Booking },
   { path: "/AmsCli", component: AmsCli },
+  { path: "/E2E", component: E2E },
   // { path: "/SendList", name: "AmsSendList", component: SendList },
   // { path: "/SendEdit", component: IndexEdit },
   { path: "*", redirect: "/" },

src/views/tem/Index.vue

@@ -295,6 +295,13 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="是否E2E:">
+                <el-checkbox v-model="form.isE2E"></el-checkbox>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <p class="Title">箱信息</p>
           <el-row v-for="item in containerTypeData" :key="item">
             <el-col :span="6">
@@ -886,6 +893,7 @@ export default {
       form: {
         blQuantity: 1,
         cargoCategory: "General",
+        isE2E:false
       },
       containerTypeData: ["20GP", "40GP", "40HQ"],
       moment,

vue.config.js

@@ -14,11 +14,9 @@ module.exports = defineConfig({
     proxy: {
       // 跨域处理
       "/api": {
-        target: "http://47.105.55.218:8000/", //目标接口域名
+        target: "http://47.105.55.218:9090/", //目标接口域名
         changeOrigin: true, //是否跨域
-        pathRewrite: {
+
-          "^/api": "", //重写接口
-        },
       },
       // "/AMS": {
       //   target: "http://60.209.125.238:35105", //目标接口域名