zhuangyunsheng 6 годин тому
батько
коміт
ac63ca7ec7

+ 2 - 1
src/components/scImage/index.vue

@@ -12,6 +12,7 @@
 <script setup>
 import { VxeUI } from "vxe-pc-ui";
 import API from "@/api";
+import config from "@/config"
 
 const props = defineProps({
     prefix: { type: String, default: "folder" },
@@ -20,7 +21,7 @@ const props = defineProps({
 })
 
 const formatUrl = computed(() => {
-    if (props.prefix == "folder") return "/api/folder/" + props.path;
+    if (props.prefix == "folder") return config.API_URL + "/api/folder/" + props.path;
     return props.path.startsWith(`/${props.prefix}`) ? "/minio" + props.path : "data:image/jpeg;base64," + props.path;
 })
 

+ 2 - 1
src/components/scUpload/index.vue

@@ -8,7 +8,7 @@
 		</div>
 		<div v-if="file && file.status == 'success'" class="sc-upload__img">
             <sc-image v-if="isImage(file.mineType)" ref="imageRef" class="image" :fileName="file.name" :path="file.path"></sc-image>
-			<sc-video v-if="isVideo(file.mineType)" :src="'/api/folder/' + file.path" showMask @play="videoPlay"></sc-video>
+			<sc-video v-if="isVideo(file.mineType)" :src="$CONFIG.API_URL + '/api/folder/' + file.path" showMask @play="videoPlay"></sc-video>
 			
 			<div class="sc-upload__img-actions" v-if="!disabled">
                 <el-button type="primary" @click="handleDownload">
@@ -82,6 +82,7 @@ export default {
 
     data() {
         return {
+            config,
             value: "{}",
             file: null,
             style: {

+ 3 - 3
src/components/scUpload/multiple.vue

@@ -21,12 +21,12 @@
 			</template>
 			<template #file="{ file }">
 				<div class="sc-upload-list-item">
-					<el-image v-if="isImage(file.mineType)" class="el-upload-list__item-thumbnail" :src="'/api/folder/' + file.path" :preview-src-list="preview" fit="cover" preview-teleported :z-index="9999">
+					<el-image v-if="isImage(file.mineType)" class="el-upload-list__item-thumbnail" :src="$CONFIG.API_URL + '/api/folder/' + file.path" :preview-src-list="preview" fit="cover" preview-teleported :z-index="9999">
 						<template #placeholder>
 							<div class="sc-upload-multiple-image-slot">Loading...</div>
 						</template>
 					</el-image>
-					<sc-video v-if="isVideo(file.mineType)" :src="'/api/folder/' + file.path" showMask @play="videoPlay(file)"></sc-video>
+					<sc-video v-if="isVideo(file.mineType)" :src="$CONFIG.API_URL + '/api/folder/' + file.path" showMask @play="videoPlay(file)"></sc-video>
 
 					<div v-if="!disabled && file.status == 'success'" class="sc-upload__item-actions">
 						<el-button class="download" :loading="loading" type="primary" @click="handleDownload(file)">
@@ -92,7 +92,7 @@ export default {
 
     computed: {
         preview() {
-            return this.defaultFileList.map(v => "/api/folder/" + v.path);
+            return this.defaultFileList.map(v => this.$CONFIG.API_URL + "/api/folder/" + v.path);
         }
     },
 

+ 1 - 1
src/components/scUpload/videoViewer.vue

@@ -7,7 +7,7 @@
 			</span>
 			
 			<div class="el-image-viewer__canvas">
-				<sc-video class="el-image-viewer__img" :src="'/api/folder/' + videoUrl" autoplay></sc-video>
+				<sc-video class="el-image-viewer__img" :src="$CONFIG.API_URL + '/api/folder/' + videoUrl" autoplay></sc-video>
 			</div>
 		</div>
 	</teleport>

+ 2 - 1
src/views/dataMock/carwash/components/record/index.vue

@@ -2,7 +2,7 @@
     <scTable ref="xGridTable" batchDel :apiObj="$API.car_rinse.record" :formConfig="formConfig" :paramsColums="paramsColums" :toolbarConfig="toolbarConfig" :columns="columns" v-bind="props.options">
         <template #default_imgUrl="{ row, column }">
             <template v-if="XEUtils.get(row, `folders.${column.field}.entities[0].path`)">
-                <sc-image style="cursor: pointer;" :fileName="XEUtils.get(row, `folders.${column.field}.entities[0].name`)" :path="XEUtils.get(row, `folders.${column.field}.entities[0].path`)" width="40" height="40"></sc-image>
+                <sc-image style="cursor: pointer;" :fileName="XEUtils.get(row, `folders.${column.field}.entities[0].name`)" :path="config.API_URL + XEUtils.get(row, `folders.${column.field}.entities[0].path`)" width="40" height="40"></sc-image>
             </template>
         </template>
         
@@ -23,6 +23,7 @@
 import moment from "moment";
 import XEUtils from "xe-utils";
 import API from "@/api";
+import config from "@/config"
 import TOOL from "@/utils/tool";
 import { mapFormItemInput, mapFormItemSelect, mapFormItemDatePicker } from "@/components/scTable/helper";
 import { dataSource } from "@/utils/basicDic";

+ 2 - 0
vue.config.js

@@ -4,6 +4,8 @@ module.exports = defineConfig({
 	//设置为空打包后不分更目录还是多级目录
     publicPath: "/opsWeb",
     outputDir: "dist/opsWeb",
+    // publicPath: "/", // win7
+    // outputDir: "dist", // win7
 	//build编译后存放静态文件的目录
 	// assetsDir: "static",