From 713c0ee98f2d77e23c716ffe546a9b272e71ce40 Mon Sep 17 00:00:00 2001
From: xuhaoyun <xuhaoyun1101@foxmail.com>
Date: Fri, 30 Jun 2023 14:35:40 +0800
Subject: [PATCH] 0630

---
 src/utils/request.js               |  4 ++--
 src/views/safetyIndex/cheliang.vue | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index dd427d8..17c8c35 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -4,10 +4,10 @@ import vm from "../main";
 import { getToken } from '@/utils/auth'
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const request = axios.create({
-  baseURL: 'http://172.18.113.50:8080/zhapi',
+  //baseURL: 'http://172.18.113.50:8080/zhapi',
   //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强
   //baseURL: 'http://192.168.0.188:8888/zhapi',
-  //baseURL: `http://${window.location.host}/zhapi`,
+  baseURL: `http://${window.location.host}/zhapi`,
   timeout: 50000,
   headers: { 'content-type': 'application/json' },
 })
diff --git a/src/views/safetyIndex/cheliang.vue b/src/views/safetyIndex/cheliang.vue
index 505323a..2e907dc 100644
--- a/src/views/safetyIndex/cheliang.vue
+++ b/src/views/safetyIndex/cheliang.vue
@@ -79,7 +79,7 @@
             <div class="imgList">
                 <div class="imgListItem" v-for="item in disList" :key="item.id">
                     <div class="detailImg">
-                        <img :src="item.globalUrlPic">
+                        <img :src="item.globalPic ? item.globalPic : item.globalUrlPic">
                     </div>
                     <div class="ListItem">
                         <div class="detailText">
@@ -175,19 +175,19 @@ export default {
         },
         showpicVisible(index) {
             this.diaIndex = index
-            vehicleIn({ direction: index, pageSize: this.diapageNum, pageNum: this.diapageNum }).then(res => {
+            vehicleIn({ direction: this.diaIndex, pageSize: this.diapageSize, pageNum: this.diapageNum }).then(res => {
                 this.disList = res.data
                 this.diatotal = res.total
                 this.diaVisible = true
             })
         },
         diaSizeChange(val) {
-            this.fangkepageNum = 1;
-            this.fangkepageSize = val;
+            this.diapageNum = 1;
+            this.diapageSize = val;
             this.showpicVisible(this.diaIndex)
         },
         diaCurrentChange(val) {
-            this.fangkepageNum = val;
+            this.diapageNum = val;
             this.showpicVisible(this.diaIndex)
         },
         getUserType() {
-- 
2.36.3