From fdfd5afa778993742d00b4b3289f09577c3e4fe7 Mon Sep 17 00:00:00 2001
From: wally <18603454788@163.com>
Date: Mon, 10 May 2021 09:15:03 +0800
Subject: [PATCH] =?UTF-8?q?axios=20=E4=BB=A3=E7=90=86=20=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8F=8Adayjs=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json               |  1 +
 src/App.vue                |  4 ++--
 src/api/api.ts             | 11 +++++++----
 src/components/toolbar.vue |  9 ++++++---
 src/main.ts                |  3 ++-
 src/utils/dayjs.ts         |  6 ++++++
 src/utils/http.ts          | 28 ++++++++++++++++++++++++----
 src/views/repo-five.vue    | 15 ++++++++++-----
 tsconfig.json              |  2 ++
 vite.config.js             |  6 +++---
 yarn.lock                  |  5 +++++
 11 files changed, 68 insertions(+), 22 deletions(-)
 create mode 100644 src/utils/dayjs.ts

diff --git a/package.json b/package.json
index dc0a727..eb3bd5a 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "axios": "^0.21.1",
+    "dayjs": "^1.10.4",
     "echarts": "^5.1.1",
     "vue": "~3.0",
     "vue-router": "4",
diff --git a/src/App.vue b/src/App.vue
index e99c451..d7c5699 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,10 +1,10 @@
 <template>
-  <div class="justify-center flex flex-1 bg">
+  <div class="flex justify-center flex-1 bg">
     <RouterView class="flex-1" />
   </div>
 </template>
 
-<script setup lang="ts">
+<script lang="ts">
 </script>
 
 <style scoped>
diff --git a/src/api/api.ts b/src/api/api.ts
index 22f0e35..d96e80f 100644
--- a/src/api/api.ts
+++ b/src/api/api.ts
@@ -1,6 +1,9 @@
 import http from 'utils/http';
-import axios from 'axios'
 
-//
-export const getWarehouses = (param: any) => axios.post('/gateway/logistics/mbps/selAllMbps', { param });
-// export const getWarehouses = (param: any) => axios.get('/api/todos/1', );
+export interface GET_WAREHOUSES_PARAM {
+  parkId: number;
+  warehouseId?: number;
+}
+
+// 查询仓库列表及仓库下的摄像头
+export const getWarehouses = (param: GET_WAREHOUSES_PARAM) => http.post('/warehouse/selAllWarehouse', { param });
diff --git a/src/components/toolbar.vue b/src/components/toolbar.vue
index 6e60e14..f52f4e6 100644
--- a/src/components/toolbar.vue
+++ b/src/components/toolbar.vue
@@ -17,17 +17,20 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, reactive, toRefs, onMounted } from 'vue'
+import { defineComponent, reactive, toRefs, onMounted, getCurrentInstance } from 'vue'
 
 export default defineComponent({
   setup() {
+    const { ctx } = getCurrentInstance()
+    console.log(ctx.$dayjs)
+    const dateFormat = 'MM月DD日 HH:mm:ss'
     const data = reactive({
-      time: new Date().toLocaleString(),
+      time: ctx.$dayjs().format(dateFormat),
     })
 
     const interval = () => {
       setInterval(() => {
-        data.time = new Date().toLocaleString()
+        data.time = ctx.$dayjs().format(dateFormat)
       }, 1000)
     }
     onMounted(interval)
diff --git a/src/main.ts b/src/main.ts
index 8bc99cb..de54e56 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,12 +3,13 @@ import router, { setupRouter } from './router/index';
 import App from './App.vue'
 import './index.css'
 import http from 'utils/http';
-
+import dayjs from 'utils/dayjs';
 
 (async () => {
   const app = createApp(App);
 
   app.config.globalProperties.$http = http;
+  app.config.globalProperties.$dayjs = dayjs;
 
   // Configure routing
   setupRouter(app);
diff --git a/src/utils/dayjs.ts b/src/utils/dayjs.ts
new file mode 100644
index 0000000..020526a
--- /dev/null
+++ b/src/utils/dayjs.ts
@@ -0,0 +1,6 @@
+import * as dayjs from 'dayjs';
+import 'dayjs/locale/zh-cn'
+
+dayjs.locale('zh-cn')
+
+export default dayjs;
diff --git a/src/utils/http.ts b/src/utils/http.ts
index 1501254..97354f7 100644
--- a/src/utils/http.ts
+++ b/src/utils/http.ts
@@ -1,17 +1,37 @@
 import axios, { AxiosRequestConfig, AxiosResponse } from 'axios';
 
 const service = axios.create({
-  // baseURL: '/gateway/logistics'
+  baseURL: '/gateway/logistics'
 });
 
 service.interceptors.request.use((config: AxiosRequestConfig) => {
+  // before request do something
 
   return config;
-});
+}, error => Promise.reject(error));
 
 service.interceptors.response.use((response: AxiosResponse) => {
-
-  return response;
+  // 处理响应数据
+  console.log('responseL: ', response);
+  if (response.status !== 200) {
+    alert('请检查服务器连接')
+    return Promise.reject('请检查服务器连接');
+  } else {
+    if (!response.data) {
+      console.warn('返回参数缺少data');
+      return Promise.reject('返回参数缺少data');
+    } else {
+      const { code, data, msg } = response.data
+      if ( code === 200) {
+        return data;
+      } else {
+        return Promise.reject(msg || 'error')
+      }
+    }
+  }
+}, error => {
+  console.warn(error);
+  return Promise.reject(error);
 })
 
 export default service;
diff --git a/src/views/repo-five.vue b/src/views/repo-five.vue
index 51239de..4db3068 100644
--- a/src/views/repo-five.vue
+++ b/src/views/repo-five.vue
@@ -1,3 +1,4 @@
+<!-- 5号仓库 -->
 <template>
   <div class="flex flex-col">
     <!-- 标题 -->
@@ -28,6 +29,8 @@
     </div>
     <!-- 悬浮监控 -->
     <img @click="show = true" class="monitor" src="../assets/monitor.png" style />
+
+    <!-- FIXME: 不是显示一个图片 背景 + iframe显示摄像头内容 + 关闭 + 全屏 + 退出全屏 -->
     <img @click="show = false" class="vedio" src="../assets/vedio.png" v-show="show" />
   </div>
 </template>
@@ -51,18 +54,20 @@ export default defineComponent({
     Heat,
     Curve,
   },
+
   data() {
     return { show: false }
   },
+
   created() {
-    this.getData()
+    this.getWarehouses()
   },
   methods: {
-    async getData() {
-      const param = { parkId: 0 }
+    // 获取仓库信息
+    async getWarehouses() {
       try {
-        const res = await getWarehouses(param)
-        console.log('res: ', res)
+        const data = await getWarehouses({ parkId: 0 })
+        console.log('data: ', data)
       } catch (error) {
         console.log('error: ', error)
       }
diff --git a/tsconfig.json b/tsconfig.json
index 6e041ea..31c11a2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,6 +9,8 @@
     "lib": ["esnext", "dom"],
     "types": ["vite/client"],
     "plugins": [{ "name": "@vuedx/typescript-plugin-vue" }],
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
     "paths": {
       "@/*": ["./src/*"],
       "views/*": ["./src/views"],
diff --git a/vite.config.js b/vite.config.js
index 6fbdc13..81b6ed0 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -19,12 +19,12 @@ export default ({ mode }) => {
           changeOrigin: true,
           rewrite: (path) => path.replace(/^\/api/, ''),
         },
-        '/getaway': {
-          target: 'https://test.tall.wiki/gateway',
+        '/gateway': {
+          target: 'http://test.tall.wiki/gateway',
           changeOrigin: true,
           rewrite: (path) => {
             console.log('path: ', path)
-            path.replace(/^\/getaway/, '')
+            return path.replace(/^\/gateway/, '')
           },
         },
       },
diff --git a/yarn.lock b/yarn.lock
index e915f26..cfef455 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1180,6 +1180,11 @@ csstype@^2.6.8:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.16.tgz#544d69f547013b85a40d15bff75db38f34fe9c39"
   integrity sha512-61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q==
 
+dayjs@^1.10.4:
+  version "1.10.4"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.4.tgz#8e544a9b8683f61783f570980a8a80eaf54ab1e2"
+  integrity sha512-RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw==
+
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"