فهرست منبع

修复模板不存在的问题

DESKTOP-MINPJAU\Administrator 3 سال پیش
والد
کامیت
480f9a4fb8

+ 19 - 4
src/assets/style/common.scss

@@ -1,5 +1,5 @@
 @import "./transition.scss";
-@import "@/theme/index.scss";
+
 .layout-container {
   background-color: var(--system-container-main-background);
   width: calc(100% - 30px);
@@ -8,25 +8,31 @@
   display: flex;
   flex-direction: column;
   overflow-y: auto;
+
   &-form {
     display: flex;
     justify-content: space-between;
     padding: 15px 15px 0;
+
     &-handle {
       display: flex;
       justify-content: flex-start;
     }
+
     &-search {
       display: flex;
       justify-content: flex-end;
+
       .search-btn {
         margin-left: 15px;
       }
     }
+
     .el-form-item {
       margin-bottom: 0;
     }
   }
+
   &-table {
     flex: 1;
     height: 100%;
@@ -34,6 +40,7 @@
     overflow: auto;
   }
 }
+
 .flex-box {
   display: flex;
   flex-direction: column;
@@ -42,20 +49,23 @@
   padding: 15px;
   box-sizing: border-box;
 }
+
 .flex {
   display: flex;
 }
+
 .center {
   justify-content: center;
   align-items: center;
   text-align: center;
 }
+
 a {
   text-decoration: none;
 }
 
 /** element-plus **/
-.el-icon{
+.el-icon {
   text-align: center;
 }
 
@@ -66,26 +76,31 @@ a {
   text-align: left;
   border-radius: 4px;
 }
+
 .system-scrollbar {
   &::-webkit-scrollbar {
     display: none;
     width: 6px;
   }
+
   &::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: rgba(144, 147, 153, 0.3);
   }
+
   &:hover {
     &::-webkit-scrollbar {
       display: block;
     }
+
     &::-webkit-scrollbar-thumb {
       border-radius: 10px;
       background: rgba(144, 147, 153, 0.3);
+
       &:hover {
         background: rgba(144, 147, 153, 0.5);
       }
     }
   }
- 
-}
+
+}

+ 10 - 3
src/components/med-tec-mod/HuoQuMuBan.vue

@@ -12,7 +12,8 @@
                 </el-button>
               </template>
               <!-- 这里是弹出框中的数据 -->
-              <xc-table :data="muBanXiangQing" is-array :height="170"
+              <xc-table :data="muBanXiangQing" :height="170"
+
                         @selection-change="xuanZeXiangMuTable" :open-paging="false">
                 <el-table-column type="selection"></el-table-column>
                 <el-table-column label="项目名称" prop="chargeName"></el-table-column>
@@ -92,12 +93,18 @@ const templatePaging = (val) => {
 // 获取模板信息
 const getMuBanXinXiClick = (row) => {
   getMuBanXinXi(row.name, row.opIdCode).then((res) => {
-    muBanXiangQing.value = res
+    muBanXiangQing.value.data = res
+    muBanXiangQing.value.total = res.lenght
   })
 }
 
 // 获取模板的详情
-const muBanXiangQing = ref([])
+const muBanXiangQing = ref({
+  data: [],
+  currentPage: 1,
+  pageSize: 30,
+  total: 0
+})
 
 // 获取选择的数据
 const xuanZeXiangMuTable = (val) => {

+ 14 - 11
src/layout/HeaderV2/function-list/Theme.vue

@@ -8,15 +8,15 @@
       <el-form>
 
         <el-form-item label="侧边菜单栏背景色">
-          <el-color-picker v-model="theme.sideMenuBarBackgroundColor"/>
+          <el-color-picker v-model="theme.menu.sideMenuBarBackgroundColor"/>
         </el-form-item>
 
         <el-form-item label="侧边菜单文字颜色">
-          <el-color-picker v-model="theme.sideMenuTextColor"/>
+          <el-color-picker v-model="theme.menu.sideMenuTextColor"/>
         </el-form-item>
 
         <el-form-item label="侧边菜单激活项背景色">
-          <el-color-picker v-model="theme.activateMenu"/>
+          <el-color-picker v-model="theme.menu.activateMenu"/>
         </el-form-item>
 
 
@@ -29,15 +29,17 @@
 import {clone} from '@/utils/clone'
 import store from '@/store'
 
-let drawer = $ref(true)
+let drawer = $ref(false)
 
 let theme = $ref({
-  // 侧边菜单激活项背景色
-  activateMenu: '',
-  // 侧边菜单文字颜色
-  sideMenuBarBackgroundColor: '',
-  // 侧边菜单栏背景色
-  sideMenuTextColor: ''
+  menu: {
+    // 侧边菜单激活项背景色
+    activateMenu: '',
+    // 侧边菜单文字颜色
+    sideMenuBarBackgroundColor: '',
+    // 侧边菜单栏背景色
+    sideMenuTextColor: ''
+  }
 })
 
 watch(() => theme, () => {
@@ -45,7 +47,8 @@ watch(() => theme, () => {
 }, {deep: true})
 
 onMounted(() => {
-  theme = clone(store.state.app.theme)
+  console.log(store.state.app.theme)
+  // theme = clone(store.state.app.theme)
 })
 
 </script>

+ 1 - 1
src/layout/MenuV2/MenuV2.vue

@@ -25,7 +25,7 @@ const data = store.state.user.routes
 const expandOneMenu = computed(() => store.state.app.expandOneMenu)
 const route = useRoute()
 const isCollapse = computed(() => store.state.app.isCollapse)
-const theme = computed(() => store.state?.app?.theme)
+const theme = computed(() => store.state?.app?.theme.menu)
 
 const logoRef: Ref<HTMLHtmlElement> = ref(null)
 const floatingRef: Ref<HTMLHtmlElement> = ref(null)

+ 1 - 8
src/store/modules/app.js

@@ -16,14 +16,7 @@ const state = () => ({
         isOpen: false,
         closeButton: false,
     },
-    theme: {
-        // 侧边菜单激活项背景色
-        activateMenu: '',
-        // 侧边菜单文字颜色
-        sideMenuBarBackgroundColor: '',
-        // 侧边菜单栏背景色
-        sideMenuTextColor: '',
-    },
+    theme: {},
     yiZhuLuRu: {
         path: '/inpatient/zhuYuanYiSheng/yiZhuLuRu',
     },

+ 0 - 54
src/theme/index.scss

@@ -1,54 +0,0 @@
-:root {
-  // 主题色
-  --system-primary-color: #409eff; // 可做背景色和文本色,用做背景色时,需要和--system-primary-text-color配合使用,避免文件颜色和主题色冲突
-  --system-primary-text-color: #fff; // 主题色作为背景色时使用
-
-  // logo颜色相关
-  --system-logo-color: #f1f1f1;
-  --system-logo-background: #263445;
-
-  // 菜单颜色相关
-  --system-menu-text-color: #bfcbd9;
-  --system-menu-background: #28415a;
-  --system-menu-children-background: #1f2d3d;
-  --system-menu-submenu-active-color: #fff; 
-  --system-menu-hover-background: #203448;
-
-  // 标签颜色
-  --system-tab-active-color: #008b8d;
-
-  // header区域
-  --system-header-background: #fff;
-  --system-header-text-color: #bbb;
-  --system-header-breadcrumb-text-color: #97a8be;
-  --system-header-item-hover-color: #000;
-  --system-header-border-color: #d8dce5;
-  --system-header-tab-background: #fff;
-
-  // contaier区域,父框架
-  --system-container-background: #f0f2f5;
-  --system-container-main-background: #fff;
-
-  // 页面区域, 这一块是你在自己写的文件中使用主题,核心需要关注的地方
-  --system-page-background: #fff; // 主背景
-  --system-page-color: #303133; // 主要的文本颜色
-  --system-page-tip-color: rgba(0, 0, 0, 0.45); // 协助展示的文本颜色
-  --system-page-border-color: #000; // 通用的边框配置色,便于主题扩展
-  
-  // element主题色修改
-  --el-color-primary: var(--system-primary-color);
-}
-
-// 进度条颜色修改为主题色
-body #nprogress .bar {
-  background-color: var(--system-primary-color);
-}
-body #nprogress .peg {
-  box-shadow: 0 0 10px var(--system-primary-color), 0 0 5px var(--system-primary-color);
-}
-body #nprogress .spinner-icon {
-  border-top-color: var(--system-primary-color);
-  border-left-color: var(--system-primary-color);
-}
-
-@import './modules/dark.scss';

+ 0 - 23
src/theme/modules/dark.scss

@@ -1,23 +0,0 @@
-.dark {
-  // 通用
-  p, h1, h2, h3, h4, h5, h6, article {
-    color: var(--system-page-color);
-  }
-  .el-tree {
-    background-color: var(--system-page-background);
-    .el-tree-node__content:hover {
-      background-color: #272727;
-    }
-    --el-color-primary-light-9: #272727;
-  }
-  .el-card {
-    background-color: var(--system-page-background);
-    color: var(--system-page-color);
-    border-color: var(--system-page-border-color);
-    .el-card__header {
-      border-color: var(--system-page-border-color);
-    }
-  }
-  // 页面内部样式修改
-  
-}