diff --git a/.env.development b/.env.development index 4230004..e3b4830 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,3 @@ NODE_ENV=development -VITE_APP_TITLE='律师公益法律服务活动申报子系统' +VITE_APP_TITLE='合肥市律师公益法律服务管理系统' VITE_APP_API_URL='/api' \ No newline at end of file diff --git a/.env.localhost b/.env.localhost index 2baa3db..f6401d8 100644 --- a/.env.localhost +++ b/.env.localhost @@ -1,3 +1,3 @@ NODE_ENV=development -VITE_APP_TITLE='律师公益法律服务活动申报子系统' +VITE_APP_TITLE='合肥市律师公益法律服务管理系统' VITE_APP_API_URL='/api' diff --git a/.env.pre b/.env.pre index 6d3c6ad..107a32e 100644 --- a/.env.pre +++ b/.env.pre @@ -1,3 +1,3 @@ NODE_ENV=production -VITE_APP_TITLE='律师公益法律服务活动申报子系统' +VITE_APP_TITLE='合肥市律师公益法律服务管理系统' VITE_APP_API_URL='/api' \ No newline at end of file diff --git a/.env.production b/.env.production index 6d3c6ad..107a32e 100644 --- a/.env.production +++ b/.env.production @@ -1,3 +1,3 @@ NODE_ENV=production -VITE_APP_TITLE='律师公益法律服务活动申报子系统' +VITE_APP_TITLE='合肥市律师公益法律服务管理系统' VITE_APP_API_URL='/api' \ No newline at end of file diff --git a/.env.test b/.env.test index 68741ba..325cf4f 100644 --- a/.env.test +++ b/.env.test @@ -1,3 +1,3 @@ NODE_ENV=production -VITE_APP_TITLE='律师公益法律服务活动申报子系统' +VITE_APP_TITLE='合肥市律师公益法律服务管理系统' VITE_APP_API_URL='/api' diff --git a/dist.zip b/dist.zip index 7238a84..f0c0ecd 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/index.html b/index.html index c88dce4..78e158c 100644 --- a/index.html +++ b/index.html @@ -1,9 +1,5 @@ diff --git a/src/api/business/service-applications/service-applications-api.js b/src/api/business/service-applications/service-applications-api.js index 9b53577..51c4839 100644 --- a/src/api/business/service-applications/service-applications-api.js +++ b/src/api/business/service-applications/service-applications-api.js @@ -98,6 +98,13 @@ export const serviceApplicationsApi = { statisticsDepartment: (params) => { return postRequest('/serviceApplications/statistics/department', params); }, + + /** + * 查询详情 @author wzh + */ + queryDetail: (applicationId) => { + return getRequest(`/serviceApplications/queryDetail/${applicationId}`); + }, /** * 导出律所统计信息 @author wzh diff --git a/src/assets/images/logo/logo-min.png b/src/assets/images/logo/logo-min.png index b586a64..38f682d 100644 Binary files a/src/assets/images/logo/logo-min.png and b/src/assets/images/logo/logo-min.png differ diff --git a/src/assets/images/logo/logo-min2.png b/src/assets/images/logo/logo-min2.png new file mode 100644 index 0000000..b586a64 Binary files /dev/null and b/src/assets/images/logo/logo-min2.png differ diff --git a/src/assets/images/logo/smart-admin-logo.png b/src/assets/images/logo/smart-admin-logo.png index 82009b4..38f682d 100644 Binary files a/src/assets/images/logo/smart-admin-logo.png and b/src/assets/images/logo/smart-admin-logo.png differ diff --git a/src/assets/images/logo/smart-admin-logo1.png b/src/assets/images/logo/smart-admin-logo1.png new file mode 100644 index 0000000..82009b4 Binary files /dev/null and b/src/assets/images/logo/smart-admin-logo1.png differ diff --git a/src/components/business/category-tree-select/index.vue b/src/components/business/category-tree-select/index.vue index a4cec92..4a9c77a 100644 --- a/src/components/business/category-tree-select/index.vue +++ b/src/components/business/category-tree-select/index.vue @@ -14,6 +14,7 @@ tree-default-expand-all @change="onChange" :field-names="{ label: 'label', value: 'value', children: 'children' }" + :disabled="disabled" /> @@ -34,6 +35,10 @@ type: String, default: '100%', }, + disabled: { + type: Boolean, + default: false, + }, }); const emit = defineEmits(['update:value', 'change']); @@ -159,6 +164,6 @@ :deep(.ant-select-tree-title::before) { font-weight: bold; margin-right: 5px; - color: #1890ff; + color: #1e3a8a; } diff --git a/src/components/framework/icon-select/index.vue b/src/components/framework/icon-select/index.vue index 468335d..9d6f75d 100644 --- a/src/components/framework/icon-select/index.vue +++ b/src/components/framework/icon-select/index.vue @@ -128,6 +128,6 @@ } } .icon-content:hover { - background: #1890ff; + background: #1e3a8a; } diff --git a/src/components/framework/smart-copy-icon/index.vue b/src/components/framework/smart-copy-icon/index.vue index 5eeeaf4..b20869e 100644 --- a/src/components/framework/smart-copy-icon/index.vue +++ b/src/components/framework/smart-copy-icon/index.vue @@ -17,7 +17,7 @@ }, color: { type: String, - default: '#1890ff', + default: '#1e3a8a', }, }); diff --git a/src/components/framework/wangeditor/index.vue b/src/components/framework/wangeditor/index.vue index dc3c31c..ff7f25d 100644 --- a/src/components/framework/wangeditor/index.vue +++ b/src/components/framework/wangeditor/index.vue @@ -50,30 +50,66 @@ editorConfig.MENU_CONF['uploadVideo'] = customUpload; // ----------------------- 以下是公用变量 emits props ---------------- - const editorHtml = ref(); let props = defineProps({ - modelValue: String, + modelValue: { + type: String, + default: '' + }, height: { type: Number, default: 500, }, + readonly: { + type: Boolean, + default: false, + }, }); + const emit = defineEmits(['update:modelValue']); + const editorRef = shallowRef(); + const editorHtml = ref(props.modelValue || ''); watch( () => props.modelValue, (nVal) => { - editorHtml.value = nVal; + editorHtml.value = nVal || ''; }, { immediate: true, deep: true, } ); + + // 监听只读状态变化 + watch( + () => props.readonly, + (newVal) => { + if (editorRef.value) { + if (newVal) { + // 先确保编辑器有内容 + if (!editorHtml.value) { + editorHtml.value = '

 

'; + } + editorRef.value.disable(); + } else { + editorRef.value.enable(); + } + } + }, + { + immediate: true + } + ); // 获取编辑器实例html - const emit = defineEmits(['update:modelValue']); - const editorRef = shallowRef(); const handleCreated = (editor) => { editorRef.value = editor; + // 先确保编辑器有内容 + if (!editorHtml.value) { + editorHtml.value = '

 

'; + } + // 设置编辑器的只读状态 + if (props.readonly) { + editor.disable(); + } }; const handleChange = (editor) => { emit('update:modelValue', editorHtml.value); diff --git a/src/components/system/service-count/firm-statistics-detail.vue b/src/components/system/service-count/firm-statistics-detail.vue index c0b6a5e..94e937c 100644 --- a/src/components/system/service-count/firm-statistics-detail.vue +++ b/src/components/system/service-count/firm-statistics-detail.vue @@ -175,7 +175,7 @@ onMounted(() => { .back-btn { margin-right: 20px; - color: #1890ff; + color: #1e3a8a; } .detail-title h2 { @@ -260,7 +260,7 @@ onMounted(() => { } .excel-header .excel-cell { - background: #1890ff; + background: #1e3a8a; color: white; border-right: 1px solid #40a9ff; } diff --git a/src/components/system/service-count/quarter-statistics.vue b/src/components/system/service-count/quarter-statistics.vue index ce2f2ff..525a942 100644 --- a/src/components/system/service-count/quarter-statistics.vue +++ b/src/components/system/service-count/quarter-statistics.vue @@ -10,14 +10,7 @@ - - - - {{ quarter.label }} - - - - + @@ -25,6 +18,13 @@ + + + + {{ quarter.label }} + + + @@ -52,7 +52,7 @@ - + diff --git a/src/layout/components/side-menu/index.vue b/src/layout/components/side-menu/index.vue index 33f1e74..a8586ce 100644 --- a/src/layout/components/side-menu/index.vue +++ b/src/layout/components/side-menu/index.vue @@ -58,9 +58,8 @@ } const color = computed(() => { - let isLight = useAppConfigStore().$state.sideMenuTheme === 'light'; return { - background: isLight ? '#FFFFFF' : '#001529', + background: '#1e3a8a', }; }); @@ -73,6 +72,9 @@ min-height: 100vh; overflow-y: auto; z-index: 10; + background-color: #1e3a8a !important; + box-shadow: none !important; + border-bottom: none !important; .min-logo { height: @header-user-height; @@ -115,7 +117,7 @@ padding: 4px 0; } .title-light { - color: #001529; + color: #1e3a8a; } .title-dark { color: #ffffff; @@ -124,5 +126,6 @@ } .menu { margin-top: @header-user-height; + background-color: #1e3a8a; } diff --git a/src/layout/components/side-menu/recursion-menu.vue b/src/layout/components/side-menu/recursion-menu.vue index 6977a25..0039224 100644 --- a/src/layout/components/side-menu/recursion-menu.vue +++ b/src/layout/components/side-menu/recursion-menu.vue @@ -117,5 +117,115 @@ diff --git a/src/layout/components/side-menu/sub-menu.vue b/src/layout/components/side-menu/sub-menu.vue index 60ccfdc..0880aa3 100644 --- a/src/layout/components/side-menu/sub-menu.vue +++ b/src/layout/components/side-menu/sub-menu.vue @@ -1,11 +1,6 @@