Merge branch 'lukeyan' of http://8.136.197.230:3000/ZheJiangNingBo/pingAnQiYeWeb into lukeyan

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.diapageNum = 1;
-            this.fangkepageSize = val;
+            this.diapageSize = val;
             this.showpicVisible(this.diaIndex)
         },
         diaCurrentChange(val) {
-            this.fangkepageNum = val;
+            this.diapageNum = val;
             this.showpicVisible(this.diaIndex)
         },
         getUserType() {