diff --git a/.env.development b/.env.development
index cc495e8..a58f1f9 100644
--- a/.env.development
+++ b/.env.development
@@ -6,19 +6,19 @@ VITE_PUBLIC_PATH = /
# 跨域代理,您可以配置多个 ,请注意,没有换行符
-VITE_PROXY = [["/nursing-unit_102","http://localhost:8092/nursing-unit_102"],["/upload","http://localhost:3300/upload"]]
+VITE_PROXY = [["/nursing-unit_101","http://localhost:8091/nursing-unit_101"],["/upload","http://localhost:3300/upload"]]
#后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=http://localhost:8092/nursing-unit_102
+VITE_GLOB_DOMAIN_URL=http://localhost:8091/nursing-unit_101
#后台接口父地址(必填)
-VITE_GLOB_API_URL=/nursing-unit_102
+VITE_GLOB_API_URL=/nursing-unit_101
# 接口前缀
VITE_GLOB_API_URL_PREFIX=
#微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
-VITE_APP_SUB_jeecg-app-1 = '//localhost:8092'
+VITE_APP_SUB_jeecg-app-1 = '//localhost:8091'
# 填写后将作为乾坤子应用启动,主应用注册时AppName需保持一致(放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动)
#VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3
diff --git a/.env.development101 b/.env.development2
similarity index 75%
rename from .env.development101
rename to .env.development2
index a58f1f9..cc495e8 100644
--- a/.env.development101
+++ b/.env.development2
@@ -6,19 +6,19 @@ VITE_PUBLIC_PATH = /
# 跨域代理,您可以配置多个 ,请注意,没有换行符
-VITE_PROXY = [["/nursing-unit_101","http://localhost:8091/nursing-unit_101"],["/upload","http://localhost:3300/upload"]]
+VITE_PROXY = [["/nursing-unit_102","http://localhost:8092/nursing-unit_102"],["/upload","http://localhost:3300/upload"]]
#后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=http://localhost:8091/nursing-unit_101
+VITE_GLOB_DOMAIN_URL=http://localhost:8092/nursing-unit_102
#后台接口父地址(必填)
-VITE_GLOB_API_URL=/nursing-unit_101
+VITE_GLOB_API_URL=/nursing-unit_102
# 接口前缀
VITE_GLOB_API_URL_PREFIX=
#微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
-VITE_APP_SUB_jeecg-app-1 = '//localhost:8091'
+VITE_APP_SUB_jeecg-app-1 = '//localhost:8092'
# 填写后将作为乾坤子应用启动,主应用注册时AppName需保持一致(放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动)
#VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3
diff --git a/.env.development103 b/.env.development3
similarity index 100%
rename from .env.development103
rename to .env.development3
diff --git a/.env.production b/.env.production
index cb59464..04195f8 100644
--- a/.env.production
+++ b/.env.production
@@ -2,7 +2,7 @@
VITE_USE_MOCK = false
# 发布路径
-VITE_PUBLIC_PATH = /biz103
+VITE_PUBLIC_PATH = /biz101
# 是否启用gzip或brotli压缩
# 选项值: gzip | brotli | none
@@ -13,10 +13,10 @@ VITE_BUILD_COMPRESS = 'gzip'
VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
#后台接口父地址(必填)
-VITE_GLOB_API_URL=/nursingunit103
+VITE_GLOB_API_URL=/nursingunit101
#后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit103
+VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit101
# 接口父路径前缀
VITE_GLOB_API_URL_PREFIX=
diff --git a/src/App.vue b/src/App.vue
index f0d8666..504bee8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,99 +7,103 @@
+// update-begin--author:liaozhiyang---date:20230803---for:【QQYUN-5839】windi会影响到html2canvas绘制的图片样式
+img {
+ display: inline-block;
+}
+
+.nu-menu-item :hover {
+ color: #69c0ff !important;
+}
+
+// update-end--author:liaozhiyang---date:20230803---for:【QQYUN-5839】windi会影响到html2canvas绘制的图片样式
diff --git a/src/views/services/directiveTag/bodytag/BodyTagList.vue b/src/views/services/directiveTag/bodytag/BodyTagList.vue
index f98a937..41b2d8a 100644
--- a/src/views/services/directiveTag/bodytag/BodyTagList.vue
+++ b/src/views/services/directiveTag/bodytag/BodyTagList.vue
@@ -97,8 +97,8 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
useSearchForm: false,
pagination: {
current: 1,
- pageSize: 50,
- pageSizeOptions: ['50', '70', '100'],
+ pageSize: 15,
+ pageSizeOptions: ['15','50', '70', '100'],
},
actionColumn: {
width: 160,
diff --git a/src/views/services/directiveTag/emotiontag/EmotionTagList.vue b/src/views/services/directiveTag/emotiontag/EmotionTagList.vue
index f7c3390..8028e78 100644
--- a/src/views/services/directiveTag/emotiontag/EmotionTagList.vue
+++ b/src/views/services/directiveTag/emotiontag/EmotionTagList.vue
@@ -97,8 +97,8 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
useSearchForm: false,
pagination: {
current: 1,
- pageSize: 50,
- pageSizeOptions: ['50', '70', '100'],
+ pageSize: 15,
+ pageSizeOptions: ['15','50', '70', '100'],
},
actionColumn: {
width: 160,
diff --git a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
index 7210eb4..b224065 100644
--- a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
+++ b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
@@ -73,10 +73,10 @@
-
+
-
+
全部
启用
@@ -89,8 +89,8 @@
新增分类标签
-
+
@@ -109,7 +109,7 @@
{ closeAllMenus(); item.action(data) }">
+ class="nu-menu-item" @click="() => { closeAllMenus(); item.action(data) }">
{{ item.label }}
@@ -228,7 +228,7 @@
-
+
关闭
@@ -236,7 +236,7 @@
-
+
关闭
@@ -1165,4 +1165,5 @@ audio::-webkit-media-controls-time-remaining-display {
overflow-y: auto;
}
}
+
diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
index fdf5356..88907c3 100644
--- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
+++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
@@ -1,187 +1,318 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
- 暂无文件
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 暂无文件
-
-
-
-
-
-
-
-
-
-
-
- 暂无文件
-
-
-
-
-
-
- 暂无文件
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
点击或者拖拽上传
+
+
+
+
+ 文件大小不超过10MB
+ |
+
+
+ 这里是格式说明的具体内容
+
+
+
+ 格式说明
+
+
+
+
+
+
+
+
+
+
点击或者拖拽上传
+
+
+
+
+ 文件大小不超过10MB
+ |
+
+
+ 这里是格式说明的具体内容
+
+
+
+ 格式说明
+
+
+
+
+
+
+
+
+
+
点击或者拖拽上传
+
+
+
+
+ 文件大小不超过10MB
+ |
+
+
+ 这里是格式说明的具体内容
+
+
+
+ 格式说明
+
+
+
+
+
+
+
+
+
+
点击或者拖拽上传
+
+
+
+
+ 文件大小不超过10MB
+ |
+
+
+ 这里是格式说明的具体内容
+
+
+
+ 格式说明
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无文件
+
+
+
+
+
+
+
+
+
+
+
+ 暂无文件
+
+
+
+
+
+
+ 暂无文件
+
+
+
+
+
+
+
+
+
+
@@ -199,7 +330,17 @@ import { Form } from 'ant-design-vue';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
import { env } from 'process';
+import DirectiveRadioCom from './DirectiveRadioCom.vue'
+import { QuestionCircleOutlined } from '@ant-design/icons-vue';
+import { DownOutlined } from '@ant-design/icons-vue';
+const showDescription = ref(false);
+
+// 切换悬浮容器的显示状态
+const toggleDescription = () => {
+ showDescription.value = !showDescription.value;
+};
+const fileList = ref([])
const onPriceKeydown = (e: KeyboardEvent) => {
const key = e.key;
// 放行控制键
@@ -217,6 +358,25 @@ const onPriceKeydown = (e: KeyboardEvent) => {
e.preventDefault();
}
};
+
+const onDurationKeydown = (e: KeyboardEvent) => {
+ const key = e.key;
+ // 放行控制键
+ if (['Backspace', 'Delete', 'ArrowLeft', 'ArrowRight', 'Tab'].includes(key)) return;
+ // 只能输数字和点
+ if (!/[\d.]/.test(key)) {
+ e.preventDefault();
+ return;
+ }
+ const input = e.target as HTMLInputElement;
+ const { value, selectionStart: s, selectionEnd: t } = input;
+ const next = value.slice(0, s!) + key + value.slice(t!);
+ // 整数最多5位,小数最多2位
+ if (!/^\d{0,2}$/.test(next)) {
+ e.preventDefault();
+ }
+};
+
const props = defineProps({
formDisabled: { type: Boolean, default: false },
formData: { type: Object, default: () => ({}) },
@@ -225,7 +385,22 @@ const props = defineProps({
mediaApiAddress: '',//指令资源请求地址
opeType: 'look',
});
-
+const checkMp3 = (file) => {
+ const isPDF = file.type === 'application/mp3' || file.name.endsWith('.mp3');
+ if (!isPDF) {
+ createMessage.error('只能上传 mp3 文件!');
+ return false; // 阻止上传
+ }
+ return true;
+};
+const checkMp4 = (file) => {
+ const isPDF = file.type === 'application/mp4' || file.name.endsWith('.mp4');
+ if (!isPDF) {
+ createMessage.error('只能上传 PDF mp4');
+ return false; // 阻止上传
+ }
+ return true;
+};
const bodyTagDictCode = ref(`nu_config_body_tag,tag_name,id,del_flag = 0 and iz_enabled = 0 order by sort asc`)
const emotionTagDictCode = ref(`nu_config_emotion_tag,tag_name,id,del_flag = 0 and iz_enabled = 0 order by sort asc`)
const formRef = ref();
@@ -258,10 +433,8 @@ const formData = reactive>({
immediateFile: '',
});
const { createMessage } = useMessage();
-const labelCol = ref({ xs: { span: 24 }, sm: { span: 6 } });
-const wrapperCol = ref({ xs: { span: 24 }, sm: { span: 16 } });
-const labelCol2 = ref({ xs: { span: 24 }, sm: { span: 3 } });
-const wrapperCol2 = ref({ xs: { span: 24 }, sm: { span: 20 } });
+const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } });
+const wrapperCol = ref({ xs: { span: 24 }, sm: { span: 19 } });
const confirmLoading = ref(false);
const isEditMedia = ref(false)
const instructionTagName = ref('')
@@ -578,6 +751,12 @@ function syncMediaForAllBizFunc() {
});
}
+const directiveMediaBtnValue = ref(0)
+function mediaBtnChanged(v_) {
+ directiveMediaBtnValue.value = v_
+
+}
+
onMounted(() => {
})
@@ -595,4 +774,119 @@ defineExpose({
.antd-modal-form {
padding: 14px;
}
-
+
+:deep .ant-checkbox-wrapper {
+ margin-top: 5px;
+ margin-bottom: 10px;
+ width: 30%;
+}
+
+.upload-area {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+}
+
+.upload-icon {
+ margin-bottom: 16px;
+}
+
+.upload-text {
+ font-size: 16px;
+ color: rgba(0, 0, 0, 0.85);
+ margin-bottom: 8px;
+}
+
+.upload-hint {
+ font-size: 12px;
+ color: rgba(0, 0, 0, 0.45);
+ display: flex;
+ align-items: center;
+ gap: 8px;
+}
+
+.divider {
+ color: rgba(0, 0, 0, 0.2);
+}
+
+.description-container {
+ position: relative;
+ z-index: 1000;
+}
+
+.description-box {
+ position: absolute;
+ bottom: 100%;
+ left: 0;
+ background: #f6faff;
+ border-radius: 4px;
+ padding: 12px;
+ width: 43vw;
+ box-shadow: 0 3px 10px rgba(0, 0, 0, 0.1);
+ margin-bottom: 8px;
+}
+
+.box-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding-bottom: 8px;
+ margin-bottom: 12px;
+}
+
+.title {
+ font-weight: bold;
+ font-size: 16px;
+}
+
+.collapse-icon {
+ color: #1890ff;
+ cursor: pointer;
+}
+
+.content {
+ background: #fff;
+ border-radius: 4px;
+ padding: 12px;
+ position: relative;
+}
+
+.instruction {
+ color: #8c8c8c;
+ margin-bottom: 30px;
+}
+
+.confirm-btn {
+ position: absolute;
+ right: 12px;
+ bottom: 12px;
+ background: #1890ff;
+ border-radius: 20px;
+}
+
+/* 渐隐渐现动画 */
+.slide-fade-enter-active {
+ transition: opacity 0.3s ease-out;
+}
+
+.slide-fade-leave-active {
+ transition: opacity 0.3s cubic-bezier(0.5, 0, 0.8, 1);
+}
+
+/* 进入时从透明开始 */
+.slide-fade-enter-from {
+ opacity: 0;
+}
+
+/* 离开时渐变到透明 */
+.slide-fade-leave-to {
+ opacity: 0;
+}
+
+/* 确保容器初始状态无变形 */
+.slide-fade-enter-to,
+.slide-fade-leave-from {
+ opacity: 1;
+}
+
\ No newline at end of file
diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue
index feac11b..4aa0245 100644
--- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue
+++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue
@@ -15,8 +15,8 @@
:formBpm="false" :mainOrgCode="mainOrgCode">
-->
-
+
@@ -273,4 +273,5 @@ defineExpose({
display: none !important;
}
-
+
diff --git a/src/views/services/serviceDirective/components/DirectiveRadioCom.vue b/src/views/services/serviceDirective/components/DirectiveRadioCom.vue
new file mode 100644
index 0000000..da0ee8b
--- /dev/null
+++ b/src/views/services/serviceDirective/components/DirectiveRadioCom.vue
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/services/serviceDirective/components/mp3type.png b/src/views/services/serviceDirective/components/mp3type.png
new file mode 100644
index 0000000..5230378
Binary files /dev/null and b/src/views/services/serviceDirective/components/mp3type.png differ
diff --git a/src/views/services/serviceDirective/components/mp4type.png b/src/views/services/serviceDirective/components/mp4type.png
new file mode 100644
index 0000000..8970b41
Binary files /dev/null and b/src/views/services/serviceDirective/components/mp4type.png differ
diff --git a/src/views/services/serviceDirective/components/pictype.png b/src/views/services/serviceDirective/components/pictype.png
new file mode 100644
index 0000000..2667330
Binary files /dev/null and b/src/views/services/serviceDirective/components/pictype.png differ