guhongwei %!s(int64=2) %!d(string=hai) anos
pai
achega
772d7a47c9

+ 2 - 3
src/components/frame/c-table.vue

@@ -4,8 +4,7 @@
       ref="table"
       :row-key="rowKey"
       :data="data"
-      border
-      stripe
+      :border="true"
       :max-height="height !== null ? height : ''"
       @select="handleSelectionChange"
       @select-all="handleSelectAll"
@@ -135,7 +134,7 @@ const props = defineProps({
   sumcol: { type: Array, default: () => [] },
   sumres: { type: String, default: 'total' },
   // limit: { type: Number, default: 10 },
-  height: null,
+  height: { type: Number, default: 1000 },
   operaWidth: { type: Number, default: 200 },
   vOpera: { type: Boolean, default: false },
 });

+ 0 - 46
src/components/studio-one-green copy/home-1.vue

@@ -1,46 +0,0 @@
-<template>
-  <div id="home">
-    <el-container class="main" :style="{ background: styleInfo.main_bg_color }">
-      <el-aside class="one" :style="{ background: styleInfo.aside_bg_color, 'border-color': styleInfo.aside_border_color }">
-        <HomeLeft></HomeLeft>
-      </el-aside>
-      <el-container class="two" :style="{ background: styleInfo.con_bg_color }">
-        <el-header class="two_1">
-          <HomeHead></HomeHead>
-        </el-header>
-        <el-main class="two_2" :style="{ background: styleInfo.conmain_bg_color, 'border-color': styleInfo.aside_border_color }">
-          <router-view></router-view>
-        </el-main>
-      </el-container>
-    </el-container>
-  </div>
-</template>
-<script setup lang="ts">
-import { studio_style_Info } from '../../layout/site';
-import HomeLeft from './homeParts/left-1.vue';
-import HomeHead from './homeParts/header-1.vue';
-let styleInfo = studio_style_Info;
-</script>
-
-<style scoped lang="scss">
-.main {
-  display: flex;
-  width: 100vw;
-  height: 100vh;
-  .one {
-    border-radius: 10px;
-    margin: 0.5vw;
-    padding: 0.5vw;
-    border: 1px solid;
-  }
-  .two {
-    min-width: 1200px;
-    .two_2 {
-      border-radius: 10px;
-      margin: 0.5vw;
-      padding: 0.5vw;
-      border: 1px solid;
-    }
-  }
-}
-</style>

+ 0 - 63
src/components/studio-one-green copy/home-2.vue

@@ -1,63 +0,0 @@
-<template>
-  <div id="home-2">
-    <el-container class="main">
-      <el-header>
-        <HomeHead></HomeHead>
-      </el-header>
-      <el-container class="two">
-        <el-aside width="300px">
-          <HomeLeft></HomeLeft>
-        </el-aside>
-        <el-main>
-          <el-col :span="24" class="two_1">
-            <router-view></router-view>
-          </el-col>
-        </el-main>
-      </el-container>
-    </el-container>
-  </div>
-</template>
-
-<script setup lang="ts">
-import HomeLeft from './parts/left-1.vue';
-import HomeHead from './parts/header-1.vue';
-</script>
-
-<style scoped lang="scss">
-.main {
-  display: flex;
-  overflow: hidden;
-  width: 100vw;
-  height: 100vh;
-  padding: 10px;
-  // background-color: #fff2cc;
-  .el-header {
-    padding: 10px;
-    margin: 0 0 10px 0;
-    background-color: #e2f0d9;
-    border-radius: 10px;
-    border: 1px solid #727e96;
-  }
-  .two {
-    .el-aside {
-      background-color: #e2f0d9;
-      border-radius: 10px;
-      padding: 0.5vw;
-      margin: 0 0.5vw 0 0;
-      border: 1px solid #727e96;
-    }
-    .el-main {
-      padding: 0;
-      border-radius: 10px;
-      background-color: #dae3f3;
-      border: 1px solid #727e96;
-      .two_1 {
-        display: flex;
-        height: 90vh;
-        padding: 10px;
-        flex-direction: column;
-      }
-    }
-  }
-}
-</style>

+ 0 - 9
src/components/studio-one-green copy/home-3.vue

@@ -1,9 +0,0 @@
-<template>
-  <div id="home-2">
-    <router-view></router-view>
-  </div>
-</template>
-
-<script setup lang="ts"></script>
-
-<style scoped lang="scss"></style>

+ 0 - 17
src/components/studio-one-green copy/home.vue

@@ -1,17 +0,0 @@
-<template>
-  <div id="home">
-    <home1 v-if="type == '1'"></home1>
-    <home2 v-else-if="type == '2'"></home2>
-    <home3 v-else-if="type == '3'"></home3>
-  </div>
-</template>
-<script setup lang="ts">
-import { ref } from 'vue';
-import type { Ref } from 'vue';
-import home1 from './home-1.vue';
-import home2 from './home-2.vue';
-import home3 from './home-3.vue';
-let type: Ref<string> = ref('2');
-</script>
-
-<style scoped lang="scss"></style>

+ 0 - 82
src/components/studio-one-green copy/homeParts/header-1.vue

@@ -1,82 +0,0 @@
-<template>
-  <div id="header-1">
-    <el-row>
-      <el-col :span="24" class="main">
-        <el-col :span="8" class="one">
-          <span>欢迎进入</span>
-          <span>{{ webInfo.zhTitle }}</span>
-        </el-col>
-        <el-col :span="16" class="two">
-          <el-button
-            size="small"
-            plain
-            v-for="(item, index) in moduleList"
-            :key="index"
-            @click="modulePath(item)"
-            :class="[active == item.active ? 'active' : '']"
-            >{{ item.name }}</el-button
-          >
-          <el-dropdown @command="toDrop">
-            <el-button type="danger" plain>
-              {{ user && user._id ? user.name || user.unit_name || user.nick_name : '暂无昵称' }}
-              <i class="el-icon-arrow-down el-icon--right"></i>
-            </el-button>
-            <el-dropdown-menu>
-              <el-dropdown-item icon="el-icon-user" command="center">个人中心</el-dropdown-item>
-              <el-dropdown-item icon="el-icon-switch-button" command="logout">退出登录</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref } from 'vue';
-import type { Ref } from 'vue';
-import { studio_style_Info } from '../../../layout/site';
-// import { studio_style_Info } from '@common/src/layout/site';
-let webInfo = studio_style_Info.webInfo;
-let active: 3;
-let moduleList: Ref<any[]> = ref([]);
-let user: Ref<{ _id: string; name: string; unit_name: string; nick_name: string }> = ref({ _id: '', name: '', unit_name: '', nick_name: '' });
-const toDrop = () => {};
-const modulePath = (value: any) => {
-  // console.log(value);
-};
-</script>
-
-<style lang="scss" scoped>
-.main {
-  display: flex;
-  flex-direction: row;
-  .one {
-    text-align: left;
-    margin: 1vw 0;
-
-    span {
-      font-weight: bold;
-      font-size: 20px;
-    }
-    span:nth-child(1) {
-      color: #ff0000;
-      font-size: 25px;
-      padding: 0 5px 0 0;
-    }
-  }
-  .two {
-    text-align: right;
-    margin: 0.8vw 0;
-    button {
-      margin: 0 0 0 10px;
-    }
-    .el-button {
-      margin: 0 0 0 10px;
-    }
-    .active {
-      color: #07c4a8;
-    }
-  }
-}
-</style>

+ 0 - 76
src/components/studio-one-green copy/homeParts/left-1.vue

@@ -1,76 +0,0 @@
-<template>
-  <div class="main">
-    <el-row>
-      <el-col :span="24" class="aside">
-        <el-menu
-          :default-active="onRoutes"
-          unique-opened
-          router
-          :background-color="styleInfo.menus_bg_color"
-          :text-color="styleInfo.menus_txt_color"
-          :active-text-color="styleInfo.menus_actxt_color"
-        >
-          <template v-for="item in items">
-            <template v-if="item.type === '0'">
-              <el-submenu :index="item._id" :key="item._id">
-                <template>
-                  <!-- <i :class="['iconfont', item.icon]"></i> -->
-                  <span>{{ item.name }}</span>
-                </template>
-                <template v-for="subItem in item.children">
-                  <el-submenu v-if="subItem.children && subItem.children.length > 0" :index="subItem._id" :key="subItem._id">
-                    <template>
-                      <i :class="['iconfont', subItem.icon]"></i>
-                      <span>{{ subItem.name }}</span>
-                    </template>
-                    <el-menu-item v-for="(threeItem, i) in subItem.children" :key="i" :index="threeItem.path">
-                      <template>
-                        <i :class="['iconfont', threeItem.icon]"></i>
-                        <span>{{ threeItem.name }}</span>
-                      </template>
-                    </el-menu-item>
-                  </el-submenu>
-                  <el-menu-item v-else :index="subItem.path" :key="subItem.path">
-                    <template>
-                      <i :class="['iconfont', subItem.icon]"></i>
-                      <span>{{ subItem.name }}</span>
-                    </template>
-                  </el-menu-item>
-                </template>
-              </el-submenu>
-            </template>
-            <template v-else>
-              <el-menu-item :index="item.path" :key="item.path">
-                <i :class="['iconfont', item.icon]"></i>
-                <span>{{ item.name }}</span>
-              </el-menu-item>
-            </template>
-          </template>
-        </el-menu>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref } from 'vue';
-import type { Ref } from 'vue';
-import { project_module_menus,studio_style_Info } from '../../../layout/site';
-
-// 请求列表
-let items: Ref<any[]> = ref([]);
-items.value = project_module_menus;
-let styleInfo=studio_style_Info
-const onRoutes = () => {};
-</script>
-
-<style scoped>
-.el-menu-item.is-active {
-  background-color: #65cd94 !important;
-}
-.el-menu-item:focus,
-.el-menu-item:hover {
-  background-color: #65cd94 !important;
-  color: #ffffff !important;
-}
-</style>

+ 0 - 74
src/components/studio-one-green copy/parts/header-1.vue

@@ -1,74 +0,0 @@
-<template>
-  <div id="header-1">
-    <el-row>
-      <el-col :span="24" class="main">
-        <el-col :span="8" class="one">
-          <span>{{ siteInfo.zhTitle }}</span>
-        </el-col>
-        <el-col :span="16" class="two">
-          <el-button
-            size="small"
-            plain
-            v-for="(item, index) in moduleList"
-            :key="index"
-            @click="modulePath(item)"
-            :class="[active == item.active ? 'active' : '']"
-            >{{ item.name }}</el-button
-          >
-          <el-dropdown @command="toDrop">
-            <el-button type="danger" plain>
-              {{ user && user._id ? user.name || user.unit_name || user.nick_name : '暂无昵称' }}
-              <i class="el-icon-arrow-down el-icon--right"></i>
-            </el-button>
-            <el-dropdown-menu>
-              <el-dropdown-item icon="el-icon-user" command="center">个人中心</el-dropdown-item>
-              <el-dropdown-item icon="el-icon-switch-button" command="logout">退出登录</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref } from 'vue';
-import type { Ref } from 'vue';
-import { studio_style_Info } from '../../../layout/site';
-// import { studio_style_Info } from '@common/src/layout/site';
-let siteInfo = studio_style_Info.webInfo;
-let active: 3;
-let moduleList: Ref<any[]> = ref([]);
-let user: Ref<{ _id: string; name: string; unit_name: string; nick_name: string }> = ref({ _id: '', name: '', unit_name: '', nick_name: '' });
-const toDrop = () => {};
-const modulePath = (value: any) => {
-  // console.log(value);
-};
-</script>
-
-<style lang="scss" scoped>
-.main {
-  display: flex;
-  flex-direction: row;
-  .one {
-    span {
-      display: inline-block;
-      background-color: #ffc000;
-      padding: 8px 10px;
-      border: 1px solid #ffffff;
-    }
-  }
-  .two {
-    text-align: right;
-    button {
-      margin: 0 0 0 10px;
-    }
-    .el-button {
-      margin: 0 0 0 10px;
-    }
-    .active {
-      color: #07c4a8;
-    }
-  }
-}
-</style>

+ 0 - 76
src/components/studio-one-green copy/parts/left-1.vue

@@ -1,76 +0,0 @@
-<template>
-  <div class="main">
-    <el-row>
-      <el-col :span="24" class="aside">
-        <el-menu
-          :default-active="onRoutes"
-          unique-opened
-          router
-          :background-color="styleInfo.menus_bg_color"
-          :text-color="styleInfo.menus_txt_color"
-          :active-text-color="styleInfo.menus_actxt_color"
-        >
-          <template v-for="item in items">
-            <template v-if="item.type === '0'">
-              <el-submenu :index="item._id" :key="item._id">
-                <template>
-                  <i :class="['iconfont', item.icon]"></i>
-                  <span>{{ item.name }}</span>
-                </template>
-                <template v-for="subItem in item.children">
-                  <el-submenu v-if="subItem.children && subItem.children.length > 0" :index="subItem._id" :key="subItem._id">
-                    <template>
-                      <i :class="['iconfont', subItem.icon]"></i>
-                      <span>{{ subItem.name }}</span>
-                    </template>
-                    <el-menu-item v-for="(threeItem, i) in subItem.children" :key="i" :index="threeItem.path">
-                      <template>
-                        <i :class="['iconfont', threeItem.icon]"></i>
-                        <span>{{ threeItem.name }}</span>
-                      </template>
-                    </el-menu-item>
-                  </el-submenu>
-                  <el-menu-item v-else :index="subItem.path" :key="subItem.path">
-                    <template>
-                      <i :class="['iconfont', subItem.icon]"></i>
-                      <span>{{ subItem.name }}</span>
-                    </template>
-                  </el-menu-item>
-                </template>
-              </el-submenu>
-            </template>
-            <template v-else>
-              <el-menu-item :index="item.path" :key="item.path">
-                <i :class="['iconfont', item.icon]"></i>
-                <span>{{ item.name }}</span>
-              </el-menu-item>
-            </template>
-          </template>
-        </el-menu>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref } from 'vue';
-import type { Ref } from 'vue';
-import { project_module_menus, studio_style_Info } from '../../../layout/site';
-
-// 请求列表
-let items: Ref<any[]> = ref([]);
-items.value = project_module_menus;
-let styleInfo = studio_style_Info;
-const onRoutes = () => {};
-</script>
-
-<style scoped>
-.el-menu-item.is-active {
-  background-color: #65cd94 !important;
-}
-.el-menu-item:focus,
-.el-menu-item:hover {
-  background-color: #65cd94 !important;
-  color: #ffffff !important;
-}
-</style>

+ 0 - 8
src/components/studio-one-green/home-3.vue

@@ -1,8 +0,0 @@
-<template>
-  <div id="home-3">
-    <router-view></router-view>
-  </div>
-</template>
-<script setup lang="ts"></script>
-
-<style scoped lang="scss"></style>

+ 1 - 4
src/components/studio-one-green/home.vue

@@ -2,24 +2,21 @@
   <div id="home">
     <home1 v-if="type == '1'"></home1>
     <home2 v-else-if="type == '2'"></home2>
-    <home3 v-else-if="type == '3'"></home3>
   </div>
 </template>
 
 <script setup lang="ts">
 // 组件
-
 import store from '@/stores/counter';
 import home1 from './home-1.vue';
 import home2 from './home-2.vue';
-import home3 from './home-3.vue';
 import type { Ref } from 'vue';
 import { ref, onMounted } from 'vue';
 import { ElMessage } from 'element-plus';
 
 // 接口
 import { ModuleStore } from '@common/src/stores/admin/module'; //模块
-import { RoleStore } from '@common/src/stores/admin/role'; //模块
+import { RoleStore } from '@common/src/stores/admin/role'; //角色
 import type { IQueryResult } from '@/util/types.util'; //
 const module = ModuleStore();
 const role = RoleStore();

+ 15 - 9
src/components/studio-one-green/homeParts1/header-1.vue

@@ -7,9 +7,14 @@
           <span>{{ webInfo.zhTitle }}</span>
         </el-col>
         <el-col :span="16" class="two">
-          <el-button plain v-for="(item, index) in moduleList" :key="index" @click="modulePath(item)" :class="[active == item.active ? 'active' : '']">{{
-            item.name
-          }}</el-button>
+          <el-button
+            plain
+            v-for="(item, index) in moduleList"
+            :key="index"
+            @click="modulePath(item)"
+            :class="[active == item.active ? 'active two_1' : 'two_1']"
+            >{{ item.name }}</el-button
+          >
           <el-dropdown @command="toDrop">
             <el-button type="danger" plain size="large">
               {{ user && user._id ? user.name || user.unit_name || user.nick_name : '暂无昵称' }}
@@ -29,13 +34,14 @@
 </template>
 
 <script setup lang="ts">
+import { studio_style_Info, project_module_menus } from '../../../layout/site';
+import type { Ref } from 'vue';
+import { ref, onMounted } from 'vue';
 import { useRouter } from 'vue-router';
-import { ArrowDown, User, SwitchButton } from '@element-plus/icons-vue';
 import store from '@/stores/counter';
-import { ref, onMounted } from 'vue';
-import type { Ref } from 'vue';
-import { studio_style_Info, project_module_menus } from '../../../layout/site';
+import { ArrowDown, User, SwitchButton } from '@element-plus/icons-vue';
 const router = useRouter();
+
 let webInfo = studio_style_Info.webInfo;
 let active: Ref<number> = ref(3);
 let moduleList: Ref<any[]> = ref([]);
@@ -94,8 +100,8 @@ const search = () => {
     button {
       margin: 0 0 0 10px;
     }
-    .el-button {
-      margin: 0 0 0 10px;
+    .two_1 {
+      margin: 5px 0 0 10px;
     }
   }
 }

+ 14 - 5
tsconfig.json

@@ -1,17 +1,26 @@
 {
   "extends": "@vue/tsconfig/tsconfig.web.json",
-  "include": ["env.d.ts", "src/**/*", "src/**/*.vue"],
+  "include": [
+    "env.d.ts",
+    "src/**/*",
+    "src/**/*.vue"
+  ],
   "compilerOptions": {
-    "types": ["node"],
+    "types": [
+      "node"
+    ],
     "baseUrl": ".",
     "paths": {
-      "@/*": ["./src/*"]
+      "@/*": [
+        "./src/*"
+      ],
+      "@common/*": [
+        "../common/*"
+      ]
     },
     "isolatedModules": false,
-
     "suppressImplicitAnyIndexErrors": true
   },
-
   "references": [
     {
       "path": "./tsconfig.node.json"

+ 4 - 1
vite.config.ts

@@ -1,7 +1,10 @@
 import { defineConfig } from 'vite';
 import vue from '@vitejs/plugin-vue';
+
 export default defineConfig({
   plugins: [vue()],
   server: {},
-  resolve: {},
+  resolve: {
+    alias: {},
+  },
 });