钥匙柜功能

.env.development

@@ -2,7 +2,7 @@
 # 开发环境配置
 VITE_APP_ENV = 'development'
 
-VITE_BASE_URL = 'http://192.168.17.4:8001/'
+VITE_BASE_URL = 'http://192.168.17.8:8090'
 
 #文件管理
 VITE_PREVIEW_URL = "http://192.168.17.4:8001/"

.env.production

@@ -1,7 +1,7 @@
 
 # 开发环境配置
 VITE_APP_ENV = 'production'
-VITE_BASE_URL = 'http://192.168.17.4:8001'
+VITE_BASE_URL = 'http://192.168.17.8:8090'
 
 #文件管理
 VITE_PREVIEW_URL = "http://192.168.17.4:8001"

public/player/playback.html

@@ -325,7 +325,7 @@
             funcName: "startPlayback",
             argument: JSON.stringify({
                 cameraIndexCode: cameraIndex,                   //监控点编号
-                startTimeStamp: Math.floor((startTimeStamp / 1000)).toString(),  //录像查询开始时间戳，单位：秒
+                startTimeStamp: Math.floor((startTimeStamp / 1000)-10).toString(),  //录像查询开始时间戳，单位：秒
                 endTimeStamp: Math.floor((endTimeStamp / 1000) + 10).toString(),      //录像结束开始时间戳，单位：秒
                 recordLocation: recordLocation,                     //录像存储类型：0-中心存储，1-设备存储
                 transMode: transMode,                               //传输协议：0-UDP，1-TCP

src/api/index.js

@@ -47,24 +47,33 @@ export function getEmergencyApi(params) {
 // 抽屉钥匙信息获取
 export function getKeywordMsg(data) {
     return request({
-        url: '/keyword/biz/info/terminal/drawerkey',
+        url: import.meta.env.VITE_BASE_URL +'/biz/info/terminal/drawerkey',
         method: 'POST',
-        data
+        data,
+        headers: {
+            'Content-Type': 'application/json'
+        },
     })
 }
 // 钥匙领取记录获取
 export function getTakeKeyword(data) {
     return request({
-        url: '/keyword/biz/log/terminal/take',
+        url: import.meta.env.VITE_BASE_URL +'/biz/log/terminal/take',
         method: 'POST',
-        data
+        data,
+        headers: {
+            'Content-Type': 'application/json'
+        },
     })
 }
 // 钥匙归还记录获取
 export function getReturnKeyword(data) {
     return request({
-        url: '/keyword/biz/log/terminal/return',
+        url: import.meta.env.VITE_BASE_URL + '/biz/log/terminal/return',
         method: 'POST',
-        data
+        data,
+        headers: {
+            'Content-Type': 'application/json'
+        },
     })
 }

src/components/record.vue

@@ -14,6 +14,7 @@
             start-placeholder="开始时间"
             end-placeholder="结束时间"
             format="YYYY-MM-DD HH:mm:ss"
+            @change="getKeywordRecord"
             date-format="YYYY/MM/DD ddd"
             time-format="A hh:mm:ss"
           />
@@ -36,7 +37,7 @@
           />
           <el-table-column prop="keyState" label="存取状态" align="center">
             <template #default="scope">{{
-              scope.row.take_time?'取出':'存入'
+              scope.row.take_time?'领取':scope.row.return_time?'归还':''
             }}</template>
           </el-table-column>
           <el-table-column prop="accessDate" label="上报时间" align="right">
@@ -96,8 +97,8 @@ const params = ref({
 async function getKeywordRecord() {
   let data = {
     ...params.value,
-    start_time: datePicker[0],
+    start_time: moment(datePicker.value[0]).format("yyyy-MM-DD HH:mm:ss"),
-    end_time: datePicker[1],
+    end_time: moment(datePicker.value[1]).format("yyyy-MM-DD HH:mm:ss"),
   };
   const takeList = await getTakeKeyword(data);
   const takeReturn = await getReturnKeyword(data);

vite.config.js

@@ -35,10 +35,10 @@ export default defineConfig({
         changeOrigin: true, //是否跨域
         rewrite: (path) => path.replace('/aps', '')
       },
-      '/keyword': {
+      '/pro-api': {
         target: 'http://192.168.17.8:8090/',
         changeOrigin: true, //是否跨域
-        rewrite: (path) => path.replace('/keyword', '')
+        rewrite: (path) => path.replace('/pro-api', '')
       }
     }
   },