yangjun
/
hldy_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

处理镜像管理-服务指令-操作日志-新增数据不显示文件资源问题

This commit is contained in:
1378012178@qq.com 2025-12-23 15:08:38 +08:00
parent 01568397c5
commit 5ae4edeb47
7 changed files with 328 additions and 310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/common/api.ts
View File

@ -23,6 +23,7 @@ enum Api {
getElderTagMain = '/sys/sysDepart/getElderTagMain', //查询当前标准标签库机构信息
getETMOrgInfo = '/api/common/getETMOrgInfo', //标准标签库信息
queryUpBizPrefix = '/api/sysUtils/queryUpBizPrefix',
getMediaUrlByOrgCode = '/api/baseInfo/getMediaUrlByOrgCode',
}
/**
@ -222,3 +223,11 @@ export const getElderTagMain = () => {
export const queryUpBizPrefix = () => {
return defHttp.get({ url: Api.queryUpBizPrefix }, { isTransformResponse: false });
};
/**
* 获取对应机构媒体资源地址
* @param params
*/
export const getMediaUrlByOrgCode = (params) => {
return defHttp.get({ url: Api.getMediaUrlByOrgCode, params });
};

78
src/components/Form/src/jeecg/components/JImageUpload.vue
View File

@ -1,18 +1,8 @@
<template>
<div class="clearfix">
<a-upload
:listType="listType"
accept="image/*"
:multiple="multiple"
:action="uploadUrl"
:headers="headers"
:data="{ biz: bizPath }"
v-model:fileList="uploadFileList"
:beforeUpload="beforeUpload"
:disabled="disabled"
@change="handleChange"
@preview="handlePreview"
>
<a-upload :listType="listType" accept="image/*" :multiple="multiple" :action="uploadUrl" :headers="headers"
:data="{ biz: bizPath }" v-model:fileList="uploadFileList" :beforeUpload="beforeUpload" :disabled="disabled"
@change="handleChange" @preview="handlePreview">
<div v-if="uploadVisible">
<div v-if="listType == 'picture-card'">
<LoadingOutlined v-if="loading" />
@ -36,35 +26,26 @@
</div>
</a-modal> -->
<a-modal
:open="previewVisible"
:width="modalWidth"
:bodyStyle="{ padding: 0, display: 'flex', justifyContent: 'center', alignItems: 'center' }"
:footer="null"
@cancel="handleCancel"
>
<img
ref="previewImgRef"
class="preview-img"
:src="previewImage"
@load="handleImageLoad"
/>
<a-modal :open="previewVisible" :width="modalWidth"
:bodyStyle="{ padding: 0, display: 'flex', justifyContent: 'center', alignItems: 'center' }" :footer="null"
@cancel="handleCancel">
<img ref="previewImgRef" class="preview-img" :src="previewImage" @load="handleImageLoad" />
</a-modal>
</div>
</template>
<script lang="ts">
import { defineComponent, PropType, ref, reactive, watchEffect, computed, unref, watch, onMounted, nextTick } from 'vue';
import { LoadingOutlined, UploadOutlined } from '@ant-design/icons-vue';
import { useRuleFormItem } from '/@/hooks/component/useFormItem';
import { propTypes } from '/@/utils/propTypes';
import { useAttrs } from '/@/hooks/core/useAttrs';
import { useMessage } from '/@/hooks/web/useMessage';
import { getFileAccessHttpUrl, getHeaders, getRandom } from '/@/utils/common/compUtils';
import { uploadUrl } from '/@/api/common/api';
import { getToken } from '/@/utils/auth';
import { defineComponent, PropType, ref, reactive, watchEffect, computed, unref, watch, onMounted, nextTick } from 'vue';
import { LoadingOutlined, UploadOutlined } from '@ant-design/icons-vue';
import { useRuleFormItem } from '/@/hooks/component/useFormItem';
import { propTypes } from '/@/utils/propTypes';
import { useAttrs } from '/@/hooks/core/useAttrs';
import { useMessage } from '/@/hooks/web/useMessage';
import { getFileAccessHttpUrl, getHeaders, getRandom } from '/@/utils/common/compUtils';
import { uploadUrl } from '/@/api/common/api';
import { getToken } from '/@/utils/auth';
const { createMessage, createErrorModal } = useMessage();
export default defineComponent({
const { createMessage, createErrorModal } = useMessage();
export default defineComponent({
name: 'JImageUpload',
components: { LoadingOutlined, UploadOutlined },
inheritAttrs: false,
@ -282,8 +263,8 @@
previewVisible.value = false;
}
// 图片加载完成后计算宽高
const handleImageLoad = () => {
// 图片加载完成后计算宽高
const handleImageLoad = () => {
if (!previewImgRef.value) return;
const img = previewImgRef.value;
@ -293,7 +274,7 @@ const handleImageLoad = () => {
// 计算适应比例
const ratio = Math.min(maxWidth / img.naturalWidth, maxHeight / img.naturalHeight, 1);
modalWidth.value = `${img.naturalWidth * ratio}px`;
};
};
return {
@ -316,21 +297,23 @@ const handleImageLoad = () => {
modalWidth,
};
},
});
});
</script>
<style scoped>
.ant-upload-select-picture-card i {
.ant-upload-select-picture-card i {
font-size: 32px;
color: #999;
}
}
.ant-upload-select-picture-card .ant-upload-text {
.ant-upload-select-picture-card .ant-upload-text {
margin-top: 8px;
color: #666;
}
}
/* 确保 Modal 内容区域填满 */
.imgView .ant-modal-body {
height: 80vh; /* 限制模态框高度，避免超出屏幕 */
height: 80vh;
/* 限制模态框高度，避免超出屏幕 */
display: flex;
align-items: center;
justify-content: center;
@ -349,6 +332,7 @@ const handleImageLoad = () => {
.preview-img {
max-width: 100%;
max-height: 100%;
object-fit: contain; /* 保持比例，不拉伸 */
object-fit: contain;
/* 保持比例，不拉伸 */
}
</style>

8
src/components/Form/src/jeecg/components/JImageUploadtz.vue
View File

@ -66,6 +66,7 @@ import { getFileAccessHttpUrl, getHeaders, getRandom } from '/@/utils/common/com
import { uploadUrl } from '/@/api/common/api';
import { getToken } from '/@/utils/auth';
import { Upload } from 'ant-design-vue';
import { getMediaUrlByOrgCode } from '@/api/common/api'
const { createMessage, createErrorModal } = useMessage();
export default defineComponent({
@ -114,12 +115,13 @@ export default defineComponent({
},
emits: ['options-change', 'change', 'update:value'],
setup(props, { emit, refs }) {
const opeMediaAddress = ref<string>('');
const emitData = ref<any[]>([]);
const attrs = useAttrs();
const [state] = useRuleFormItem(props, 'value', 'change', emitData);
const currentUploadUrl = ref(uploadUrl);
const extraUploadData = ref<Record<string, any>>({});
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
//获取文件名
const getFileName = (path) => {
if (path.lastIndexOf('\\') >= 0) {
@ -327,6 +329,10 @@ export default defineComponent({
modalWidth.value = `${img.naturalWidth * ratio}px`;
};
onMounted(async () => {
const res = await getMediaUrlByOrgCode({ orgCode: '' });
opeMediaAddress.value = res.mediaUrl;
});
return {
state,

14
src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue
View File

@ -10,8 +10,8 @@
<div class="ant-upload-text">{{ text }}123</div>
</div>
</template>
<div class="upload-area" style="padding: 20px;" v-else-if="uploadVisible" :disabled="buttonDisabled">
<p class="upload-text">点击或者拖拽上传</p>
<div class="upload-area" style="padding: 20px;" v-if="fileList.length <= 0" :disabled="buttonDisabled">
<p class="upload-text"></p>
<p class="upload-hint">
<div class="upload-icon">
<img src="../../../../../../assets/upload/mp3.png" style="width: 40px; height: 40px;" />
@ -50,7 +50,7 @@
</template>
<script lang="ts" setup>
import { ref, reactive, computed, watch, nextTick, createApp, unref } from 'vue';
import { ref, reactive, computed, watch, nextTick, createApp, unref, onMounted } from 'vue';
import { Icon } from '/@/components/Icon';
import { getToken } from '/@/utils/auth';
import { uploadUrl } from '/@/api/common/api';
@ -64,8 +64,9 @@ import { getFileAccessHttpUrl, getHeaders } from '/@/utils/common/compUtils';
import UploadItemActions from './components/UploadItemActions.vue';
import { InboxOutlined } from '@ant-design/icons-vue';
import { Upload } from 'ant-design-vue';
import { getMediaUrlByOrgCode } from '@/api/common/api'
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
const opeMediaAddress = ref<string>('');
const { createMessage, createConfirm } = useMessage();
const { prefixCls } = useDesign('j-upload');
const attrs = useAttrs();
@ -449,6 +450,11 @@ const uploadVisible = computed(() => {
return fileList.value.length < props['maxCount'];
});
onMounted(async () => {
const res = await getMediaUrlByOrgCode({ orgCode: '' });
opeMediaAddress.value = res.mediaUrl;
});
defineExpose({
addActionsListener,
});

12
src/components/Form/src/jeecg/components/JUpload/JUploadMP4.vue
View File

@ -10,7 +10,7 @@
<div class="ant-upload-text">{{ text }}123</div>
</div>
</template>
<div class="upload-area" style="padding: 20px;" v-else-if="uploadVisible" :disabled="buttonDisabled">
<div class="upload-area" style="padding: 20px;" v-if="fileList.length <= 0" :disabled="buttonDisabled">
<p class="upload-text">点击或者拖拽上传</p>
<p class="upload-hint">
<div class="upload-icon">
@ -52,7 +52,7 @@
</template>
<script lang="ts" setup>
import { ref, reactive, computed, watch, nextTick, createApp, unref } from 'vue';
import { ref, reactive, computed, watch, nextTick, createApp, unref, onMounted } from 'vue';
import { Icon } from '/@/components/Icon';
import { getToken } from '/@/utils/auth';
import { uploadUrl } from '/@/api/common/api';
@ -66,8 +66,9 @@ import { getFileAccessHttpUrl, getHeaders } from '/@/utils/common/compUtils';
import UploadItemActions from './components/UploadItemActions.vue';
import { InboxOutlined } from '@ant-design/icons-vue';
import { Upload } from 'ant-design-vue';
import { getMediaUrlByOrgCode } from '@/api/common/api'
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
const opeMediaAddress = ref<string>('');
const { createMessage, createConfirm } = useMessage();
const { prefixCls } = useDesign('j-upload');
const attrs = useAttrs();
@ -458,6 +459,11 @@ const uploadVisible = computed(() => {
return fileList.value.length < props['maxCount'];
});
onMounted(async () => {
const res = await getMediaUrlByOrgCode({ orgCode: '' });
opeMediaAddress.value = res.mediaUrl;
});
defineExpose({
addActionsListener,
});

2
src/views/synchronization/directive/directivesynclog/components/DirectiveSyncLogInfoModal.vue
View File

@ -13,7 +13,6 @@
<script lang="ts" setup>
import { ref, nextTick, defineExpose } from 'vue';
import DirectiveSyncLogInfoList from './DirectiveSyncLogInfoList.vue'
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>('');
const width = ref<number>(800);
@ -67,6 +66,7 @@ function handleCancel() {
visible.value = false;
}
defineExpose({
add,
edit,

11
src/views/synchronization/directive/syncList.vue
View File

@ -40,7 +40,8 @@
<a-button @click="handleOpeLogClose" type="primary">关闭</a-button>
</template>
<div>
<DirectiveOpeLogMainList v-if="opeLogOpen" ref="opeLogRef"></DirectiveOpeLogMainList>
<DirectiveOpeLogMainList v-if="opeLogOpen" :mediaApiAddress="mediaApiAddress" ref="opeLogRef">
</DirectiveOpeLogMainList>
</div>
</a-drawer>
@ -52,7 +53,8 @@
<a-button @click="handleSyncLogClose" type="primary">关闭</a-button>
</template>
<div>
<DirectiveSyncLogMainList v-if="syncLogOpen" ref="syncLogRef"></DirectiveSyncLogMainList>
<DirectiveSyncLogMainList v-if="syncLogOpen" :mediaApiAddress="mediaApiAddress" ref="syncLogRef">
</DirectiveSyncLogMainList>
</div>
</a-drawer>
@ -87,6 +89,7 @@ import { idListByDS } from '/@/views/synchronization/directive/serviceDirective/
import DirectiveBkMainList from '/@/views/services/directivebk/DirectiveBkMainList.vue'
import DirectiveSyncLogMainList from './directivesynclog/DirectiveSyncLogMainList.vue'
import DirectiveOpeLogMainList from './directiveopelog/DirectiveOpeLogMainList.vue'
import { getMediaUrlByOrgCode } from '@/api/common/api'
const { createMessage, createConfirm } = useMessage()
const canAddDirectiveRef = ref()
@ -104,6 +107,7 @@ const backupsRef = ref()//指令备份
const syncLogRef = ref()//镜像日志ref
const opeLogOpen = ref(false)
const opeLogRef = ref()
const mediaApiAddress = ref('')
const labelCol = reactive({
xs: 24,
@ -213,6 +217,9 @@ onMounted(() => {
reload();
getDirectiveMainOrgInfo()
orgListComRef.value?.reload();
getMediaUrlByOrgCode({ orgCode: '' }).then(res => {
mediaApiAddress.value = res.mediaUrl
})
});
</script>