From 9c65479ad6d512252b77bee1b3501d9a1d49cb9f Mon Sep 17 00:00:00 2001 From: yinsiyu <516159562@qq.com> Date: Mon, 19 Aug 2024 16:28:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E6=B2=BB=E7=96=97?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E7=BB=B4=E6=8A=A4=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 2 +- package.json | 2 +- src/assets/styles/tailwindcss.css | 3 + src/layout/components/Sidebar/Logo.vue | 1 + src/main.js | 13 +- .../deptList/components/CrudPopup/index.vue | 15 +- .../list/components/AddTherapeuticDialog.vue | 225 ++++++++++++++++ .../dictManage/therapeuticRegimen/list/index.vue | 300 ++++++++++++++++++++- .../components/selectRecommend/index.vue | 135 ++++++---- 9 files changed, 620 insertions(+), 76 deletions(-) create mode 100644 src/assets/styles/tailwindcss.css create mode 100644 src/views/dictManage/therapeuticRegimen/list/components/AddTherapeuticDialog.vue diff --git a/package-lock.json b/package-lock.json index 6726742..6c5e66d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,7 +38,7 @@ "vuedraggable": "^2.24.3", "vuex": "3.6.0", "vuex-persistedstate": "^4.1.0", - "vxe-table": "^3.8.6", + "vxe-table": "~3.8.12", "xe-utils": "^3.5.27" }, "devDependencies": { diff --git a/package.json b/package.json index 6462412..67ae3f5 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "vuedraggable": "^2.24.3", "vuex": "3.6.0", "vuex-persistedstate": "^4.1.0", - "vxe-table": "^3.8.6", + "vxe-table": "~3.8.12", "xe-utils": "^3.5.27" }, "devDependencies": { diff --git a/src/assets/styles/tailwindcss.css b/src/assets/styles/tailwindcss.css new file mode 100644 index 0000000..b5c61c9 --- /dev/null +++ b/src/assets/styles/tailwindcss.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 28a59d4..9286054 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -90,6 +90,7 @@ export default { width: 100%; & .sidebar-logo { + display: inline-block; width: 32px; height: 32px; vertical-align: middle; diff --git a/src/main.js b/src/main.js index 8127972..8cfa5a9 100644 --- a/src/main.js +++ b/src/main.js @@ -4,8 +4,8 @@ import Cookies from "js-cookie"; import Element from "element-ui"; import "./assets/styles/element-variables.scss"; -import VXETable from 'vxe-table' -import 'vxe-table/lib/style.css' +import VXETable from "vxe-table"; +import "vxe-table/lib/style.css"; import "@/assets/styles/index.scss"; // global css import "@/assets/styles/ruoyi.scss"; // ruoyi css import App from "./App"; @@ -30,9 +30,10 @@ import Pagination from "@/components/Pagination"; // 字典标签组件 // 头部标签组件 import VueMeta from "vue-meta"; -import '@/styles/vxeCommon.scss'; -import '@/styles/public.scss'; -import registComps from '@/plugins/registComps'; +import "@/styles/vxeCommon.scss"; +import "@/styles/public.scss"; +import "@/assets/styles/tailwindcss.css"; +import registComps from "@/plugins/registComps"; // 全局方法挂载 Vue.prototype.parseTime = parseTime; @@ -45,7 +46,7 @@ Vue.prototype.handleTree = handleTree; // 全局组件挂载 Vue.component("Pagination", Pagination); -Vue.use(VXETable) +Vue.use(VXETable); Vue.use(directive); Vue.use(plugins); Vue.use(registComps); diff --git a/src/views/dictManage/deptManage/deptList/components/CrudPopup/index.vue b/src/views/dictManage/deptManage/deptList/components/CrudPopup/index.vue index 10d687e..b008ed2 100644 --- a/src/views/dictManage/deptManage/deptList/components/CrudPopup/index.vue +++ b/src/views/dictManage/deptManage/deptList/components/CrudPopup/index.vue @@ -47,8 +47,8 @@ diff --git a/src/views/dictManage/therapeuticRegimen/list/index.vue b/src/views/dictManage/therapeuticRegimen/list/index.vue index 7c77a30..bc9fd50 100644 --- a/src/views/dictManage/therapeuticRegimen/list/index.vue +++ b/src/views/dictManage/therapeuticRegimen/list/index.vue @@ -1,39 +1,329 @@ diff --git a/src/views/operationManage/recommendDoctorConfig/components/selectRecommend/index.vue b/src/views/operationManage/recommendDoctorConfig/components/selectRecommend/index.vue index 57b8d90..5908411 100644 --- a/src/views/operationManage/recommendDoctorConfig/components/selectRecommend/index.vue +++ b/src/views/operationManage/recommendDoctorConfig/components/selectRecommend/index.vue @@ -1,15 +1,16 @@