解决冲突

.env.development

@@ -5,8 +5,8 @@ VITE_APP_TITLE = 新能源项目管理平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.119:8899'
-# VITE_APP_BASE_API = 'http://58.17.134.85:8899'
+# VITE_APP_BASE_API = 'http://192.168.110.119:8899'
+VITE_APP_BASE_API = 'http://58.17.134.85:8899'
 # GO开发环境
 VITE_APP_BASE_API_GO = 'http://58.17.134.85:8919'
 

src/views/other/ys7DeviceImg/index.vue

@@ -30,7 +30,13 @@
         <el-table-column label="摄像头名称" align="center" prop="name" />
         <el-table-column label="图片地址" align="center" prop="url">
           <template #default="scope">
-            <el-image :z-index="9999" :preview-src-list="[scope.row.path]" preview-teleported :src="scope.row.path" class="w20" />
+            <el-image
+              :z-index="9999"
+              :preview-src-list="['http://58.17.134.85:8919' + scope.row.path]"
+              preview-teleported
+              :src="'http://58.17.134.85:8919' + scope.row.path"
+              class="w20"
+            />
           </template>
         </el-table-column>
         <el-table-column label="拍摄时间" align="center" prop="createdAt" />

src/views/project/projectUser/component/ConstructionUserDetail.vue

@@ -6,7 +6,7 @@
         <el-row :gutter="20" justify="space-around">
           <el-col :span="12">
             <el-form-item label="人脸照">
-              <el-image :src="userDetail?.facePicUrl" style="width: 150px; height: 150px" />
+              <el-image :src="'http://58.17.134.85:8919' + userDetail?.pacePhoto" style="width: 150px; height: 150px" />
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/views/safety/recognizeRecord/index.vue

@@ -42,7 +42,7 @@
         </el-table-column>
         <el-table-column label="图片路径" align="center" prop="picture" width="100">
           <template #default="scope">
-            <image-preview :src="scope.row.picture" :width="50" :height="50" />
+            <image-preview :src="'http://58.17.134.85:8919' + scope.row.picture" :width="50" :height="50" />
           </template>
         </el-table-column>
         <el-table-column label="故障描述" align="center" prop="describe" />

src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue

@@ -72,7 +72,7 @@
                 <image-preview :src="item.path" width="200px" />
               </span>
               <span v-else>
-                <el-link :href="`${item.url}`" :underline="false" target="_blank">
+                <el-link :href="`${'http://58.17.134.85:8919' + item.url}`" :underline="false" target="_blank">
                   <span> {{ item.originalName }} </span>
                 </el-link>
               </span>

src/views/safety/teamMeeting/component/TeamMeetingDetailDrawer.vue

@@ -13,7 +13,7 @@
       <el-descriptions-item :span="2" label="班会图片">
         <el-space wrap>
           <span :key="item" v-for="item in teamMeetingDetail?.pictureUrlList">
-            <image-preview :src="item" width="200px" />
+            <image-preview :src="'http://xny.yj-3d.com:7363' + item" width="200px" />
           </span>
         </el-space>
       </el-descriptions-item>
@@ -38,6 +38,7 @@ const get = async () => {
   const res = await getTeamMeeting({ id: props.teamMeetingId });
   if (res.data && res.code === 0) {
     teamMeetingDetail.value = res.data;
+    teamMeetingDetail.value.pictureUrlList = res.data?.picture.split(',');
   }
   loading.value = false;
 };

src/views/safety/violationRecord/component/violationRecordDetailDialog.vue

@@ -41,7 +41,7 @@
           <el-space wrap>
             <div v-for="item in safetyInspectionDetail.checkAttachment" :key="item.ossId">
               <span v-if="['png', 'jpg', 'jpeg'].includes(item.fileType)">
-                <image-preview :src="item.path" width="200px" />
+                <image-preview :src="'http://58.17.134.85:8919' + item.path" width="200px" />
               </span>
               <span v-else>
                 <el-link :href="`${item.path}`" type="primary" :underline="false" target="_blank">