linan vor 5 Jahren
Ursprung
Commit
0a75865dbd

+ 6 - 0
src/api/deliveryRoomManagement.js

@@ -0,0 +1,6 @@
+import { ajaxTest } from "../sdk/ajax";
+// 以后根地址统一 删掉这句就行
+let ajax = ajaxTest
+
+/* 个体数据 */
+export const reqDeliveryRoomList = (data) => ajax("get", "/api/statistic", data)

+ 2 - 2
src/router/routes.js

@@ -1,8 +1,8 @@
 import Home from '../views/Home/Home.vue'
 /* 首页 UnityTrace */
 import Index from '@/views/index/Index.vue'
-import DeliveryRoom from '@/views/deliveryRoom/DeliveryRoom.vue'
-import Detail from '@/views/deliveryRoom/detail/Detail.vue'
+import DeliveryRoom from '@/views/deliveryRoomManagement/DeliveryRoom.vue'
+import Detail from '@/views/deliveryRoomManagement/detail/Detail.vue'
 /* 统计分许 */
 import PSY from '@/views/statisticAnalysis/PSY.vue'
 import Crop from '@/views/statisticAnalysis/Crop.vue'

+ 28 - 1
src/sdk/ajax.js

@@ -11,7 +11,7 @@ const { serverAddress } = config
 Vue.use(VueAxios, axios)
 
 
-/* 常用ajax封装 (固定URL) */
+/* ajax封装 */
 export const ajax = function (type = "post", url, params) {
     let token = localStorage.getItem("token")
     return new Promise((resole, reject) => {
@@ -36,3 +36,30 @@ export const ajax = function (type = "post", url, params) {
         });
     });
 }
+
+
+/* 测试服务的 ajax封装 */
+export const ajaxTest = function (type = "post", url, params) {
+    let token = localStorage.getItem("token")
+    return new Promise((resole, reject) => {
+        axios({
+            method: type,
+            url: "http://192.168.1.116:31288" + url,
+            params,
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+				'x-auth-token': token
+            }
+        }).then((res) => {
+            switch(res.data.errCode) {
+                case 'request_not_authorize': // 登录过期
+                    let url = window.location.protocol + "//" + window.location.host + "/#/login"
+                    window.location.replace(url)
+                    break;
+            }
+            resole(res.data);
+        }).catch((err) => {
+            reject(err.data);
+        });
+    });
+}

+ 17 - 2
src/views/deliveryRoom/DeliveryRoom.vue

@@ -44,6 +44,9 @@ import typeImgUrl_1 from "@/assets/deliveryRoom_1.png";
 import typeImgUrl_2 from "@/assets/deliveryRoom_2.png";
 import typeImgUrl_3 from "@/assets/deliveryRoom_3.png";
 import typeImgUrl_4 from "@/assets/deliveryRoom_4.png";
+
+import { reqDeliveryRoomList } from "@/api/deliveryRoomManagement.js"
+
 // 每页数据条数
 const pageSize = 10;
 
@@ -95,8 +98,20 @@ export default {
             page: 1
         };
     },
-    created() {},
+    created() {
+        this.getDeliveryRoomList()
+    },
     methods: {
+        // 请求厂房列表
+        getDeliveryRoomList(data) {
+            reqDeliveryRoomList(data)
+                .then(res => {
+                    console.log(res);
+                })
+                .catch(err => {
+                    console.error( err);
+                });
+        },
         toDetail() {
             this.$router.push({path: "Detail"})
         },
@@ -120,7 +135,7 @@ export default {
             .li {
                 display: flex;
                 flex-direction: column;
-                width: 290px;
+                width: 310px;
                 height: 350px;
                 margin: 10px;
                 h5 {

src/views/deliveryRoom/detail/Detail.vue → src/views/deliveryRoomManagement/detail/Detail.vue


src/views/deliveryRoom/detail/charts/chart_a.vue → src/views/deliveryRoomManagement/detail/charts/chart_a.vue


src/views/deliveryRoom/detail/charts/chart_b.vue → src/views/deliveryRoomManagement/detail/charts/chart_b.vue