测试问题修复

env/.env.dev

@@ -8,9 +8,9 @@ VITE_API_URL = '/proxyApi'
 # VITE_proxyTarget = 'http://10.40.92.74:8080'  #盛旭
 
 # VITE_proxyTarget = 'http://192.168.2.246:28080'  # 马帅 
-# VITE_proxyTarget = 'http://192.168.2.122:28080'  # 梁超 
+VITE_proxyTarget = 'http://192.168.2.122:28080'  # 梁超 
 # VITE_proxyTarget = 'http://36.33.26.201:17788/proxyApi'  # 测试服务
-VITE_proxyTarget = 'http://192.168.0.244:28580'  # 测试服务
+# VITE_proxyTarget = 'http://192.168.0.244:28580'  # 测试服务
 # VITE_proxyTarget = 'http://192.168.2.75:28080'  # 盛旭
 
 # VITE_proxyTarget = 'http://10.40.92.185:9206'  # 赵福海 ( 设备类型) 

src/App.vue

@@ -7,8 +7,11 @@ onMounted(async () => {
     console.log(origin.split('ticket=')[1], 'origin')
 
     if (origin.indexOf('ticket') != -1) {
-        console.log('origin.split爱玩送ticket')
-        const res = await loginNewApi({ ticket: origin.split('ticket=')[1],sysType:0 })
+        // console.log('origin.split爱玩送ticket')
+        const res = await loginNewApi({
+            ticket: origin.split('ticket=')[1].split('#/')[0],
+            sysType: 0,
+        })
         console.log(res, '登录结果')
     }
 })

src/layout/header.vue

@@ -253,7 +253,12 @@ const onJumpUser = () => {
         if (host.indexOf('sgwpdm.ah.sgcc.com.cn') > -1) {
             window.open(`${host}/iws/glweb/login?token@${store.token}@`)
         } else {
-            window.open(`${host}/glweb/?token@${store.token}@`)
+            // window.open(`${host}/glweb/?token@${store.token}@`)
+            if (import.meta.env.VITE_ENV === 'production') {
+                window.open(`${host}/glweb/?token@${store.token}@`)
+            } else {
+                window.open(`${host}/iws/glweb/?token@${store.token}@`)
+            }
         }
     } else {
         router.push({ name: 'my-user' })

src/views/cart/index.vue

@@ -367,10 +367,8 @@ const onLeaseDateChange = (value: any, companyIndex: number, goodsIndex: number)
     } else {
         cardList.value[companyIndex].devInfoVoList[goodsIndex].rentBeginTime = value[0]
         cardList.value[companyIndex].devInfoVoList[goodsIndex].rentEndTime = value[1]
-        cardList.value[companyIndex].devInfoVoList[goodsIndex].days = moment(value[1]).diff(
-            value[0],
-            'day',
-        )
+        cardList.value[companyIndex].devInfoVoList[goodsIndex].days =
+            moment(value[1]).diff(value[0], 'day') + 1
     }
 
     // cardList.value.forEach((e: any) => {

src/views/equip/detail.vue

@@ -32,7 +32,6 @@
                             <el-image
                                 style="width: 100%; height: 98%; margin-top: 1%; cursor: pointer"
                                 :src="item.fileUrl"
-                                fit="cover"
                             />
                         </div>
                     </div>
@@ -1200,6 +1199,7 @@ onMounted(() => {
                     display: flex;
                     height: 80%;
                     justify-content: space-around;
+                    overflow: hidden;
 
                     .img-item {
                         // width: calc((100% - 30px) / 4);

src/views/message/index.vue

@@ -136,7 +136,12 @@ const sendParams = ref<any>({
 // 消息列表
 const getMessageListData = async () => {
     const { data: res }: any = await getMessageListApi()
-    messageList.value = [...new Set([...messageListAll.value, ...res])]
+    // messageList.value = [...new Set([...messageListAll.value, ...res])]
+    const uniqueMessages = [
+        ...new Map([...res, ...messageListAll.value].map((item) => [item.uuid, item])).values(),
+    ]
+
+    messageList.value = uniqueMessages
 }
 
 const getMessageListAllData = async () => {
@@ -182,7 +187,7 @@ const onClickMessage = async (item: any) => {
         fromCompany: queryDetailsCompanyId.value,
     })
 
-    console.log(res, '已读结果--')
+    // console.log(res, '已读结果--')
 
     getMessageInfoData(queryDetailsCompanyId.value)
 
@@ -200,6 +205,11 @@ const onSendMessage = debounce(async () => {
     const res: any = await sendMessageApi(sendParams.value)
     if (res.code == 200) {
         sendParams.value.messageContent = ''
+
+        const result: any = await messageIsReadApi({
+            toCompany: myCompanyId.value,
+            fromCompany: queryDetailsCompanyId.value,
+        })
     }
 }, 500)
 const errorHandler = () => true
@@ -215,7 +225,6 @@ onMounted(() => {
         sendParams.value.toCompany = companyId
         sendParams.value.toCompanyName = companyName
         queryDetailsCompanyId.value = companyId
-
         getMessageInfoData(queryDetailsCompanyId.value)
 
         setTimeout(() => {
@@ -228,6 +237,7 @@ onMounted(() => {
 
     setTimeout(() => {
         messageListInterval.value = setInterval(() => {
+            getMessageListAllData()
             getMessageListData()
         }, 5000)
     }, 3000)

src/views/order/index.vue

@@ -329,7 +329,7 @@ const onLeaseDateChange = (value: any, companyIndex: number, goodsIndex: number)
         } else {
             e.rentBeginTime = value[0]
             e.rentEndTime = value[1]
-            e.days = moment(value[1]).diff(value[0], 'day')
+            e.days = moment(value[1]).diff(value[0], 'day') + 1
         }
     })
 }