Home Explore Help
Sign In
wangtao
/
premier
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

优化调整

wangtao 3 years ago
parent
c07ac743f9
commit
dbc9afcf9f
66 changed files with 237 additions and 7307 deletions
Split View Show Diff Stats
  1. 1 1
      .env.development
  2. 1 1
      .env.production
  3. 3 3
      index.html
  4. 0 0
      public/assets/logo/logo.png
  5. 0 0
      public/assets/svg/energy0.svg
  6. 0 0
      public/assets/svg/energy1.svg
  7. 0 0
      public/assets/svg/energy2.svg
  8. 0 0
      public/assets/svg/energy3.svg
  9. 0 0
      public/assets/svg/ss.svg
  10. 0 0
      public/assets/svg/sst.svg
  11. 0 0
      public/assets/svg/xg.svg
  12. 0 0
      public/assets/svg/xj.svg
  13. 0 2
      public/assets/svg/上升.svg
  14. 0 2
      public/assets/svg/下降.svg
  15. 0 2
      public/assets/svg/闪电.svg
  16. BIN
      src/assets/font/DINAlternate-bold.otf
  17. 0 17
      src/assets/font/font.css
  18. BIN
      src/assets/font/微软vista雅黑.ttf
  19. BIN
      src/assets/font/微软vista雅黑Bold.ttf
  20. 0 1
      src/assets/svg/多云.svg
  21. 0 32
      src/components/business/access/people.vue
  22. 2 5
      src/components/business/access/pie.vue
  23. 4 4
      src/components/business/energy/index.vue
  24. 3 7
      src/components/business/keepWatch/index.vue
  25. 3 3
      src/components/business/keepWatch/pie.vue
  26. 0 4
      src/components/business/keepWatch1/index.vue
  27. 6 12
      src/components/business/seHeader/index.vue
  28. 1 3
      src/components/business/security/index.vue
  29. 3 3
      src/components/business/security/pie.vue
  30. 1 1
      src/main.js
  31. 2 2
      src/permission.js
  32. 8 2
      src/router/index.js
  33. 8 8
      src/utils/auth.js
  34. 0 0
      src/views/components/energy/index.vue
  35. 0 82
      src/views/error/401.vue
  36. 0 227
      src/views/error/404.vue
  37. 191 9
      src/views/index.vue
  38. 0 503
      src/views/monitor/job/index.vue
  39. 0 282
      src/views/monitor/job/log.vue
  40. 0 105
      src/views/monitor/online/index.vue
  41. 0 14
      src/views/redirect/index.vue
  42. 0 218
      src/views/register.vue
  43. 0 315
      src/views/system/config/index.vue
  44. 0 289
      src/views/system/dept/index.vue
  45. 0 355
      src/views/system/dict/data.vue
  46. 0 320
      src/views/system/dict/index.vue
  47. 0 197
      src/views/system/logininfor/index.vue
  48. 0 451
      src/views/system/menu/index.vue
  49. 0 296
      src/views/system/notice/index.vue
  50. 0 286
      src/views/system/operlog/index.vue
  51. 0 285
      src/views/system/post/index.vue
  52. 0 177
      src/views/system/role/authUser.vue
  53. 0 580
      src/views/system/role/index.vue
  54. 0 138
      src/views/system/role/selectUser.vue
  55. 0 112
      src/views/system/user/authRole.vue
  56. 0 636
      src/views/system/user/index.vue
  57. 0 87
      src/views/system/user/profile/index.vue
  58. 0 57
      src/views/system/user/profile/resetPwd.vue
  59. 0 161
      src/views/system/user/profile/userAvatar.vue
  60. 0 56
      src/views/system/user/profile/userInfo.vue
  61. 0 3
      src/views/tool/build/index.vue
  62. 0 48
      src/views/tool/gen/basicInfoForm.vue
  63. 0 198
      src/views/tool/gen/editTable.vue
  64. 0 281
      src/views/tool/gen/genInfoForm.vue
  65. 0 118
      src/views/tool/gen/importTable.vue
  66. 0 306
      src/views/tool/gen/index.vue

+ 1 - 1
.env.development
View File 

@@ -1,5 +1,5 @@
 
 # 页面标题
 
-VITE_APP_TITLE = "派米雷.佘山智地智慧园区"
 
+VITE_APP_TITLE = "派米雷·佘山智地智慧园区"
 
 
 # 开发环境配置
 
 VITE_APP_ENV = 'development'

+ 1 - 1
.env.production
View File 

@@ -1,5 +1,5 @@
 
 # 页面标题
 
-VITE_APP_TITLE = "派米雷.佘山智地智慧园区"
 
+VITE_APP_TITLE = "派米雷·佘山智地智慧园区"
 
 
 # 生产环境配置
 
 VITE_APP_ENV = 'production'

+ 3 - 3
index.html
View File 

@@ -7,7 +7,7 @@
 
     <meta name="renderer" content="webkit">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
     <link rel="icon" href="/favicon.ico">
 
-    <title>派米雷智慧楼宇</title>
 
+    <title>派米雷·佘山智地智慧园区</title>
 
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 
     <style>
 
         html,
 
@@ -197,12 +197,12 @@
 
 
 <body>
 
     <div id="app">
 
-        <div id="loader-wrapper">
 
+        <!-- <div id="loader-wrapper">
 
             <div id="loader"></div>
 
             <div class="loader-section section-left"></div>
 
             <div class="loader-section section-right"></div>
 
             <div class="load_title">正在加载系统资源，请耐心等待</div>
 
-        </div>
 
+        </div> -->
 
     </div>
 
     <script type="module" src="/src/main.js"></script>
 
 </body>

+ 0 - 0
src/assets/logo/logo.png → public/assets/logo/logo.png
View File


+ 0 - 0
src/assets/svg/energy0.svg → public/assets/svg/energy0.svg
View File


+ 0 - 0
src/assets/svg/energy1.svg → public/assets/svg/energy1.svg
View File


+ 0 - 0
src/assets/svg/energy2.svg → public/assets/svg/energy2.svg
View File


+ 0 - 0
src/assets/svg/energy3.svg → public/assets/svg/energy3.svg
View File


+ 0 - 0
src/assets/svg/ss.svg → public/assets/svg/ss.svg
View File


+ 0 - 0
src/assets/svg/sst.svg → public/assets/svg/sst.svg
View File


+ 0 - 0
src/assets/svg/xg.svg → public/assets/svg/xg.svg
View File


+ 0 - 0
src/assets/svg/xj.svg → public/assets/svg/xj.svg
View File


+ 0 - 2
public/assets/svg/上升.svg
View File 

@@ -1,2 +0,0 @@
 
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1658133471876" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3563" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
 
-</style></defs><path d="M698.7 480.9v429.5c0 54.8-44.5 99.3-99.3 99.3H434c-54.8 0-99.3-44.5-99.3-99.3V480.9H70l446.9-463 446.9 463H698.7z m0 0" fill="" p-id="3564"></path></svg>

+ 0 - 2
public/assets/svg/下降.svg
View File 

@@ -1,2 +0,0 @@
 
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1658133457351" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2561" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
 
-</style></defs><path d="M335 546.6V117.1c0-54.8 44.5-99.3 99.3-99.3h165.4c54.8 0 99.3 44.5 99.3 99.3v429.5h264.7l-446.9 463L70 546.6h265z m0 0" fill="" p-id="2562"></path></svg>

+ 0 - 2
public/assets/svg/闪电.svg
View File 

@@ -1,2 +0,0 @@
 
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1658133432279" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1560" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
 
-</style></defs><path d="M395.765333 586.570667h-171.733333c-22.421333 0-37.888-22.442667-29.909333-43.381334L364.768 95.274667A32 32 0 0 1 394.666667 74.666667h287.957333c22.72 0 38.208 23.018667 29.632 44.064l-99.36 243.882666h187.050667c27.509333 0 42.186667 32.426667 24.042666 53.098667l-458.602666 522.56c-22.293333 25.408-63.626667 3.392-54.976-29.28l85.354666-322.421333z" p-id="1561"></path></svg>

BIN
src/assets/font/DINAlternate-bold.otf
View File


+ 0 - 17
src/assets/font/font.css
View File 

@@ -1,17 +0,0 @@
 
- /* 这是 font.css 可设置多种字体；
 
- 注意：font-family: 'XXX'; 将字体名字自定义为 XXX,使用时要用这个名字 */
 
- 
- @font-face {
 
-     font-family: 'MicrosoftYaHei';
 
-     src: url('./微软vista雅黑.ttf');
 
- }
 
- 
- @font-face {
 
-     font-family: 'MicrosoftYaHei-Bold';
 
-     src: url('./微软vista雅黑Bold.ttf');
 
- }
 
- 
- @font-face {
 
-     font-family: 'DINAlternate-Bold';
 
-     src: url('./DINAlternate-bold.otf');
 
- }

BIN
src/assets/font/微软vista雅黑.ttf
View File


BIN
src/assets/font/微软vista雅黑Bold.ttf
View File


File diff suppressed because it is too large
+ 0 - 1
src/assets/svg/多云.svg


+ 0 - 32
src/components/business/access/people.vue
View File 

@@ -28,38 +28,6 @@
 
                </el-col>
 
             </el-col>
 
          </el-col>
 
-         <!-- <el-col class="itemWrap" :span="12">
 
-            <el-col class="item" :span="24">
 
-               <el-col class="left" :span="2">
 
-                 <el-col class="typeTitle" :span="24" style="margin-left:0px">
 
-                  车辆通行
 
-                  </el-col>
 
-               </el-col>
 
-                <el-col class="right" :span="22" >
 
-                  <el-col class="right_top" :span="24">
 
-                     <el-col class="right_left" :span="7" >
 
-                        <el-col class="right_left_top" :span="24">
 
-                           2332辆/次
 
-                        </el-col>
 
-                        <el-col class="right_left_bottom" :span="24">
 
-                           今日车流量
 
-                        </el-col>
 
-                     </el-col>
 
-                     <el-col class="right_right" :span="14">
 
-                        <el-col class="right_right_top" :span="24">
 
-                           地下停车场车流量：287辆/次
 
-                        </el-col>
 
-                        <el-col class="right_right_bottom" :span="24">
 
-                           地面停车场车流量：287辆/次
 
-                        </el-col>
 
-                     </el-col>
 
-                  </el-col>
 
-                  <el-col class="right_bottom" :span="24">
 
-                     <pie2 alt="车辆通行"/>
 
-                  </el-col>
 
-               </el-col>
 
-            </el-col>
 
-         </el-col> -->
 
  </el-col>
 
 </template>

+ 2 - 5
src/components/business/access/pie.vue
View File 

@@ -66,11 +66,8 @@ export default {
 
           data: this.resData[2],
 
           axisLabel: {
 
             color: color,
 
-          },
 
-          axisLine: {
 
-            lineStyle: {
 
-              color: color2,
 
-            },
 
+            interval:0,
 
+            rotate:10,
 
           },
 
           axisTick: {
 
             show: false,

+ 4 - 4
src/components/business/energy/index.vue
View File 

@@ -5,7 +5,7 @@
 
          <el-col class="itemWrap" :span="12" v-for="(item , index) in list" :key="index">
 
             <el-col class="item" :span="12" >
 
                <el-col class="img" :span="8">
 
-                  <el-image :src="`src/assets/svg/energy${index}.svg`"  class="img" v-if="loading"> </el-image>
 
+                  <el-image :src="`/assets/svg/energy${index}.svg`"  class="img" v-if="loading"> </el-image>
 
                </el-col>
 
                <el-col class="attribute" :span="16">
 
                   <el-col class="name">{{item.name1}}</el-col>
 
@@ -14,13 +14,13 @@
 
             </el-col>
 
             <el-col class="item" :span="12">
 
                <el-col class="img" :span="8">
 
-                  <el-image :src="`src/assets/svg/energy${index}.svg`"  class="img" v-if="loading"> </el-image>
 
+                  <el-image :src="`/assets/svg/energy${index}.svg`"  class="img" v-if="loading"> </el-image>
 
                </el-col>
 
                <el-col class="attribute" :span="16">
 
                   <el-col class="name">{{item.name2}}</el-col>
 
                   <el-col class="value" v-if="loading">{{Math.abs(item.compare)}}%
 
-                     <el-image :src="`src/assets/svg/xj.svg`"  class="compare fill1" v-if="item.compare < 0 "  />
 
-                     <el-image :src="`src/assets/svg/ss.svg`"  class="compare fill2" v-if="item.compare >= 0" />
 
+                     <el-image :src="`/assets/svg/xj.svg`"  class="compare fill1" v-if="item.compare < 0 "  />
 
+                     <el-image :src="`/assets/svg/ss.svg`"  class="compare fill2" v-if="item.compare >= 0" />
 
                   </el-col>
 
                </el-col>
 
             </el-col>

+ 3 - 7
src/components/business/keepWatch/index.vue
View File 

@@ -5,7 +5,7 @@
 
             <el-col class="item2Wrap" :span="8">
 
                 <el-col class="item2" :span="24" v-for="item in list[0]" :key="item.index">
 
                   <el-col class="img" :span="8">
 
-                     <el-image :src="`src/assets/svg/xg.svg`"  class="img" v-if="loading"> </el-image>
 
+                     <el-image :src="`/assets/svg/xg.svg`"  class="img" v-if="loading"> </el-image>
 
                   </el-col>
 
                   <el-col class="attribute" :span="16">
 
                      <el-col class="name">{{item.num}}个</el-col>
 
@@ -49,10 +49,10 @@ import pie from "@/components/business/keepWatch/pie";
 
             padding:0px 0;
 
             .typeTitle{
 
                width:100%;
 
-               text-align: center !important;
 
+               text-align: center;
 
                font-size: 14px;
 
                display: block;
 
-               margin-top:-20px;
 
+               margin:-20px 0 0 16px;
 
             }
 
          }
 
          .itemB{
 
@@ -131,9 +131,5 @@ import pie from "@/components/business/keepWatch/pie";
 
             margin-bottom:10px;
 
          }
 
       }
 
-
 
 }
 
-
 
-
 
-
 
 </style>

+ 3 - 3
src/components/business/keepWatch/pie.vue
View File 

@@ -2,7 +2,7 @@
 
   <el-row >
 
     <div
 
       id="xg"
 
-      style="width:15700px;height:280px;margin:-40px 0 0 50px"
 
+      style="width:570px;height:280px;margin:-70px 0 0 40px"
 
     ></div>
 
   </el-row>
 
 </template>
 
@@ -49,8 +49,8 @@ export default {
 
           trigger: 'item'
 
         },
 
         legend: {
 
-          top: '18%',
 
-          left: '11%',
 
+          top: '73%',
 
+          left: 'center',
 
           // orient: 'vertical',
 
           textStyle: {
 
             color: "#FFF",

+ 0 - 4
src/components/business/keepWatch1/index.vue
View File 

@@ -106,9 +106,5 @@ const list = props.resData
 
             margin-bottom:10px;
 
          }
 
       }
 
-
 
 }
 
-
 
-
 
-
 
 </style>

+ 6 - 12
src/components/business/seHeader/index.vue
View File 

@@ -1,20 +1,19 @@
 
 <template>
 
   <el-row
 
     class="top"
 
-    v-loading="loading"
 
     element-loading-background="rgba(28,33,41,1)"
 
   >
 
     <el-col :span="6">
 
       <el-col :span="24" class="time">{{ date }}</el-col>
 
     </el-col>
 
     <el-col :span="12">
 
-      <el-col :span="24" class="title">派米雷.佘山智地智慧园区</el-col>
 
+      <el-col :span="24" class="title">派米雷·佘山智地智慧园区</el-col>
 
     </el-col>
 
     <el-col :span="6">
 
       <el-col :span="24" class="logo">
 
-        <el-image :src="`src/assets/logo/logo.png`" fit="scale-down"> </el-image>
 
+        <el-image :src="`/assets/logo/logo.png`" fit="scale-down"> </el-image>
 
       </el-col>
 
-      <el-col :span="24" class="weather" >
 
+      <el-col :span="24" class="weather" v-if="tq">
 
         <el-col :span="24" class="wd">
 
           {{ tq }} 
         </el-col>
 
@@ -25,7 +24,7 @@
 
           温度：{{ temperature }} ℃
 
         </el-col>
 
         <el-col :span="24" class="sd">
 
-          湿度：{{ sd }}RH
 
+          湿度：{{ sd }}
 
         </el-col>
 
         <!-- <el-col :span="24" class="sd">
 
           pm2.5：{{weath}}ug/m3
 
@@ -36,7 +35,6 @@
 
 </template>
 
 <script setup>
 
 import axios from 'axios'
 
-const loading = ref(true);
 
 const sd = ref(null)
 
 const weather_pic = ref(null)
 
 const temperature = ref(null)
 
@@ -54,9 +52,6 @@ function timeRun(){
 
     date.value = year + month + day + ' ' + s + ":" + f + ":" + m
 
   })
 
 }
 
-setTimeout(()=>{
 
-  loading.value = false
 
-},1000)
 
 timeRun()
 
 
 function weather(){
 
@@ -76,8 +71,6 @@ weather()
 
 setTimeout(()=>{
 
   weather()
 
 },1000 * 60 * 30)
 
-
 
-
 
 </script>
 
 <style lang="scss" scoped>
 
 @import "@/assets/styles/common.scss";
 
@@ -98,7 +91,7 @@ setTimeout(()=>{
 
     }
 
     .title {
 
       width:100%;
 
-      font-size: 35px;
 
+      font-size: 28px;
 
       font-weight: 700;
 
       letter-spacing: 2.22px;
 
       text-align: center;
 
@@ -114,6 +107,7 @@ setTimeout(()=>{
 
       margin-top:5px;
 
     }
 
     .weather{
 
+      margin-left:30%;
 
       .tq{
 
         width:25px;
 
         vertical-align: middle;

+ 1 - 3
src/components/business/security/index.vue
View File 

@@ -13,7 +13,7 @@
 
             <el-col class="item2Wrap" :span="8">
 
                <el-col class="item2" :span="24" v-for="item in list[0]" :key="item.index">
 
                   <el-col class="img" :span="8">
 
-                     <el-image :src="`src/assets/svg/sst.svg`"  class="img" v-if="loading"> </el-image>
 
+                     <el-image :src="`/assets/svg/sst.svg`"  class="img" v-if="loading"> </el-image>
 
                   </el-col>
 
                   <el-col class="attribute" :span="14">
 
                      <el-col class="name">{{item.name}}</el-col>
 
@@ -52,7 +52,6 @@ setTimeout(()=>{
 
                text-align: center !important;
 
                font-size: 16px;
 
                display: block;
 
-               
             }
 
          }
 
          .item2Wrap{
 
@@ -73,7 +72,6 @@ setTimeout(()=>{
 
                   left: -80px;
 
                   filter: drop-shadow(#ffffff 80px 0); //设置颜色，并将阴影偏移至未溢出区域
 
                   -webkit-filter: drop-shadow(#fff 80px 0);
 
-                  
                }
 
                .attribute{
 
                   vertical-align: middle;

+ 3 - 3
src/components/business/security/pie.vue
View File 

@@ -2,7 +2,7 @@
 
   <el-row >
 
     <div
 
       id="af"
 
-      style="width:800px;height:300px;margin-top:-40px"
 
+      style="width:800px;height:300px;margin-top:-60px"
 
     ></div>
 
   </el-row>
 
 </template>
 
@@ -50,8 +50,8 @@ export default {
 
           trigger: 'item'
 
         },
 
         legend: {
 
-          top: '18%',
 
-          left: '18.5%',
 
+          top: '75%',
 
+          left: 'center',
 
           itemGap: 10,
 
           // orient: 'vertical',
 
           textStyle: {

+ 1 - 1
src/main.js
View File 

@@ -5,7 +5,7 @@ import Cookies from 'js-cookie'
 
 import ElementPlus from 'element-plus'
 
 import locale from 'element-plus/lib/locale/lang/zh-cn' // 中文语言
 
 import '@/assets/styles/common.scss'
 
-import '@/assets/font/font.css';
 
+// import '@/assets/font/font.css';
 
 // import './assets/styles/element-variables.scss'
 
 import '@/assets/styles/index.scss' // global css

+ 2 - 2
src/permission.js
View File 

@@ -11,7 +11,7 @@ import usePermissionStore from '@/store/modules/permission'
 
 
 NProgress.configure({ showSpinner: false });
 
 
-const whiteList = ['/login', '/index', '', '/auth-redirect', '/bind', '/register'];
 
+const whiteList = ['/login', '/index', '/', '/auth-redirect', '/bind', '/register'];
 
 
 router.beforeEach((to, from, next) => {
 
     NProgress.start()
 
@@ -53,7 +53,7 @@ router.beforeEach((to, from, next) => {
 
             // next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
 
             next()
 
         } else {
 
-            next(`/index`) // 否则全部重定向到登录页
 
+            next(`/`) // 否则全部重定向到登录页
 
             NProgress.done()
 
         }
 
     }

+ 8 - 2
src/router/index.js
View File 

@@ -59,18 +59,24 @@ export const constantRoutes = [{
 
         hidden: true
 
     },
 
     {
 
-        path: '/',
 
+        path: '',
 
         component: () =>
 
             import ('@/views/index'),
 
         hidden: true
 
     },
 
     {
 
-        path: '/index',
 
+        path: '/',
 
         component: () =>
 
             import ('@/views/index'),
 
         hidden: true
 
     },
 
     // {
 
+    //     path: '/index',
 
+    //     component: () =>
 
+    //         import ('@/views/index'),
 
+    //     hidden: true
 
+    // },
 
+    // {
 
     //     path: '',
 
     //     component: Layout,
 
     //     redirect: '/index',

+ 8 - 8
src/utils/auth.js
View File 

@@ -1,29 +1,29 @@
 
 import Cookies from 'js-cookie'
 
 
-const TokenKey = 'Admin-Token'
 
+const TokenKey = 'Admin-Token-PMLDP'
 
 
 const ExpiresInKey = 'Admin-Expires-In'
 
 
 export function getToken() {
 
-  return Cookies.get(TokenKey)
 
+    return Cookies.get(TokenKey)
 
 }
 
 
 export function setToken(token) {
 
-  return Cookies.set(TokenKey, token)
 
+    return Cookies.set(TokenKey, token)
 
 }
 
 
 export function removeToken() {
 
-  return Cookies.remove(TokenKey)
 
+    return Cookies.remove(TokenKey)
 
 }
 
 
 export function getExpiresIn() {
 
-  return Cookies.get(ExpiresInKey) || -1
 
+    return Cookies.get(ExpiresInKey) || -1
 
 }
 
 
 export function setExpiresIn(time) {
 
-  return Cookies.set(ExpiresInKey, time)
 
+    return Cookies.set(ExpiresInKey, time)
 
 }
 
 
 export function removeExpiresIn() {
 
-  return Cookies.remove(ExpiresInKey)
 
-}
 
+    return Cookies.remove(ExpiresInKey)
 
+}

+ 0 - 0
src/views/components/energy/index.vue
View File


+ 0 - 82
src/views/error/401.vue
View File 

@@ -1,82 +0,0 @@
 
-<template>
 
-  <div class="errPage-container">
 
-    <el-button icon="arrow-left" class="pan-back-btn" @click="back">
 
-      返回
 
-    </el-button>
 
-    <el-row>
 
-      <el-col :span="12">
 
-        <h1 class="text-jumbo text-ginormous">
 
-          401错误!
 
-        </h1>
 
-        <h2>您没有访问权限！</h2>
 
-        <h6>对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面</h6>
 
-        <ul class="list-unstyled">
 
-          <li class="link-type">
 
-            <router-link to="/">
 
-              回首页
 
-            </router-link>
 
-          </li>
 
-        </ul>
 
-      </el-col>
 
-      <el-col :span="12">
 
-        <img :src="errGif" width="313" height="428" alt="Girl has dropped her ice cream.">
 
-      </el-col>
 
-    </el-row>
 
-  </div>
 
-</template>
 
-
 
-<script setup>
 
-import errImage from "@/assets/401_images/401.gif";
 
-
 
-let { proxy } = getCurrentInstance();
 
-
 
-const errGif = ref(errImage + "?" + +new Date());
 
-
 
-function back() {
 
-  if (proxy.$route.query.noGoBack) {
 
-    proxy.$router.push({ path: "/" });
 
-  } else {
 
-    proxy.$router.go(-1);
 
-  }
 
-}
 
-</script>
 
-
 
-<style lang="scss" scoped>
 
-.errPage-container {
 
-  width: 800px;
 
-  max-width: 100%;
 
-  margin: 100px auto;
 
-  .pan-back-btn {
 
-    background: #008489;
 
-    color: #fff;
 
-    border: none !important;
 
-  }
 
-  .pan-gif {
 
-    margin: 0 auto;
 
-    display: block;
 
-  }
 
-  .pan-img {
 
-    display: block;
 
-    margin: 0 auto;
 
-    width: 100%;
 
-  }
 
-  .text-jumbo {
 
-    font-size: 60px;
 
-    font-weight: 700;
 
-    color: #484848;
 
-  }
 
-  .list-unstyled {
 
-    font-size: 14px;
 
-    li {
 
-      padding-bottom: 5px;
 
-    }
 
-    a {
 
-      color: #008489;
 
-      text-decoration: none;
 
-      &:hover {
 
-        text-decoration: underline;
 
-      }
 
-    }
 
-  }
 
-}
 
-</style>

+ 0 - 227
src/views/error/404.vue
View File 

@@ -1,227 +0,0 @@
 
-<template>
 
-  <div class="wscn-http404-container">
 
-    <div class="wscn-http404">
 
-      <div class="pic-404">
 
-        <img class="pic-404__parent" src="@/assets/404_images/404.png" alt="404">
 
-        <img class="pic-404__child left" src="@/assets/404_images/404_cloud.png" alt="404">
 
-        <img class="pic-404__child mid" src="@/assets/404_images/404_cloud.png" alt="404">
 
-        <img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
 
-      </div>
 
-      <div class="bullshit">
 
-        <div class="bullshit__oops">
 
-          404错误!
 
-        </div>
 
-        <div class="bullshit__headline">
 
-          {{ message }}
 
-        </div>
 
-        <div class="bullshit__info">
 
-          对不起，您正在寻找的页面不存在。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。
 
-        </div>
 
-        <router-link to="/index" class="bullshit__return-home">
 
-          返回首页
 
-        </router-link>
 
-      </div>
 
-    </div>
 
-  </div>
 
-</template>
 
-
 
-<script setup>
 
-let message = computed(() => {
 
-  return '找不到网页！'
 
-})
 
-</script>
 
-
 
-<style lang="scss" scoped>
 
-.wscn-http404-container{
 
-  transform: translate(-50%,-50%);
 
-  position: absolute;
 
-  top: 40%;
 
-  left: 50%;
 
-}
 
-.wscn-http404 {
 
-  position: relative;
 
-  width: 1200px;
 
-  padding: 0 50px;
 
-  overflow: hidden;
 
-  .pic-404 {
 
-    position: relative;
 
-    float: left;
 
-    width: 600px;
 
-    overflow: hidden;
 
-    &__parent {
 
-      width: 100%;
 
-    }
 
-    &__child {
 
-      position: absolute;
 
-      &.left {
 
-        width: 80px;
 
-        top: 17px;
 
-        left: 220px;
 
-        opacity: 0;
 
-        animation-name: cloudLeft;
 
-        animation-duration: 2s;
 
-        animation-timing-function: linear;
 
-        animation-fill-mode: forwards;
 
-        animation-delay: 1s;
 
-      }
 
-      &.mid {
 
-        width: 46px;
 
-        top: 10px;
 
-        left: 420px;
 
-        opacity: 0;
 
-        animation-name: cloudMid;
 
-        animation-duration: 2s;
 
-        animation-timing-function: linear;
 
-        animation-fill-mode: forwards;
 
-        animation-delay: 1.2s;
 
-      }
 
-      &.right {
 
-        width: 62px;
 
-        top: 100px;
 
-        left: 500px;
 
-        opacity: 0;
 
-        animation-name: cloudRight;
 
-        animation-duration: 2s;
 
-        animation-timing-function: linear;
 
-        animation-fill-mode: forwards;
 
-        animation-delay: 1s;
 
-      }
 
-      @keyframes cloudLeft {
 
-        0% {
 
-          top: 17px;
 
-          left: 220px;
 
-          opacity: 0;
 
-        }
 
-        20% {
 
-          top: 33px;
 
-          left: 188px;
 
-          opacity: 1;
 
-        }
 
-        80% {
 
-          top: 81px;
 
-          left: 92px;
 
-          opacity: 1;
 
-        }
 
-        100% {
 
-          top: 97px;
 
-          left: 60px;
 
-          opacity: 0;
 
-        }
 
-      }
 
-      @keyframes cloudMid {
 
-        0% {
 
-          top: 10px;
 
-          left: 420px;
 
-          opacity: 0;
 
-        }
 
-        20% {
 
-          top: 40px;
 
-          left: 360px;
 
-          opacity: 1;
 
-        }
 
-        70% {
 
-          top: 130px;
 
-          left: 180px;
 
-          opacity: 1;
 
-        }
 
-        100% {
 
-          top: 160px;
 
-          left: 120px;
 
-          opacity: 0;
 
-        }
 
-      }
 
-      @keyframes cloudRight {
 
-        0% {
 
-          top: 100px;
 
-          left: 500px;
 
-          opacity: 0;
 
-        }
 
-        20% {
 
-          top: 120px;
 
-          left: 460px;
 
-          opacity: 1;
 
-        }
 
-        80% {
 
-          top: 180px;
 
-          left: 340px;
 
-          opacity: 1;
 
-        }
 
-        100% {
 
-          top: 200px;
 
-          left: 300px;
 
-          opacity: 0;
 
-        }
 
-      }
 
-    }
 
-  }
 
-  .bullshit {
 
-    position: relative;
 
-    float: left;
 
-    width: 300px;
 
-    padding: 30px 0;
 
-    overflow: hidden;
 
-    &__oops {
 
-      font-size: 32px;
 
-      font-weight: bold;
 
-      line-height: 40px;
 
-      color: #1482f0;
 
-      opacity: 0;
 
-      margin-bottom: 20px;
 
-      animation-name: slideUp;
 
-      animation-duration: 0.5s;
 
-      animation-fill-mode: forwards;
 
-    }
 
-    &__headline {
 
-      font-size: 20px;
 
-      line-height: 24px;
 
-      color: #222;
 
-      font-weight: bold;
 
-      opacity: 0;
 
-      margin-bottom: 10px;
 
-      animation-name: slideUp;
 
-      animation-duration: 0.5s;
 
-      animation-delay: 0.1s;
 
-      animation-fill-mode: forwards;
 
-    }
 
-    &__info {
 
-      font-size: 13px;
 
-      line-height: 21px;
 
-      color: grey;
 
-      opacity: 0;
 
-      margin-bottom: 30px;
 
-      animation-name: slideUp;
 
-      animation-duration: 0.5s;
 
-      animation-delay: 0.2s;
 
-      animation-fill-mode: forwards;
 
-    }
 
-    &__return-home {
 
-      display: block;
 
-      float: left;
 
-      width: 110px;
 
-      height: 36px;
 
-      background: #1482f0;
 
-      border-radius: 100px;
 
-      text-align: center;
 
-      color: #ffffff;
 
-      opacity: 0;
 
-      font-size: 14px;
 
-      line-height: 36px;
 
-      cursor: pointer;
 
-      animation-name: slideUp;
 
-      animation-duration: 0.5s;
 
-      animation-delay: 0.3s;
 
-      animation-fill-mode: forwards;
 
-    }
 
-    @keyframes slideUp {
 
-      0% {
 
-        transform: translateY(60px);
 
-        opacity: 0;
 
-      }
 
-      100% {
 
-        transform: translateY(0);
 
-        opacity: 1;
 
-      }
 
-    }
 
-  }
 
-}
 
-</style>

+ 191 - 9
src/views/index.vue
View File 

@@ -16,7 +16,14 @@
 
           <car :resData="initList[0][5]" alt="车辆通行" />
 
           <keepWatch :resData="initList[0][3]" alt="巡更数据" />
 
         </el-col>
 
+        <div id="loader-wrapper2" v-if="sanwei">
 
+        <div id="loader2"></div>
 
+        <div class="loader-section section-left"></div>
 
+        <div class="loader-section section-right"></div>
 
+        <div class="load_title">三维模型加载中...</div>
 
+      </div>
 
       </el-row>
 
+      
     </div>
 
   </div>
 
 </template>
 
@@ -53,7 +60,7 @@ const data = reactive({
 
         },
 
         {
 
           name1: "当月发热量",
 
-          num: "56511kW‧h",
 
+          num: "5651kW‧h",
 
           name2: "日均用量较上月",
 
           compare: 3,
 
         },
 
@@ -250,13 +257,15 @@ const data = reactive({
 
             name: "楼内人员",
 
             type: "line",
 
             stack: "Total",
 
-            data: [120, 132, 111, 123],
 
+            smooth: true,
 
+            data: [220, 182, 178, 231],
 
           },
 
           {
 
             name: "外部访客",
 
             type: "line",
 
             stack: "Total",
 
-            data: [220, 182, 178, 231],
 
+            smooth: true,
 
+            data: [120, 132, 111, 123],
 
           },
 
         ],
 
         ["01", "02", "03", "04"],
 
@@ -268,13 +277,15 @@ const data = reactive({
 
             name: "地面停车场",
 
             type: "line",
 
             stack: "Total",
 
-            data: [120, 132, 111, 123],
 
+            smooth: true,
 
+            data: [20, 180, 50, 160],
 
           },
 
           {
 
             name: "地下停车场",
 
             type: "line",
 
             stack: "Total",
 
-            data: [220, 182, 178, 231],
 
+            smooth: true,
 
+            data: [15, 30, 150, 20],
 
           },
 
         ],
 
         ["01", "02", "03", "04"],
 
@@ -284,8 +295,9 @@ const data = reactive({
 
 });
 
 
 const { initList } = toRefs(data);
 
-
 
+const sanwei = ref(true)
 
 setTimeout(() => {
 
+  sanwei.value = false
 
   document.getElementById("middleWrap").style.zIndex = "9";
 
 }, 5000);
 
 </script>
 
@@ -333,8 +345,8 @@ setTimeout(() => {
 
 #middleWrap {
 
   display: inline-block;
 
   overflow: hidden;
 
-  width: 100%;
 
-  height: 100%;
 
+  width:100%;
 
+  height:100vh;
 
   border: none;
 
   position: fixed;
 
   top: 0;
 
@@ -364,10 +376,180 @@ setTimeout(() => {
 
   border-radius: 2px;
 
   .title {
 
     font-size: 16px;
 
-    font-family: "MicrosoftYaHei-Bold";
 
+    //font-family: "MicrosoftYaHei-Bold";
 
     width: 100%;
 
     margin-bottom: 20px;
 
   }
 
 }
 
 
+
 
+ #loader-wrapper2 {
 
+      position: fixed;
 
+      top: 0;
 
+      left: 0;
 
+      width: 200px;
 
+      margin:0 calc(50vw - 100px);
 
+      height: 100%;
 
+      z-index: 0;
 
+  }
 
+  
+  #loader2 {
 
+      display: block;
 
+      position: fixed;
 
+      left: 50%;
 
+      top: 50%;
 
+      width: 150px;
 
+      height: 150px;
 
+      margin: -75px 0 0 -75px;
 
+      border-radius: 50%;
 
+      border: 3px solid transparent;
 
+      border-top-color: #FFF;
 
+      -webkit-animation: spin 2s linear infinite;
 
+      -ms-animation: spin 2s linear infinite;
 
+      -moz-animation: spin 2s linear infinite;
 
+      -o-animation: spin 2s linear infinite;
 
+      animation: spin 2s linear infinite;
 
+      z-index: 1001;
 
+      
+  }
 
+  
+  #loader2:before {
 
+      content: "";
 
+      position: absolute;
 
+      top: 5px;
 
+      left: 5px;
 
+      right: 5px;
 
+      bottom: 5px;
 
+      border-radius: 50%;
 
+      border: 3px solid transparent;
 
+      border-top-color: #FFF;
 
+      -webkit-animation: spin 3s linear infinite;
 
+      -moz-animation: spin 3s linear infinite;
 
+      -o-animation: spin 3s linear infinite;
 
+      -ms-animation: spin 3s linear infinite;
 
+      animation: spin 3s linear infinite;
 
+  }
 
+  
+  #loader2:after {
 
+      content: "";
 
+      position: absolute;
 
+      top: 15px;
 
+      left: 15px;
 
+      right: 15px;
 
+      bottom: 15px;
 
+      border-radius: 50%;
 
+      border: 3px solid transparent;
 
+      border-top-color: #FFF;
 
+      -moz-animation: spin 1.5s linear infinite;
 
+      -o-animation: spin 1.5s linear infinite;
 
+      -ms-animation: spin 1.5s linear infinite;
 
+      -webkit-animation: spin 1.5s linear infinite;
 
+      animation: spin 1.5s linear infinite;
 
+  }
 
+  
+  @-webkit-keyframes spin {
 
+      0% {
 
+          -webkit-transform: rotate(0deg);
 
+          -ms-transform: rotate(0deg);
 
+          transform: rotate(0deg);
 
+      }
 
+      100% {
 
+          -webkit-transform: rotate(360deg);
 
+          -ms-transform: rotate(360deg);
 
+          transform: rotate(360deg);
 
+      }
 
+  }
 
+  
+  @keyframes spin {
 
+      0% {
 
+          -webkit-transform: rotate(0deg);
 
+          -ms-transform: rotate(0deg);
 
+          transform: rotate(0deg);
 
+      }
 
+      100% {
 
+          -webkit-transform: rotate(360deg);
 
+          -ms-transform: rotate(360deg);
 
+          transform: rotate(360deg);
 
+      }
 
+  }
 
+  
+  #loader-wrapper2 .loader-section {
 
+      position: fixed;
 
+      top: 0;
 
+      width: 51%;
 
+      height: 100%;
 
+      
+      z-index: 0;
 
+      -webkit-transform: translateX(0);
 
+      -ms-transform: translateX(0);
 
+      transform: translateX(0);
 
+  }
 
+  
+  #loader-wrapper2 .loader-section.section-left {
 
+      left: 0;
 
+  }
 
+  
+  #loader-wrapper2 .loader-section.section-right {
 
+      right: 0;
 
+  }
 
+  
+  .loaded #loader-wrapper2 .loader-section.section-left {
 
+      -webkit-transform: translateX(-100%);
 
+      -ms-transform: translateX(-100%);
 
+      transform: translateX(-100%);
 
+      -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
 
+      transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
 
+  }
 
+  
+  .loaded #loader-wrapper2 .loader-section.section-right {
 
+      -webkit-transform: translateX(100%);
 
+      -ms-transform: translateX(100%);
 
+      transform: translateX(100%);
 
+      -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
 
+      transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
 
+  }
 
+  
+  .loaded #loader2 {
 
+      opacity: 0;
 
+      -webkit-transition: all 0.3s ease-out;
 
+      transition: all 0.3s ease-out;
 
+  }
 
+  
+  .loaded #loader-wrapper2 {
 
+      visibility: hidden;
 
+      -webkit-transform: translateY(-100%);
 
+      -ms-transform: translateY(-100%);
 
+      transform: translateY(-100%);
 
+      -webkit-transition: all 0.3s 1s ease-out;
 
+      transition: all 0.3s 1s ease-out;
 
+  }
 
+  
+  .no-js #loader-wrapper2 {
 
+      display: none;
 
+  }
 
+  
+  .no-js h1 {
 
+      color: #222222;
 
+  }
 
+  
+  #loader-wrapper2 .load_title {
 
+      font-family: 'Open Sans';
 
+      color: #FFF;
 
+      font-size: 19px;
 
+      width: 100%;
 
+      text-align: center;
 
+      z-index: 9999999999999;
 
+      position: absolute;
 
+      top: 60%;
 
+      opacity: 1;
 
+      line-height: 30px;
 
+  }
 
+  
+  #loader-wrapper2 .load_title span {
 
+      font-weight: normal;
 
+      font-style: italic;
 
+      font-size: 13px;
 
+      color: #FFF;
 
+      opacity: 0.5;
 
+  }
 
 </style>

+ 0 - 503
src/views/monitor/job/index.vue
View File 

@@ -1,503 +0,0 @@
 
-<template>
 
-   <div class="app-container">
 
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
 
-         <el-form-item label="任务名称" prop="jobName">
 
-            <el-input
 
-               v-model="queryParams.jobName"
 
-               placeholder="请输入任务名称"
 
-               clearable
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="任务组名" prop="jobGroup">
 
-            <el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable>
 
-               <el-option
 
-                  v-for="dict in sys_job_group"
 
-                  :key="dict.value"
 
-                  :label="dict.label"
 
-                  :value="dict.value"
 
-               />
 
-            </el-select>
 
-         </el-form-item>
 
-         <el-form-item label="任务状态" prop="status">
 
-            <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
 
-               <el-option
 
-                  v-for="dict in sys_job_status"
 
-                  :key="dict.value"
 
-                  :label="dict.label"
 
-                  :value="dict.value"
 
-               />
 
-            </el-select>
 
-         </el-form-item>
 
-         <el-form-item>
 
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
 
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
 
-         </el-form-item>
 
-      </el-form>
 
-
 
-      <el-row :gutter="10" class="mb8">
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="primary"
 
-               plain
 
-               icon="Plus"
 
-               @click="handleAdd"
 
-               v-hasPermi="['monitor:job:add']"
 
-            >新增</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="success"
 
-               plain
 
-               icon="Edit"
 
-               :disabled="single"
 
-               @click="handleUpdate"
 
-               v-hasPermi="['monitor:job:edit']"
 
-            >修改</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="danger"
 
-               plain
 
-               icon="Delete"
 
-               :disabled="multiple"
 
-               @click="handleDelete"
 
-               v-hasPermi="['monitor:job:remove']"
 
-            >删除</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="warning"
 
-               plain
 
-               icon="Download"
 
-               @click="handleExport"
 
-               v-hasPermi="['monitor:job:export']"
 
-            >导出</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="info"
 
-               plain
 
-               icon="Operation"
 
-               @click="handleJobLog"
 
-               v-hasPermi="['monitor:job:query']"
 
-            >日志</el-button>
 
-         </el-col>
 
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
 
-      </el-row>
 
-
 
-      <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
 
-         <el-table-column type="selection" width="55" align="center" />
 
-         <el-table-column label="任务编号" width="100" align="center" prop="jobId" />
 
-         <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
 
-         <el-table-column label="任务组名" align="center" prop="jobGroup">
 
-            <template #default="scope">
 
-               <dict-tag :options="sys_job_group" :value="scope.row.jobGroup" />
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
 
-         <el-table-column label="cron执行表达式" align="center" prop="cronExpression" :show-overflow-tooltip="true" />
 
-         <el-table-column label="状态" align="center">
 
-            <template #default="scope">
 
-               <el-switch
 
-                  v-model="scope.row.status"
 
-                  active-value="0"
 
-                  inactive-value="1"
 
-                  @change="handleStatusChange(scope.row)"
 
-               ></el-switch>
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
 
-            <template #default="scope">
 
-               <el-tooltip content="修改" placement="top">
 
-                  <el-button
 
-                     type="text"
 
-                     icon="Edit"
 
-                     @click="handleUpdate(scope.row)"
 
-                     v-hasPermi="['monitor:job:edit']"
 
-                  ></el-button>
 
-               </el-tooltip>
 
-               <el-tooltip content="删除" placement="top">
 
-                  <el-button
 
-                     type="text"
 
-                     icon="Delete"
 
-                     @click="handleDelete(scope.row)"
 
-                     v-hasPermi="['monitor:job:remove']"
 
-                  ></el-button>
 
-               </el-tooltip>
 
-               <el-tooltip content="执行一次" placement="top">
 
-                  <el-button
 
-                     type="text"
 
-                     icon="CaretRight"
 
-                     @click="handleRun(scope.row)"
 
-                     v-hasPermi="['monitor:job:changeStatus']"
 
-                  ></el-button>
 
-               </el-tooltip>
 
-               <el-tooltip content="任务详细" placement="top">
 
-                  <el-button
 
-                     type="text"
 
-                     icon="View"
 
-                     @click="handleView(scope.row)"
 
-                     v-hasPermi="['monitor:job:query']"
 
-                  ></el-button>
 
-               </el-tooltip>
 
-               <el-tooltip content="调度日志" placement="top">
 
-                  <el-button
 
-                     type="text"
 
-                     icon="Operation"
 
-                     @click="handleJobLog(scope.row)"
 
-                     v-hasPermi="['monitor:job:query']"
 
-                  ></el-button>
 
-               </el-tooltip>
 
-            </template>
 
-         </el-table-column>
 
-      </el-table>
 
-
 
-      <pagination
 
-         v-show="total > 0"
 
-         :total="total"
 
-         v-model:page="queryParams.pageNum"
 
-         v-model:limit="queryParams.pageSize"
 
-         @pagination="getList"
 
-      />
 
-
 
-      <!-- 添加或修改定时任务对话框 -->
 
-      <el-dialog :title="title" v-model="open" width="800px" append-to-body>
 
-         <el-form ref="jobRef" :model="form" :rules="rules" label-width="120px">
 
-            <el-row>
 
-               <el-col :span="12">
 
-                  <el-form-item label="任务名称" prop="jobName">
 
-                     <el-input v-model="form.jobName" placeholder="请输入任务名称" />
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="任务分组" prop="jobGroup">
 
-                     <el-select v-model="form.jobGroup" placeholder="请选择">
 
-                        <el-option
 
-                           v-for="dict in sys_job_group"
 
-                           :key="dict.value"
 
-                           :label="dict.label"
 
-                           :value="dict.value"
 
-                        ></el-option>
 
-                     </el-select>
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="24">
 
-                  <el-form-item prop="invokeTarget">
 
-                     <template #label>
 
-                        <span>
 
-                           调用方法
 
-                           <el-tooltip placement="top">
 
-                              <template #content>
 
-                                 <div>
 
-                                    Bean调用示例：ryTask.ryParams('ry')
 
-                                    <br />Class类调用示例：com.ruoyi.quartz.task.RyTask.ryParams('ry')
 
-                                    <br />参数说明：支持字符串，布尔类型，长整型，浮点型，整型
 
-                                 </div>
 
-                              </template>
 
-                              <el-icon><question-filled /></el-icon>
 
-                           </el-tooltip>
 
-                        </span>
 
-                     </template>
 
-                     <el-input v-model="form.invokeTarget" placeholder="请输入调用目标字符串" />
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="24">
 
-                  <el-form-item label="cron表达式" prop="cronExpression">
 
-                     <el-input v-model="form.cronExpression" placeholder="请输入cron执行表达式">
 
-                        <template #append>
 
-                           <el-button type="primary" @click="handleShowCron">
 
-                              生成表达式
 
-                              <i class="el-icon-time el-icon--right"></i>
 
-                           </el-button>
 
-                        </template>
 
-                     </el-input>
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="24">
 
-                  <el-form-item label="执行策略" prop="misfirePolicy">
 
-                     <el-radio-group v-model="form.misfirePolicy">
 
-                        <el-radio-button label="1">立即执行</el-radio-button>
 
-                        <el-radio-button label="2">执行一次</el-radio-button>
 
-                        <el-radio-button label="3">放弃执行</el-radio-button>
 
-                     </el-radio-group>
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="是否并发" prop="concurrent">
 
-                     <el-radio-group v-model="form.concurrent">
 
-                        <el-radio-button label="0">允许</el-radio-button>
 
-                        <el-radio-button label="1">禁止</el-radio-button>
 
-                     </el-radio-group>
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="状态">
 
-                     <el-radio-group v-model="form.status">
 
-                        <el-radio
 
-                           v-for="dict in sys_job_status"
 
-                           :key="dict.value"
 
-                           :label="dict.value"
 
-                        >{{ dict.label }}</el-radio>
 
-                     </el-radio-group>
 
-                  </el-form-item>
 
-               </el-col>
 
-            </el-row>
 
-         </el-form>
 
-         <template #footer>
 
-            <div class="dialog-footer">
 
-               <el-button type="primary" @click="submitForm">确 定</el-button>
 
-               <el-button @click="cancel">取 消</el-button>
 
-            </div>
 
-         </template>
 
-      </el-dialog>
 
- 
-      <!-- 任务日志详细 -->
 
-      <el-dialog title="任务详细" v-model="openView" width="700px" append-to-body>
 
-         <el-form :model="form" label-width="120px">
 
-            <el-row>
 
-               <el-col :span="12">
 
-                  <el-form-item label="任务编号：">{{ form.jobId }}</el-form-item>
 
-                  <el-form-item label="任务名称：">{{ form.jobName }}</el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="任务分组：">{{ jobGroupFormat(form) }}</el-form-item>
 
-                  <el-form-item label="创建时间：">{{ form.createTime }}</el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="cron表达式：">{{ form.cronExpression }}</el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="下次执行时间：">{{ parseTime(form.nextValidTime) }}</el-form-item>
 
-               </el-col>
 
-               <el-col :span="24">
 
-                  <el-form-item label="调用目标方法：">{{ form.invokeTarget }}</el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="任务状态：">
 
-                     <div v-if="form.status == 0">正常</div>
 
-                     <div v-else-if="form.status == 1">失败</div>
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="是否并发：">
 
-                     <div v-if="form.concurrent == 0">允许</div>
 
-                     <div v-else-if="form.concurrent == 1">禁止</div>
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="执行策略：">
 
-                     <div v-if="form.misfirePolicy == 0">默认策略</div>
 
-                     <div v-else-if="form.misfirePolicy == 1">立即执行</div>
 
-                     <div v-else-if="form.misfirePolicy == 2">执行一次</div>
 
-                     <div v-else-if="form.misfirePolicy == 3">放弃执行</div>
 
-                  </el-form-item>
 
-               </el-col>
 
-            </el-row>
 
-         </el-form>
 
-         <template #footer>
 
-            <div class="dialog-footer">
 
-               <el-button @click="openView = false">关 闭</el-button>
 
-            </div>
 
-         </template>
 
-      </el-dialog>
 
-   </div>
 
-</template>
 
-
 
-<script setup name="Job">
 
-import { listJob, getJob, delJob, addJob, updateJob, runJob, changeJobStatus } from "@/api/monitor/job";
 
-
 
-const router = useRouter();
 
-const { proxy } = getCurrentInstance();
 
-const { sys_job_group, sys_job_status } = proxy.useDict("sys_job_group", "sys_job_status");
 
-
 
-const jobList = ref([]);
 
-const open = ref(false);
 
-const loading = ref(true);
 
-const showSearch = ref(true);
 
-const ids = ref([]);
 
-const single = ref(true);
 
-const multiple = ref(true);
 
-const total = ref(0);
 
-const title = ref("");
 
-const openView = ref(false);
 
-const openCron = ref(false);
 
-const expression = ref("");
 
-
 
-const data = reactive({
 
-  form: {},
 
-  queryParams: {
 
-    pageNum: 1,
 
-    pageSize: 10,
 
-    jobName: undefined,
 
-    jobGroup: undefined,
 
-    status: undefined
 
-  },
 
-  rules: {
 
-    jobName: [{ required: true, message: "任务名称不能为空", trigger: "blur" }],
 
-    invokeTarget: [{ required: true, message: "调用目标字符串不能为空", trigger: "blur" }],
 
-    cronExpression: [{ required: true, message: "cron执行表达式不能为空", trigger: "blur" }]
 
-  }
 
-});
 
-
 
-const { queryParams, form, rules } = toRefs(data);
 
-
 
-/** 查询定时任务列表 */
 
-function getList() {
 
-  loading.value = true;
 
-  listJob(queryParams.value).then(response => {
 
-    jobList.value = response.rows;
 
-    total.value = response.total;
 
-    loading.value = false;
 
-  });
 
-}
 
-/** 任务组名字典翻译 */
 
-function jobGroupFormat(row, column) {
 
-  return proxy.selectDictLabel(sys_job_group.value, row.jobGroup);
 
-}
 
-/** 取消按钮 */
 
-function cancel() {
 
-  open.value = false;
 
-  reset();
 
-}
 
-/** 表单重置 */
 
-function reset() {
 
-  form.value = {
 
-    jobId: undefined,
 
-    jobName: undefined,
 
-    jobGroup: undefined,
 
-    invokeTarget: undefined,
 
-    cronExpression: undefined,
 
-    misfirePolicy: 1,
 
-    concurrent: 1,
 
-    status: "0"
 
-  };
 
-  proxy.resetForm("jobRef");
 
-}
 
-/** 搜索按钮操作 */
 
-function handleQuery() {
 
-  queryParams.value.pageNum = 1;
 
-  getList();
 
-}
 
-/** 重置按钮操作 */
 
-function resetQuery() {
 
-  proxy.resetForm("queryRef");
 
-  handleQuery();
 
-}
 
-// 多选框选中数据
 
-function handleSelectionChange(selection) {
 
-  ids.value = selection.map(item => item.jobId);
 
-  single.value = selection.length != 1;
 
-  multiple.value = !selection.length;
 
-}
 
-// 更多操作触发
 
-function handleCommand(command, row) {
 
-  switch (command) {
 
-    case "handleRun":
 
-      handleRun(row);
 
-      break;
 
-    case "handleView":
 
-      handleView(row);
 
-      break;
 
-    case "handleJobLog":
 
-      handleJobLog(row);
 
-      break;
 
-    default:
 
-      break;
 
-  }
 
-}
 
-// 任务状态修改
 
-function handleStatusChange(row) {
 
-  let text = row.status === "0" ? "启用" : "停用";
 
-  proxy.$modal.confirm('确认要"' + text + '""' + row.jobName + '"任务吗?').then(function () {
 
-    return changeJobStatus(row.jobId, row.status);
 
-  }).then(() => {
 
-    proxy.$modal.msgSuccess(text + "成功");
 
-  }).catch(function () {
 
-    row.status = row.status === "0" ? "1" : "0";
 
-  });
 
-}
 
-/* 立即执行一次 */
 
-function handleRun(row) {
 
-  proxy.$modal.confirm('确认要立即执行一次"' + row.jobName + '"任务吗?').then(function () {
 
-    return runJob(row.jobId, row.jobGroup);
 
-  }).then(() => {
 
-    proxy.$modal.msgSuccess("执行成功");})
 
-  .catch(() => {});
 
-}
 
-/** 任务详细信息 */
 
-function handleView(row) {
 
-  getJob(row.jobId).then(response => {
 
-    form.value = response.data;
 
-    openView.value = true;
 
-  });
 
-}
 
-/** cron表达式按钮操作 */
 
-function handleShowCron() {
 
-  expression.value = form.value.cronExpression;
 
-  openCron.value = true;
 
-}
 
-/** 确定后回传值 */
 
-function crontabFill(value) {
 
-  form.value.cronExpression = value;
 
-}
 
-/** 任务日志列表查询 */
 
-function handleJobLog(row) {
 
-  const jobId = row.jobId || 0;
 
-  router.push({ path: "/monitor/job-log/index", query: { jobId: jobId } });
 
-}
 
-/** 新增按钮操作 */
 
-function handleAdd() {
 
-  reset();
 
-  open.value = true;
 
-  title.value = "添加任务";
 
-}
 
-/** 修改按钮操作 */
 
-function handleUpdate(row) {
 
-  reset();
 
-  const jobId = row.jobId || ids.value;
 
-  getJob(jobId).then(response => {
 
-    form.value = response.data;
 
-    open.value = true;
 
-    title.value = "修改任务";
 
-  });
 
-}
 
-/** 提交按钮 */
 
-function submitForm() {
 
-  proxy.$refs["jobRef"].validate(valid => {
 
-    if (valid) {
 
-      if (form.value.jobId != undefined) {
 
-        updateJob(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("修改成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      } else {
 
-        addJob(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("新增成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      }
 
-    }
 
-  });
 
-}
 
-/** 删除按钮操作 */
 
-function handleDelete(row) {
 
-  const jobIds = row.jobId || ids.value;
 
-  proxy.$modal.confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项?').then(function () {
 
-    return delJob(jobIds);
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("删除成功");
 
-  }).catch(() => {});
 
-}
 
-/** 导出按钮操作 */
 
-function handleExport() {
 
-  proxy.download("schedule/job/export", {
 
-    ...queryParams.value,
 
-  }, `job_${new Date().getTime()}.xlsx`);
 
-}
 
-
 
-getList();
 
-</script>

+ 0 - 282
src/views/monitor/job/log.vue
View File 

@@ -1,282 +0,0 @@
 
-<template>
 
-   <div class="app-container">
 
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
 
-         <el-form-item label="任务名称" prop="jobName">
 
-            <el-input
 
-               v-model="queryParams.jobName"
 
-               placeholder="请输入任务名称"
 
-               clearable
 
-               style="width: 240px"
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="任务组名" prop="jobGroup">
 
-            <el-select
 
-               v-model="queryParams.jobGroup"
 
-               placeholder="请选择任务组名"
 
-               clearable
 
-               style="width: 240px"
 
-            >
 
-               <el-option
 
-                  v-for="dict in sys_job_group"
 
-                  :key="dict.value"
 
-                  :label="dict.label"
 
-                  :value="dict.value"
 
-               />
 
-            </el-select>
 
-         </el-form-item>
 
-         <el-form-item label="执行状态" prop="status">
 
-            <el-select
 
-               v-model="queryParams.status"
 
-               placeholder="请选择执行状态"
 
-               clearable
 
-               style="width: 240px"
 
-            >
 
-               <el-option
 
-                  v-for="dict in sys_common_status"
 
-                  :key="dict.value"
 
-                  :label="dict.label"
 
-                  :value="dict.value"
 
-               />
 
-            </el-select>
 
-         </el-form-item>
 
-         <el-form-item label="执行时间" style="width: 308px">
 
-            <el-date-picker
 
-               v-model="dateRange"
 
-               value-format="YYYY-MM-DD"
 
-               type="daterange"
 
-               range-separator="-"
 
-               start-placeholder="开始日期"
 
-               end-placeholder="结束日期"
 
-            ></el-date-picker>
 
-         </el-form-item>
 
-         <el-form-item>
 
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
 
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
 
-         </el-form-item>
 
-      </el-form>
 
-
 
-      <el-row :gutter="10" class="mb8">
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="danger"
 
-               plain
 
-               icon="Delete"
 
-               :disabled="multiple"
 
-               @click="handleDelete"
 
-               v-hasPermi="['monitor:job:remove']"
 
-            >删除</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="danger"
 
-               plain
 
-               icon="Delete"
 
-               @click="handleClean"
 
-               v-hasPermi="['monitor:job:remove']"
 
-            >清空</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="warning"
 
-               plain
 
-               icon="Download"
 
-               @click="handleExport"
 
-               v-hasPermi="['monitor:job:export']"
 
-            >导出</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button 
-               type="warning" 
-               plain 
-               icon="Close"
 
-               @click="handleClose"
 
-            >关闭</el-button>
 
-         </el-col>
 
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
 
-      </el-row>
 
-
 
-      <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
 
-         <el-table-column type="selection" width="55" align="center" />
 
-         <el-table-column label="日志编号" width="80" align="center" prop="jobLogId" />
 
-         <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
 
-         <el-table-column label="任务组名" align="center" prop="jobGroup" :show-overflow-tooltip="true">
 
-            <template #default="scope">
 
-               <dict-tag :options="sys_job_group" :value="scope.row.jobGroup" />
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
 
-         <el-table-column label="日志信息" align="center" prop="jobMessage" :show-overflow-tooltip="true" />
 
-         <el-table-column label="执行状态" align="center" prop="status">
 
-            <template #default="scope">
 
-               <dict-tag :options="sys_common_status" :value="scope.row.status" />
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="执行时间" align="center" prop="createTime" width="180">
 
-            <template #default="scope">
 
-               <span>{{ parseTime(scope.row.createTime) }}</span>
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
-            <template #default="scope">
 
-               <el-button
 
-                  type="text"
 
-                  icon="View"
 
-                  @click="handleView(scope.row)"
 
-                  v-hasPermi="['monitor:job:query']"
 
-               >详细</el-button>
 
-            </template>
 
-         </el-table-column>
 
-      </el-table>
 
-
 
-      <pagination
 
-         v-show="total > 0"
 
-         :total="total"
 
-         v-model:page="queryParams.pageNum"
 
-         v-model:limit="queryParams.pageSize"
 
-         @pagination="getList"
 
-      />
 
-
 
-      <!-- 调度日志详细 -->
 
-      <el-dialog title="调度日志详细" v-model="open" width="700px" append-to-body>
 
-         <el-form :model="form" label-width="100px">
 
-            <el-row>
 
-               <el-col :span="12">
 
-                  <el-form-item label="日志序号：">{{ form.jobLogId }}</el-form-item>
 
-                  <el-form-item label="任务名称：">{{ form.jobName }}</el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="任务分组：">{{ form.jobGroup }}</el-form-item>
 
-                  <el-form-item label="执行时间：">{{ form.createTime }}</el-form-item>
 
-               </el-col>
 
-               <el-col :span="24">
 
-                  <el-form-item label="调用方法：">{{ form.invokeTarget }}</el-form-item>
 
-               </el-col>
 
-               <el-col :span="24">
 
-                  <el-form-item label="日志信息：">{{ form.jobMessage }}</el-form-item>
 
-               </el-col>
 
-               <el-col :span="24">
 
-                  <el-form-item label="执行状态：">
 
-                     <div v-if="form.status == 0">正常</div>
 
-                     <div v-else-if="form.status == 1">失败</div>
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="24">
 
-                  <el-form-item label="异常信息：" v-if="form.status == 1">{{ form.exceptionInfo }}</el-form-item>
 
-               </el-col>
 
-            </el-row>
 
-         </el-form>
 
-         <template #footer>
 
-            <div class="dialog-footer">
 
-               <el-button @click="open = false">关 闭</el-button>
 
-            </div>
 
-         </template>
 
-      </el-dialog>
 
-   </div>
 
-</template>
 
-
 
-<script setup name="JobLog">
 
-import { getJob } from "@/api/monitor/job";
 
-import { listJobLog, delJobLog, cleanJobLog } from "@/api/monitor/jobLog";
 
-
 
-const { proxy } = getCurrentInstance();
 
-const { sys_common_status, sys_job_group } = proxy.useDict("sys_common_status", "sys_job_group");
 
-
 
-const jobLogList = ref([]);
 
-const open = ref(false);
 
-const loading = ref(true);
 
-const showSearch = ref(true);
 
-const ids = ref([]);
 
-const multiple = ref(true);
 
-const total = ref(0);
 
-const dateRange = ref([]);
 
-const route = useRoute();
 
-
 
-const data = reactive({
 
-  form: {},
 
-  queryParams: {
 
-    pageNum: 1,
 
-    pageSize: 10,
 
-    dictName: undefined,
 
-    dictType: undefined,
 
-    status: undefined
 
-  }
 
-});
 
-
 
-const { queryParams, form, rules } = toRefs(data);
 
-
 
-/** 查询调度日志列表 */
 
-function getList() {
 
-  loading.value = true;
 
-  listJobLog(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
 
-    jobLogList.value = response.rows;
 
-    total.value = response.total;
 
-    loading.value = false;
 
-  });
 
-}
 
-// 返回按钮
 
-function handleClose() {
 
-  const obj = { path: "/monitor/job" };
 
-  proxy.$tab.closeOpenPage(obj);
 
-}
 
-/** 搜索按钮操作 */
 
-function handleQuery() {
 
-  queryParams.value.pageNum = 1;
 
-  getList();
 
-}
 
-/** 重置按钮操作 */
 
-function resetQuery() {
 
-  dateRange.value = [];
 
-  proxy.resetForm("queryRef");
 
-  handleQuery();
 
-}
 
-// 多选框选中数据
 
-function handleSelectionChange(selection) {
 
-  ids.value = selection.map(item => item.jobLogId);
 
-  multiple.value = !selection.length;
 
-}
 
-/** 详细按钮操作 */
 
-function handleView(row) {
 
-  open.value = true;
 
-  form.value = row;
 
-}
 
-/** 删除按钮操作 */
 
-function handleDelete(row) {
 
-  proxy.$modal.confirm('是否确认删除调度日志编号为"' + ids.value + '"的数据项?').then(function () {
 
-    return delJobLog(ids.value);
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("删除成功");
 
-  }).catch(() => {});
 
-}
 
-/** 清空按钮操作 */
 
-function handleClean() {
 
-  proxy.$modal.confirm("是否确认清空所有调度日志数据项?").then(function () {
 
-    return cleanJobLog();
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("清空成功");
 
-  }).catch(() => {});
 
-}
 
-/** 导出按钮操作 */
 
-function handleExport() {
 
-  proxy.download("schedule/job/log/export", {
 
-    ...queryParams.value,
 
-  }, `job_log_${new Date().getTime()}.xlsx`);
 
-}
 
-
 
-(() => {
 
-  const jobId = route.query.jobId;
 
-  if (jobId !== undefined && jobId != 0) {
 
-    getJob(jobId).then(response => {
 
-      queryParams.value.jobName = response.data.jobName;
 
-      queryParams.value.jobGroup = response.data.jobGroup;
 
-      getList();
 
-    });
 
-  } else {
 
-    getList();
 
-  }
 
-})();
 
-
 
-getList();
 
-</script>

+ 0 - 105
src/views/monitor/online/index.vue
View File 

@@ -1,105 +0,0 @@
 
-<template>
 
-   <div class="app-container">
 
-      <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="68px">
 
-         <el-form-item label="登录地址" prop="ipaddr">
 
-            <el-input
 
-               v-model="queryParams.ipaddr"
 
-               placeholder="请输入登录地址"
 
-               clearable
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="用户名称" prop="userName">
 
-            <el-input
 
-               v-model="queryParams.userName"
 
-               placeholder="请输入用户名称"
 
-               clearable
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item>
 
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
 
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
 
-         </el-form-item>
 
-      </el-form>
 
-      <el-table
 
-         v-loading="loading"
 
-         :data="onlineList.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
 
-         style="width: 100%;"
 
-      >
 
-         <el-table-column label="序号" width="50" type="index" align="center">
 
-            <template #default="scope">
 
-               <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="会话编号" align="center" prop="tokenId" :show-overflow-tooltip="true" />
 
-         <el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" />
 
-         <el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
 
-         <el-table-column label="登录时间" align="center" prop="loginTime" width="180">
 
-            <template #default="scope">
 
-               <span>{{ parseTime(scope.row.loginTime) }}</span>
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
-            <template #default="scope">
 
-               <el-button
 
-                  type="text"
 
-                  icon="Delete"
 
-                  @click="handleForceLogout(scope.row)"
 
-                  v-hasPermi="['monitor:online:forceLogout']"
 
-               >强退</el-button>
 
-            </template>
 
-         </el-table-column>
 
-      </el-table>
 
-
 
-      <pagination v-show="total > 0" :total="total" v-model:page="pageNum" v-model:limit="pageSize" />
 
-   </div>
 
-</template>
 
-
 
-<script setup name="Online">
 
-import { forceLogout, list as initData } from "@/api/monitor/online";
 
-
 
-const { proxy } = getCurrentInstance();
 
-
 
-const onlineList = ref([]);
 
-const loading = ref(true);
 
-const total = ref(0);
 
-const pageNum = ref(1);
 
-const pageSize = ref(10);
 
-
 
-const queryParams = ref({
 
-  ipaddr: undefined,
 
-  userName: undefined
 
-});
 
-
 
-/** 查询登录日志列表 */
 
-function getList() {
 
-  loading.value = true;
 
-  initData(queryParams.value).then(response => {
 
-    onlineList.value = response.rows;
 
-    total.value = response.total;
 
-    loading.value = false;
 
-  });
 
-}
 
-/** 搜索按钮操作 */
 
-function handleQuery() {
 
-  pageNum.value = 1;
 
-  getList();
 
-}
 
-/** 重置按钮操作 */
 
-function resetQuery() {
 
-  proxy.resetForm("queryRef");
 
-  handleQuery();
 
-}
 
-/** 强退按钮操作 */
 
-function handleForceLogout(row) {
 
-    proxy.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户?').then(function () {
 
-  return forceLogout(row.tokenId);
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("删除成功");
 
-  }).catch(() => {});
 
-}
 
-
 
-getList();
 
-</script>

+ 0 - 14
src/views/redirect/index.vue
View File 

@@ -1,14 +0,0 @@
 
-<template>
 
-  <div></div>
 
-</template>
 
-
 
-<script setup>
 
-import { useRoute, useRouter } from 'vue-router'
 
-
 
-const route = useRoute();
 
-const router = useRouter();
 
-const { params, query } = route
 
-const { path } = params
 
-
 
-router.replace({ path: '/' + path, query })
 
-</script>

+ 0 - 218
src/views/register.vue
View File 

@@ -1,218 +0,0 @@
 
-<template>
 
-  <div class="register">
 
-    <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
 
-      <h3 class="title">后台管理系统</h3>
 
-      <el-form-item prop="username">
 
-        <el-input 
-          v-model="registerForm.username" 
-          type="text" 
-          size="large" 
-          auto-complete="off" 
-          placeholder="账号"
 
-        >
 
-          <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
 
-        </el-input>
 
-      </el-form-item>
 
-      <el-form-item prop="password">
 
-        <el-input
 
-          v-model="registerForm.password"
 
-          type="password"
 
-          size="large" 
-          auto-complete="off"
 
-          placeholder="密码"
 
-          @keyup.enter="handleRegister"
 
-        >
 
-          <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
 
-        </el-input>
 
-      </el-form-item>
 
-      <el-form-item prop="confirmPassword">
 
-        <el-input
 
-          v-model="registerForm.confirmPassword"
 
-          type="password"
 
-          size="large" 
-          auto-complete="off"
 
-          placeholder="确认密码"
 
-          @keyup.enter="handleRegister"
 
-        >
 
-          <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
 
-        </el-input>
 
-      </el-form-item>
 
-      <el-form-item prop="code" v-if="captchaOnOff">
 
-        <el-input
 
-          size="large" 
-          v-model="registerForm.code"
 
-          auto-complete="off"
 
-          placeholder="验证码"
 
-          style="width: 63%"
 
-          @keyup.enter="handleRegister"
 
-        >
 
-          <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
 
-        </el-input>
 
-        <div class="register-code">
 
-          <img :src="codeUrl" @click="getCode" class="register-code-img"/>
 
-        </div>
 
-      </el-form-item>
 
-      <el-form-item style="width:100%;">
 
-        <el-button
 
-          :loading="loading"
 
-          size="large" 
-          type="primary"
 
-          style="width:100%;"
 
-          @click.prevent="handleRegister"
 
-        >
 
-          <span v-if="!loading">注 册</span>
 
-          <span v-else>注 册 中...</span>
 
-        </el-button>
 
-        <div style="float: right;">
 
-          <router-link class="link-type" :to="'/login'">使用已有账户登录</router-link>
 
-        </div>
 
-      </el-form-item>
 
-    </el-form>
 
-    <!--  底部  -->
 
-    <div class="el-register-footer">
 
-      <span>Copyright © 2018-2022 ruoyi.vip All Rights Reserved.</span>
 
-    </div>
 
-  </div>
 
-</template>
 
-
 
-<script setup>
 
-import { ElMessageBox } from "element-plus";
 
-import { getCodeImg, register } from "@/api/login";
 
-
 
-const router = useRouter();
 
-const { proxy } = getCurrentInstance();
 
-
 
-const registerForm = ref({
 
-  username: "",
 
-  password: "",
 
-  confirmPassword: "",
 
-  code: "",
 
-  uuid: ""
 
-});
 
-
 
-const equalToPassword = (rule, value, callback) => {
 
-  if (registerForm.value.password !== value) {
 
-    callback(new Error("两次输入的密码不一致"));
 
-  } else {
 
-    callback();
 
-  }
 
-};
 
-
 
-const registerRules = {
 
-  username: [
 
-    { required: true, trigger: "blur", message: "请输入您的账号" },
 
-    { min: 2, max: 20, message: "用户账号长度必须介于 2 和 20 之间", trigger: "blur" }
 
-  ],
 
-  password: [
 
-    { required: true, trigger: "blur", message: "请输入您的密码" },
 
-    { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }
 
-  ],
 
-  confirmPassword: [
 
-    { required: true, trigger: "blur", message: "请再次输入您的密码" },
 
-    { required: true, validator: equalToPassword, trigger: "blur" }
 
-  ],
 
-  code: [{ required: true, trigger: "change", message: "请输入验证码" }]
 
-};
 
-
 
-const codeUrl = ref("");
 
-const loading = ref(false);
 
-const captchaOnOff = ref(true);
 
-
 
-function handleRegister() {
 
-  proxy.$refs.registerRef.validate(valid => {
 
-    if (valid) {
 
-      loading.value = true;
 
-      register(registerForm.value).then(res => {
 
-        const username = registerForm.value.username;
 
-        ElMessageBox.alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", "系统提示", {
 
-          dangerouslyUseHTMLString: true,
 
-          type: "success",
 
-        }).then(() => {
 
-          router.push("/login");
 
-        }).catch(() => {});
 
-      }).catch(() => {
 
-        loading.value = false;
 
-        if (captchaOnOff) {
 
-          getCode();
 
-        }
 
-      });
 
-    }
 
-  });
 
-}
 
-
 
-function getCode() {
 
-  getCodeImg().then(res => {
 
-    captchaOnOff.value = res.captchaOnOff === undefined ? true : res.captchaOnOff;
 
-    if (captchaOnOff.value) {
 
-      codeUrl.value = "data:image/gif;base64," + res.img;
 
-      registerForm.value.uuid = res.uuid;
 
-    }
 
-  });
 
-}
 
-
 
-getCode();
 
-</script>
 
-
 
-<style lang='scss' scoped>
 
-.register {
 
-  display: flex;
 
-  justify-content: center;
 
-  align-items: center;
 
-  height: 100%;
 
-  background-image: url("../assets/images/login-background.jpg");
 
-  background-size: cover;
 
-}
 
-.title {
 
-  margin: 0px auto 30px auto;
 
-  text-align: center;
 
-  color: #707070;
 
-}
 
-
 
-.register-form {
 
-  border-radius: 6px;
 
-  background: #ffffff;
 
-  width: 400px;
 
-  padding: 25px 25px 5px 25px;
 
-  .el-input {
 
-    height: 40px;
 
-    input {
 
-      height: 40px;
 
-    }
 
-  }
 
-  .input-icon {
 
-    height: 39px;
 
-    width: 14px;
 
-    margin-left: 0px;
 
-  }
 
-}
 
-.register-tip {
 
-  font-size: 13px;
 
-  text-align: center;
 
-  color: #bfbfbf;
 
-}
 
-.register-code {
 
-  width: 33%;
 
-  height: 40px;
 
-  float: right;
 
-  img {
 
-    cursor: pointer;
 
-    vertical-align: middle;
 
-  }
 
-}
 
-.el-register-footer {
 
-  height: 40px;
 
-  line-height: 40px;
 
-  position: fixed;
 
-  bottom: 0;
 
-  width: 100%;
 
-  text-align: center;
 
-  color: #fff;
 
-  font-family: Arial;
 
-  font-size: 12px;
 
-  letter-spacing: 1px;
 
-}
 
-.register-code-img {
 
-  height: 40px;
 
-  padding-left: 12px;
 
-}
 
-</style>

+ 0 - 315
src/views/system/config/index.vue
View File 

@@ -1,315 +0,0 @@
 
-<template>
 
-   <div class="app-container">
 
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
 
-         <el-form-item label="参数名称" prop="configName">
 
-            <el-input
 
-               v-model="queryParams.configName"
 
-               placeholder="请输入参数名称"
 
-               clearable
 
-               style="width: 240px"
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="参数键名" prop="configKey">
 
-            <el-input
 
-               v-model="queryParams.configKey"
 
-               placeholder="请输入参数键名"
 
-               clearable
 
-               style="width: 240px"
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="系统内置" prop="configType">
 
-            <el-select v-model="queryParams.configType" placeholder="系统内置" clearable>
 
-               <el-option
 
-                  v-for="dict in sys_yes_no"
 
-                  :key="dict.value"
 
-                  :label="dict.label"
 
-                  :value="dict.value"
 
-               />
 
-            </el-select>
 
-         </el-form-item>
 
-         <el-form-item label="创建时间" style="width: 308px;">
 
-            <el-date-picker
 
-               v-model="dateRange"
 
-               value-format="YYYY-MM-DD"
 
-               type="daterange"
 
-               range-separator="-"
 
-               start-placeholder="开始日期"
 
-               end-placeholder="结束日期"
 
-            ></el-date-picker>
 
-         </el-form-item>
 
-         <el-form-item>
 
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
 
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
 
-         </el-form-item>
 
-      </el-form>
 
-
 
-      <el-row :gutter="10" class="mb8">
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="primary"
 
-               plain
 
-               icon="Plus"
 
-               @click="handleAdd"
 
-               v-hasPermi="['system:config:add']"
 
-            >新增</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="success"
 
-               plain
 
-               icon="Edit"
 
-               :disabled="single"
 
-               @click="handleUpdate"
 
-               v-hasPermi="['system:config:edit']"
 
-            >修改</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="danger"
 
-               plain
 
-               icon="Delete"
 
-               :disabled="multiple"
 
-               @click="handleDelete"
 
-               v-hasPermi="['system:config:remove']"
 
-            >删除</el-button>
 
-         </el-col>
 
-         <!-- <el-col :span="1.5">
 
-            <el-button
 
-               type="warning"
 
-               plain
 
-               icon="Download"
 
-               @click="handleExport"
 
-               v-hasPermi="['system:config:export']"
 
-            >导出</el-button>
 
-         </el-col> -->
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="danger"
 
-               plain
 
-               icon="Refresh"
 
-               @click="handleRefreshCache"
 
-               v-hasPermi="['system:config:remove']"
 
-            >刷新缓存</el-button>
 
-         </el-col>
 
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
 
-      </el-row>
 
-
 
-      <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
 
-         <el-table-column type="selection" width="55" align="center" />
 
-         <el-table-column label="参数主键" align="center" prop="configId" />
 
-         <el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" />
 
-         <el-table-column label="参数键名" align="center" prop="configKey" :show-overflow-tooltip="true" />
 
-         <el-table-column label="参数键值" align="center" prop="configValue" />
 
-         <el-table-column label="系统内置" align="center" prop="configType">
 
-            <template #default="scope">
 
-               <dict-tag :options="sys_yes_no" :value="scope.row.configType" />
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
 
-         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
 
-            <template #default="scope">
 
-               <span>{{ parseTime(scope.row.createTime) }}</span>
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
 
-            <template #default="scope">
 
-               <el-button
 
-                  type="text"
 
-                  icon="Edit"
 
-                  @click="handleUpdate(scope.row)"
 
-                  v-hasPermi="['system:config:edit']"
 
-               >修改</el-button>
 
-               <el-button
 
-                  type="text"
 
-                  icon="Delete"
 
-                  @click="handleDelete(scope.row)"
 
-                  v-hasPermi="['system:config:remove']"
 
-               >删除</el-button>
 
-            </template>
 
-         </el-table-column>
 
-      </el-table>
 
-
 
-      <pagination
 
-         v-show="total > 0"
 
-         :total="total"
 
-         v-model:page="queryParams.pageNum"
 
-         v-model:limit="queryParams.pageSize"
 
-         @pagination="getList"
 
-      />
 
-
 
-      <!-- 添加或修改参数配置对话框 -->
 
-      <el-dialog :title="title" v-model="open" width="500px" append-to-body>
 
-         <el-form ref="configRef" :model="form" :rules="rules" label-width="80px">
 
-            <el-form-item label="参数名称" prop="configName">
 
-               <el-input v-model="form.configName" placeholder="请输入参数名称" />
 
-            </el-form-item>
 
-            <el-form-item label="参数键名" prop="configKey">
 
-               <el-input v-model="form.configKey" placeholder="请输入参数键名" />
 
-            </el-form-item>
 
-            <el-form-item label="参数键值" prop="configValue">
 
-               <el-input v-model="form.configValue" placeholder="请输入参数键值" />
 
-            </el-form-item>
 
-            <el-form-item label="系统内置" prop="configType">
 
-               <el-radio-group v-model="form.configType">
 
-                  <el-radio
 
-                     v-for="dict in sys_yes_no"
 
-                     :key="dict.value"
 
-                     :label="dict.value"
 
-                  >{{ dict.label }}</el-radio>
 
-               </el-radio-group>
 
-            </el-form-item>
 
-            <el-form-item label="备注" prop="remark">
 
-               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
 
-            </el-form-item>
 
-         </el-form>
 
-         <template #footer>
 
-            <div class="dialog-footer">
 
-               <el-button type="primary" @click="submitForm">确 定</el-button>
 
-               <el-button @click="cancel">取 消</el-button>
 
-            </div>
 
-         </template>
 
-      </el-dialog>
 
-   </div>
 
-</template>
 
-
 
-<script setup name="Config">
 
-import { listConfig, getConfig, delConfig, addConfig, updateConfig, refreshCache } from "@/api/system/config";
 
-
 
-const { proxy } = getCurrentInstance();
 
-const { sys_yes_no } = proxy.useDict("sys_yes_no");
 
-
 
-const configList = ref([]);
 
-const open = ref(false);
 
-const loading = ref(true);
 
-const showSearch = ref(true);
 
-const ids = ref([]);
 
-const single = ref(true);
 
-const multiple = ref(true);
 
-const total = ref(0);
 
-const title = ref("");
 
-const dateRange = ref([]);
 
-
 
-const data = reactive({
 
-  form: {},
 
-  queryParams: {
 
-    pageNum: 1,
 
-    pageSize: 10,
 
-    configName: undefined,
 
-    configKey: undefined,
 
-    configType: undefined
 
-  },
 
-  rules: {
 
-    configName: [{ required: true, message: "参数名称不能为空", trigger: "blur" }],
 
-    configKey: [{ required: true, message: "参数键名不能为空", trigger: "blur" }],
 
-    configValue: [{ required: true, message: "参数键值不能为空", trigger: "blur" }]
 
-  }
 
-});
 
-
 
-const { queryParams, form, rules } = toRefs(data);
 
-
 
-/** 查询参数列表 */
 
-function getList() {
 
-  loading.value = true;
 
-  listConfig(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
 
-    configList.value = response.data.rows;
 
-    total.value = response.data.total;
 
-    loading.value = false;
 
-  });
 
-}
 
-/** 取消按钮 */
 
-function cancel() {
 
-  open.value = false;
 
-  reset();
 
-}
 
-/** 表单重置 */
 
-function reset() {
 
-  form.value = {
 
-    configId: undefined,
 
-    configName: undefined,
 
-    configKey: undefined,
 
-    configValue: undefined,
 
-    configType: "Y",
 
-    remark: undefined
 
-  };
 
-  proxy.resetForm("configRef");
 
-}
 
-/** 搜索按钮操作 */
 
-function handleQuery() {
 
-  queryParams.value.pageNum = 1;
 
-  getList();
 
-}
 
-/** 重置按钮操作 */
 
-function resetQuery() {
 
-  dateRange.value = [];
 
-  proxy.resetForm("queryRef");
 
-  handleQuery();
 
-}
 
-/** 多选框选中数据 */
 
-function handleSelectionChange(selection) {
 
-  ids.value = selection.map(item => item.configId);
 
-  single.value = selection.length != 1;
 
-  multiple.value = !selection.length;
 
-}
 
-/** 新增按钮操作 */
 
-function handleAdd() {
 
-  reset();
 
-  open.value = true;
 
-  title.value = "添加参数";
 
-}
 
-/** 修改按钮操作 */
 
-function handleUpdate(row) {
 
-  reset();
 
-  const configId = row.configId || ids.value;
 
-  getConfig(configId).then(response => {
 
-    form.value = response.data;
 
-    open.value = true;
 
-    title.value = "修改参数";
 
-  });
 
-}
 
-/** 提交按钮 */
 
-function submitForm() {
 
-  proxy.$refs["configRef"].validate(valid => {
 
-    if (valid) {
 
-      if (form.value.configId != undefined) {
 
-        updateConfig(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("修改成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      } else {
 
-        addConfig(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("新增成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      }
 
-    }
 
-  });
 
-}
 
-/** 删除按钮操作 */
 
-function handleDelete(row) {
 
-  const configIds = row.configId || ids.value;
 
-  proxy.$modal.confirm('是否确认删除参数编号为"' + configIds + '"的数据项？').then(function () {
 
-    return delConfig(configIds);
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("删除成功");
 
-  }).catch(() => {});
 
-}
 
-/** 导出按钮操作 */
 
-function handleExport() {
 
-  proxy.download("system/config/export", {
 
-    ...queryParams.value
 
-  }, `config_${new Date().getTime()}.xlsx`);
 
-}
 
-/** 刷新缓存按钮操作 */
 
-function handleRefreshCache() {
 
-  refreshCache().then(() => {
 
-    proxy.$modal.msgSuccess("刷新缓存成功");
 
-  });
 
-}
 
-
 
-getList();
 
-</script>

+ 0 - 289
src/views/system/dept/index.vue
View File 

@@ -1,289 +0,0 @@
 
-<template>
 
-   <div class="app-container">
 
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
 
-         <el-form-item label="部门名称" prop="deptName">
 
-            <el-input
 
-               v-model="queryParams.deptName"
 
-               placeholder="请输入部门名称"
 
-               clearable
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="状态" prop="status">
 
-            <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
 
-               <el-option
 
-                  v-for="dict in sys_normal_disable"
 
-                  :key="dict.value"
 
-                  :label="dict.label"
 
-                  :value="dict.value"
 
-               />
 
-            </el-select>
 
-         </el-form-item>
 
-         <el-form-item>
 
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
 
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
 
-         </el-form-item>
 
-      </el-form>
 
-
 
-      <el-row :gutter="10" class="mb8">
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="primary"
 
-               plain
 
-               icon="Plus"
 
-               @click="handleAdd"
 
-               v-hasPermi="['system:dept:add']"
 
-            >新增</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="info"
 
-               plain
 
-               icon="Sort"
 
-               @click="toggleExpandAll"
 
-            >展开/折叠</el-button>
 
-         </el-col>
 
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
 
-      </el-row>
 
-
 
-      <el-table
 
-         v-if="refreshTable"
 
-         v-loading="loading"
 
-         :data="deptList"
 
-         row-key="deptId"
 
-         :default-expand-all="isExpandAll"
 
-         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
 
-      >
 
-         <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
 
-         <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
 
-         <el-table-column prop="status" label="状态" width="100">
 
-            <template #default="scope">
 
-               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="创建时间" align="center" prop="createTime" width="200">
 
-            <template #default="scope">
 
-               <span>{{ parseTime(scope.row.createTime) }}</span>
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
-            <template #default="scope">
 
-               <el-button
 
-                  type="text"
 
-                  icon="Edit"
 
-                  @click="handleUpdate(scope.row)"
 
-                  v-hasPermi="['system:dept:edit']"
 
-               >修改</el-button>
 
-               <el-button
 
-                  type="text"
 
-                  icon="Plus"
 
-                  @click="handleAdd(scope.row)"
 
-                  v-hasPermi="['system:dept:add']"
 
-               >新增</el-button>
 
-               <el-button
 
-                  v-if="scope.row.parentId != 0"
 
-                  type="text"
 
-                  icon="Delete"
 
-                  @click="handleDelete(scope.row)"
 
-                  v-hasPermi="['system:dept:remove']"
 
-               >删除</el-button>
 
-            </template>
 
-         </el-table-column>
 
-      </el-table>
 
-
 
-      <!-- 添加或修改部门对话框 -->
 
-      <el-dialog :title="title" v-model="open" width="600px" append-to-body>
 
-         <el-form ref="deptRef" :model="form" :rules="rules" label-width="80px">
 
-            <el-row>
 
-               <el-col :span="24" v-if="form.parentId !== 0">
 
-                  <el-form-item label="上级部门" prop="parentId">
 
-                     <el-tree-select
 
-                        v-model="form.parentId"
 
-                        :data="deptOptions"
 
-                        :props="{ value: 'deptId', label: 'deptName', children: 'children' }"
 
-                        value-key="deptId"
 
-                        placeholder="选择上级部门"
 
-                        check-strictly
 
-                     />
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="部门名称" prop="deptName">
 
-                     <el-input v-model="form.deptName" placeholder="请输入部门名称" />
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="显示排序" prop="orderNum">
 
-                     <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="负责人" prop="leader">
 
-                     <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="联系电话" prop="phone">
 
-                     <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="邮箱" prop="email">
 
-                     <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="部门状态">
 
-                     <el-radio-group v-model="form.status">
 
-                        <el-radio
 
-                           v-for="dict in sys_normal_disable"
 
-                           :key="dict.value"
 
-                           :label="dict.value"
 
-                        >{{ dict.label }}</el-radio>
 
-                     </el-radio-group>
 
-                  </el-form-item>
 
-               </el-col>
 
-            </el-row>
 
-         </el-form>
 
-         <template #footer>
 
-            <div class="dialog-footer">
 
-               <el-button type="primary" @click="submitForm">确 定</el-button>
 
-               <el-button @click="cancel">取 消</el-button>
 
-            </div>
 
-         </template>
 
-      </el-dialog>
 
-   </div>
 
-</template>
 
-
 
-<script setup name="Dept">
 
-import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
 
-
 
-const { proxy } = getCurrentInstance();
 
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 
-
 
-const deptList = ref([]);
 
-const open = ref(false);
 
-const loading = ref(true);
 
-const showSearch = ref(true);
 
-const title = ref("");
 
-const deptOptions = ref([]);
 
-const isExpandAll = ref(true);
 
-const refreshTable = ref(true);
 
-
 
-const data = reactive({
 
-  form: {},
 
-  queryParams: {
 
-    deptName: undefined,
 
-    status: undefined
 
-  },
 
-  rules: {
 
-    parentId: [{ required: true, message: "上级部门不能为空", trigger: "blur" }],
 
-    deptName: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
 
-    orderNum: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
 
-    email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
 
-    phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
 
-  },
 
-});
 
-
 
-const { queryParams, form, rules } = toRefs(data);
 
-
 
-/** 查询部门列表 */
 
-function getList() {
 
-  loading.value = true;
 
-  listDept(queryParams.value).then(response => {
 
-    deptList.value = proxy.handleTree(response.data, "deptId");
 
-    loading.value = false;
 
-  });
 
-}
 
-/** 取消按钮 */
 
-function cancel() {
 
-  open.value = false;
 
-  reset();
 
-}
 
-/** 表单重置 */
 
-function reset() {
 
-  form.value = {
 
-    deptId: undefined,
 
-    parentId: undefined,
 
-    deptName: undefined,
 
-    orderNum: 0,
 
-    leader: undefined,
 
-    phone: undefined,
 
-    email: undefined,
 
-    status: "0"
 
-  };
 
-  proxy.resetForm("deptRef");
 
-}
 
-/** 搜索按钮操作 */
 
-function handleQuery() {
 
-  getList();
 
-}
 
-/** 重置按钮操作 */
 
-function resetQuery() {
 
-  proxy.resetForm("queryRef");
 
-  handleQuery();
 
-}
 
-/** 新增按钮操作 */
 
-function handleAdd(row) {
 
-  reset();
 
-  listDept().then(response => {
 
-    deptOptions.value = proxy.handleTree(response.data, "deptId");
 
-  });
 
-  if (row != undefined) {
 
-    form.value.parentId = row.deptId;
 
-  }
 
-  open.value = true;
 
-  title.value = "添加部门";
 
-}
 
-/** 展开/折叠操作 */
 
-function toggleExpandAll() {
 
-  refreshTable.value = false;
 
-  isExpandAll.value = !isExpandAll.value;
 
-  nextTick(() => {
 
-    refreshTable.value = true;
 
-  });
 
-}
 
-/** 修改按钮操作 */
 
-function handleUpdate(row) {
 
-  reset();
 
-  listDeptExcludeChild(row.deptId).then(response => {
 
-    deptOptions.value = proxy.handleTree(response.data, "deptId");
 
-  });
 
-  getDept(row.deptId).then(response => {
 
-    form.value = response.data;
 
-    open.value = true;
 
-    title.value = "修改部门";
 
-  });
 
-}
 
-/** 提交按钮 */
 
-function submitForm() {
 
-  proxy.$refs["deptRef"].validate(valid => {
 
-    if (valid) {
 
-      if (form.value.deptId != undefined) {
 
-        updateDept(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("修改成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      } else {
 
-        addDept(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("新增成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      }
 
-    }
 
-  });
 
-}
 
-/** 删除按钮操作 */
 
-function handleDelete(row) {
 
-  proxy.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function() {
 
-    return delDept(row.deptId);
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("删除成功");
 
-  }).catch(() => {});
 
-}
 
-
 
-getList();
 
-</script>

+ 0 - 355
src/views/system/dict/data.vue
View File 

@@ -1,355 +0,0 @@
 
-<template>
 
-   <div class="app-container">
 
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
 
-         <el-form-item label="字典名称" prop="dictType">
 
-            <el-select v-model="queryParams.dictType">
 
-               <el-option
 
-                  v-for="item in typeOptions"
 
-                  :key="item.dictId"
 
-                  :label="item.dictName"
 
-                  :value="item.dictType"
 
-               />
 
-            </el-select>
 
-         </el-form-item>
 
-         <el-form-item label="字典标签" prop="dictLabel">
 
-            <el-input
 
-               v-model="queryParams.dictLabel"
 
-               placeholder="请输入字典标签"
 
-               clearable
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="状态" prop="status">
 
-            <el-select v-model="queryParams.status" placeholder="数据状态" clearable>
 
-               <el-option
 
-                  v-for="dict in sys_normal_disable"
 
-                  :key="dict.value"
 
-                  :label="dict.label"
 
-                  :value="dict.value"
 
-               />
 
-            </el-select>
 
-         </el-form-item>
 
-         <el-form-item>
 
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
 
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
 
-         </el-form-item>
 
-      </el-form>
 
-
 
-      <el-row :gutter="10" class="mb8">
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="primary"
 
-               plain
 
-               icon="Plus"
 
-               @click="handleAdd"
 
-               v-hasPermi="['system:dict:add']"
 
-            >新增</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="success"
 
-               plain
 
-               icon="Edit"
 
-               :disabled="single"
 
-               @click="handleUpdate"
 
-               v-hasPermi="['system:dict:edit']"
 
-            >修改</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="danger"
 
-               plain
 
-               icon="Delete"
 
-               :disabled="multiple"
 
-               @click="handleDelete"
 
-               v-hasPermi="['system:dict:remove']"
 
-            >删除</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="warning"
 
-               plain
 
-               icon="Download"
 
-               @click="handleExport"
 
-               v-hasPermi="['system:dict:export']"
 
-            >导出</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="warning"
 
-               plain
 
-               icon="Close"
 
-               @click="handleClose"
 
-            >关闭</el-button>
 
-         </el-col>
 
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
 
-      </el-row>
 
-
 
-      <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
 
-         <el-table-column type="selection" width="55" align="center" />
 
-         <el-table-column label="字典编码" align="center" prop="dictCode" />
 
-         <el-table-column label="字典标签" align="center" prop="dictLabel">
 
-            <template #default="scope">
 
-               <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{ scope.row.dictLabel }}</span>
 
-               <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{ scope.row.dictLabel }}</el-tag>
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="字典键值" align="center" prop="dictValue" />
 
-         <el-table-column label="字典排序" align="center" prop="dictSort" />
 
-         <el-table-column label="状态" align="center" prop="status">
 
-            <template #default="scope">
 
-               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
 
-         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
 
-            <template #default="scope">
 
-               <span>{{ parseTime(scope.row.createTime) }}</span>
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
 
-            <template #default="scope">
 
-               <el-button
 
-                  type="text"
 
-                  icon="Edit"
 
-                  @click="handleUpdate(scope.row)"
 
-                  v-hasPermi="['system:dict:edit']"
 
-               >修改</el-button>
 
-               <el-button
 
-                  type="text"
 
-                  icon="Delete"
 
-                  @click="handleDelete(scope.row)"
 
-                  v-hasPermi="['system:dict:remove']"
 
-               >删除</el-button>
 
-            </template>
 
-         </el-table-column>
 
-      </el-table>
 
-
 
-      <pagination
 
-         v-show="total > 0"
 
-         :total="total"
 
-         v-model:page="queryParams.pageNum"
 
-         v-model:limit="queryParams.pageSize"
 
-         @pagination="getList"
 
-      />
 
-
 
-      <!-- 添加或修改参数配置对话框 -->
 
-      <el-dialog :title="title" v-model="open" width="500px" append-to-body>
 
-         <el-form ref="dataRef" :model="form" :rules="rules" label-width="80px">
 
-            <el-form-item label="字典类型">
 
-               <el-input v-model="form.dictType" :disabled="true" />
 
-            </el-form-item>
 
-            <el-form-item label="数据标签" prop="dictLabel">
 
-               <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
 
-            </el-form-item>
 
-            <el-form-item label="数据键值" prop="dictValue">
 
-               <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
 
-            </el-form-item>
 
-            <el-form-item label="样式属性" prop="cssClass">
 
-               <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
 
-            </el-form-item>
 
-            <el-form-item label="显示排序" prop="dictSort">
 
-               <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
 
-            </el-form-item>
 
-            <el-form-item label="回显样式" prop="listClass">
 
-               <el-select v-model="form.listClass">
 
-                  <el-option
 
-                     v-for="item in listClassOptions"
 
-                     :key="item.value"
 
-                     :label="item.label + '(' + item.value + ')'"
 
-                     :value="item.value"
 
-                  ></el-option>
 
-               </el-select>
 
-            </el-form-item>
 
-            <el-form-item label="状态" prop="status">
 
-               <el-radio-group v-model="form.status">
 
-                  <el-radio
 
-                     v-for="dict in sys_normal_disable"
 
-                     :key="dict.value"
 
-                     :label="dict.value"
 
-                  >{{ dict.label }}</el-radio>
 
-               </el-radio-group>
 
-            </el-form-item>
 
-            <el-form-item label="备注" prop="remark">
 
-               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
 
-            </el-form-item>
 
-         </el-form>
 
-         <template #footer>
 
-            <div class="dialog-footer">
 
-               <el-button type="primary" @click="submitForm">确 定</el-button>
 
-               <el-button @click="cancel">取 消</el-button>
 
-            </div>
 
-         </template>
 
-      </el-dialog>
 
-   </div>
 
-</template>
 
-
 
-<script setup name="Data">
 
-import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
 
-import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
 
-
 
-const { proxy } = getCurrentInstance();
 
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 
-
 
-const dataList = ref([]);
 
-const open = ref(false);
 
-const loading = ref(true);
 
-const showSearch = ref(true);
 
-const ids = ref([]);
 
-const single = ref(true);
 
-const multiple = ref(true);
 
-const total = ref(0);
 
-const title = ref("");
 
-const defaultDictType = ref("");
 
-const typeOptions = ref([]);
 
-const route = useRoute();
 
-// 数据标签回显样式
 
-const listClassOptions = ref([
 
-  { value: "default", label: "默认" }, 
-  { value: "primary", label: "主要" }, 
-  { value: "success", label: "成功" },
 
-  { value: "info", label: "信息" },
 
-  { value: "warning", label: "警告" },
 
-  { value: "danger", label: "危险" }
 
-]);
 
-
 
-const data = reactive({
 
-  form: {},
 
-  queryParams: {
 
-    pageNum: 1,
 
-    pageSize: 10,
 
-    dictName: undefined,
 
-    dictType: undefined,
 
-    status: undefined
 
-  },
 
-  rules: {
 
-    dictLabel: [{ required: true, message: "数据标签不能为空", trigger: "blur" }],
 
-    dictValue: [{ required: true, message: "数据键值不能为空", trigger: "blur" }],
 
-    dictSort: [{ required: true, message: "数据顺序不能为空", trigger: "blur" }]
 
-  }
 
-});
 
-
 
-const { queryParams, form, rules } = toRefs(data);
 
-
 
-/** 查询字典类型详细 */
 
-function getTypes(dictId) {
 
-  getType(dictId).then(response => {
 
-    queryParams.value.dictType = response.data.dictType;
 
-    defaultDictType.value = response.data.dictType;
 
-    getList();
 
-  });
 
-}
 
-
 
-/** 查询字典类型列表 */
 
-function getTypeList() {
 
-  getDictOptionselect().then(response => {
 
-    typeOptions.value = response.data;
 
-  });
 
-}
 
-/** 查询字典数据列表 */
 
-function getList() {
 
-  loading.value = true;
 
-  listData(queryParams.value).then(response => {
 
-    dataList.value = response.rows;
 
-    total.value = response.total;
 
-    loading.value = false;
 
-  });
 
-}
 
-/** 取消按钮 */
 
-function cancel() {
 
-  open.value = false;
 
-  reset();
 
-}
 
-/** 表单重置 */
 
-function reset() {
 
-  form.value = {
 
-    dictCode: undefined,
 
-    dictLabel: undefined,
 
-    dictValue: undefined,
 
-    cssClass: undefined,
 
-    listClass: "default",
 
-    dictSort: 0,
 
-    status: "0",
 
-    remark: undefined
 
-  };
 
-  proxy.resetForm("dataRef");
 
-}
 
-/** 搜索按钮操作 */
 
-function handleQuery() {
 
-  queryParams.value.pageNum = 1;
 
-  getList();
 
-}
 
-/** 返回按钮操作 */
 
-function handleClose() {
 
-  const obj = { path: "/system/dict" };
 
-  proxy.$tab.closeOpenPage(obj);
 
-}
 
-/** 重置按钮操作 */
 
-function resetQuery() {
 
-  proxy.resetForm("queryRef");
 
-  queryParams.value.dictType = defaultDictType;
 
-  handleQuery();
 
-}
 
-/** 新增按钮操作 */
 
-function handleAdd() {
 
-  reset();
 
-  open.value = true;
 
-  title.value = "添加字典数据";
 
-  form.value.dictType = queryParams.value.dictType;
 
-}
 
-/** 多选框选中数据 */
 
-function handleSelectionChange(selection) {
 
-  ids.value = selection.map(item => item.dictCode);
 
-  single.value = selection.length != 1;
 
-  multiple.value = !selection.length;
 
-}
 
-/** 修改按钮操作 */
 
-function handleUpdate(row) {
 
-  reset();
 
-  const dictCode = row.dictCode || ids.value;
 
-  getData(dictCode).then(response => {
 
-    form.value = response.data;
 
-    open.value = true;
 
-    title.value = "修改字典数据";
 
-  });
 
-}
 
-/** 提交按钮 */
 
-function submitForm() {
 
-  proxy.$refs["dataRef"].validate(valid => {
 
-    if (valid) {
 
-      if (form.value.dictCode != undefined) {
 
-        updateData(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("修改成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      } else {
 
-        addData(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("新增成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      }
 
-    }
 
-  });
 
-}
 
-/** 删除按钮操作 */
 
-function handleDelete(row) {
 
-  const dictCodes = row.dictCode || ids.value;
 
-  proxy.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？').then(function() {
 
-    return delData(dictCodes);
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("删除成功");
 
-  }).catch(() => {});
 
-}
 
-/** 导出按钮操作 */
 
-function handleExport() {
 
-  proxy.download("system/dict/data/export", {
 
-    ...queryParams.value
 
-  }, `dict_data_${new Date().getTime()}.xlsx`);
 
-}
 
-
 
-getTypes(route.params && route.params.dictId);
 
-getTypeList();
 
-</script>

+ 0 - 320
src/views/system/dict/index.vue
View File 

@@ -1,320 +0,0 @@
 
-<template>
 
-   <div class="app-container">
 
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
 
-         <el-form-item label="字典名称" prop="dictName">
 
-            <el-input
 
-               v-model="queryParams.dictName"
 
-               placeholder="请输入字典名称"
 
-               clearable
 
-               style="width: 240px"
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="字典类型" prop="dictType">
 
-            <el-input
 
-               v-model="queryParams.dictType"
 
-               placeholder="请输入字典类型"
 
-               clearable
 
-               style="width: 240px"
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="状态" prop="status">
 
-            <el-select
 
-               v-model="queryParams.status"
 
-               placeholder="字典状态"
 
-               clearable
 
-               style="width: 240px"
 
-            >
 
-               <el-option
 
-                  v-for="dict in sys_normal_disable"
 
-                  :key="dict.value"
 
-                  :label="dict.label"
 
-                  :value="dict.value"
 
-               />
 
-            </el-select>
 
-         </el-form-item>
 
-         <el-form-item label="创建时间" style="width: 308px">
 
-            <el-date-picker
 
-               v-model="dateRange"
 
-               value-format="YYYY-MM-DD"
 
-               type="daterange"
 
-               range-separator="-"
 
-               start-placeholder="开始日期"
 
-               end-placeholder="结束日期"
 
-            ></el-date-picker>
 
-         </el-form-item>
 
-         <el-form-item>
 
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
 
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
 
-         </el-form-item>
 
-      </el-form>
 
-
 
-      <el-row :gutter="10" class="mb8">
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="primary"
 
-               plain
 
-               icon="Plus"
 
-               @click="handleAdd"
 
-               v-hasPermi="['system:dict:add']"
 
-            >新增</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="success"
 
-               plain
 
-               icon="Edit"
 
-               :disabled="single"
 
-               @click="handleUpdate"
 
-               v-hasPermi="['system:dict:edit']"
 
-            >修改</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="danger"
 
-               plain
 
-               icon="Delete"
 
-               :disabled="multiple"
 
-               @click="handleDelete"
 
-               v-hasPermi="['system:dict:remove']"
 
-            >删除</el-button>
 
-         </el-col>
 
-         <!-- <el-col :span="1.5">
 
-            <el-button
 
-               type="warning"
 
-               plain
 
-               icon="Download"
 
-               @click="handleExport"
 
-               v-hasPermi="['system:dict:export']"
 
-            >导出</el-button>
 
-         </el-col> -->
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="danger"
 
-               plain
 
-               icon="Refresh"
 
-               @click="handleRefreshCache"
 
-               v-hasPermi="['system:dict:remove']"
 
-            >刷新缓存</el-button>
 
-         </el-col>
 
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
 
-      </el-row>
 
-
 
-      <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
 
-         <el-table-column type="selection" width="55" align="center" />
 
-         <el-table-column label="字典编号" align="center" prop="dictId" />
 
-         <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true"/>
 
-         <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
 
-            <template #default="scope">
 
-               <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
 
-                  <span>{{ scope.row.dictType }}</span>
 
-               </router-link>
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="状态" align="center" prop="status">
 
-            <template #default="scope">
 
-               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
 
-         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
 
-            <template #default="scope">
 
-               <span>{{ parseTime(scope.row.createTime) }}</span>
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
-            <template #default="scope">
 
-               <el-button
 
-                  type="text"
 
-                  icon="Edit"
 
-                  @click="handleUpdate(scope.row)"
 
-                  v-hasPermi="['system:dict:edit']"
 
-               >修改</el-button>
 
-               <el-button
 
-                  type="text"
 
-                  icon="Delete"
 
-                  @click="handleDelete(scope.row)"
 
-                  v-hasPermi="['system:dict:remove']"
 
-               >删除</el-button>
 
-            </template>
 
-         </el-table-column>
 
-      </el-table>
 
-
 
-      <pagination
 
-         v-show="total > 0"
 
-         :total="total"
 
-         v-model:page="queryParams.pageNum"
 
-         v-model:limit="queryParams.pageSize"
 
-         @pagination="getList"
 
-      />
 
-
 
-      <!-- 添加或修改参数配置对话框 -->
 
-      <el-dialog :title="title" v-model="open" width="500px" append-to-body>
 
-         <el-form ref="dictRef" :model="form" :rules="rules" label-width="80px">
 
-            <el-form-item label="字典名称" prop="dictName">
 
-               <el-input v-model="form.dictName" placeholder="请输入字典名称" />
 
-            </el-form-item>
 
-            <el-form-item label="字典类型" prop="dictType">
 
-               <el-input v-model="form.dictType" placeholder="请输入字典类型" />
 
-            </el-form-item>
 
-            <el-form-item label="状态" prop="status">
 
-               <el-radio-group v-model="form.status">
 
-                  <el-radio
 
-                     v-for="dict in sys_normal_disable"
 
-                     :key="dict.value"
 
-                     :label="dict.value"
 
-                  >{{ dict.label }}</el-radio>
 
-               </el-radio-group>
 
-            </el-form-item>
 
-            <el-form-item label="备注" prop="remark">
 
-               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
 
-            </el-form-item>
 
-         </el-form>
 
-         <template #footer>
 
-            <div class="dialog-footer">
 
-               <el-button type="primary" @click="submitForm">确 定</el-button>
 
-               <el-button @click="cancel">取 消</el-button>
 
-            </div>
 
-         </template>
 
-      </el-dialog>
 
-   </div>
 
-</template>
 
-
 
-<script setup name="Dict">
 
-import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
 
-
 
-const { proxy } = getCurrentInstance();
 
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 
-
 
-const typeList = ref([]);
 
-const open = ref(false);
 
-const loading = ref(true);
 
-const showSearch = ref(true);
 
-const ids = ref([]);
 
-const single = ref(true);
 
-const multiple = ref(true);
 
-const total = ref(0);
 
-const title = ref("");
 
-const dateRange = ref([]);
 
-
 
-const data = reactive({
 
-  form: {},
 
-  queryParams: {
 
-    pageNum: 1,
 
-    pageSize: 10,
 
-    dictName: undefined,
 
-    dictType: undefined,
 
-    status: undefined
 
-  },
 
-  rules: {
 
-    dictName: [{ required: true, message: "字典名称不能为空", trigger: "blur" }],
 
-    dictType: [{ required: true, message: "字典类型不能为空", trigger: "blur" }]
 
-  },
 
-});
 
-
 
-const { queryParams, form, rules } = toRefs(data);
 
-
 
-/** 查询字典类型列表 */
 
-function getList() {
 
-  loading.value = true;
 
-  listType(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
 
-    typeList.value = response.data.rows;
 
-    total.value = response.data.total;
 
-    loading.value = false;
 
-  });
 
-}
 
-/** 取消按钮 */
 
-function cancel() {
 
-  open.value = false;
 
-  reset();
 
-}
 
-/** 表单重置 */
 
-function reset() {
 
-  form.value = {
 
-    dictId: undefined,
 
-    dictName: undefined,
 
-    dictType: undefined,
 
-    status: "0",
 
-    remark: undefined
 
-  };
 
-  proxy.resetForm("dictRef");
 
-}
 
-/** 搜索按钮操作 */
 
-function handleQuery() {
 
-  queryParams.value.pageNum = 1;
 
-  getList();
 
-}
 
-/** 重置按钮操作 */
 
-function resetQuery() {
 
-  dateRange.value = [];
 
-  proxy.resetForm("queryRef");
 
-  handleQuery();
 
-}
 
-/** 新增按钮操作 */
 
-function handleAdd() {
 
-  reset();
 
-  open.value = true;
 
-  title.value = "添加字典类型";
 
-}
 
-/** 多选框选中数据 */
 
-function handleSelectionChange(selection) {
 
-  ids.value = selection.map(item => item.dictId);
 
-  single.value = selection.length != 1;
 
-  multiple.value = !selection.length;
 
-}
 
-/** 修改按钮操作 */
 
-function handleUpdate(row) {
 
-  reset();
 
-  const dictId = row.dictId || ids.value;
 
-  getType(dictId).then(response => {
 
-    form.value = response.data;
 
-    open.value = true;
 
-    title.value = "修改字典类型";
 
-  });
 
-}
 
-/** 提交按钮 */
 
-function submitForm() {
 
-  proxy.$refs["dictRef"].validate(valid => {
 
-    if (valid) {
 
-      if (form.value.dictId != undefined) {
 
-        updateType(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("修改成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      } else {
 
-        addType(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("新增成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      }
 
-    }
 
-  });
 
-}
 
-/** 删除按钮操作 */
 
-function handleDelete(row) {
 
-  const dictIds = row.dictId || ids.value;
 
-  proxy.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？').then(function() {
 
-    return delType(dictIds);
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("删除成功");
 
-  }).catch(() => {});
 
-}
 
-/** 导出按钮操作 */
 
-function handleExport() {
 
-  proxy.download("system/dict/type/export", {
 
-    ...queryParams.value
 
-  }, `dict_${new Date().getTime()}.xlsx`);
 
-}
 
-/** 刷新缓存按钮操作 */
 
-function handleRefreshCache() {
 
-  refreshCache().then(() => {
 
-    proxy.$modal.msgSuccess("刷新成功");
 
-  });
 
-}
 
-
 
-getList();
 
-</script>

+ 0 - 197
src/views/system/logininfor/index.vue
View File 

@@ -1,197 +0,0 @@
 
-<template>
 
-   <div class="app-container">
 
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
 
-         <el-form-item label="登录地址" prop="ipaddr">
 
-            <el-input
 
-               v-model="queryParams.ipaddr"
 
-               placeholder="请输入登录地址"
 
-               clearable
 
-               style="width: 240px;"
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="用户名称" prop="userName">
 
-            <el-input
 
-               v-model="queryParams.userName"
 
-               placeholder="请输入用户名称"
 
-               clearable
 
-               style="width: 240px;"
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="状态" prop="status">
 
-            <el-select
 
-               v-model="queryParams.status"
 
-               placeholder="登录状态"
 
-               clearable
 
-               style="width: 240px"
 
-            >
 
-               <el-option
 
-                  v-for="dict in sys_common_status"
 
-                  :key="dict.value"
 
-                  :label="dict.label"
 
-                  :value="dict.value"
 
-               />
 
-            </el-select>
 
-         </el-form-item>
 
-         <el-form-item label="登录时间" style="width: 308px">
 
-            <el-date-picker
 
-               v-model="dateRange"
 
-               value-format="YYYY-MM-DD"
 
-               type="daterange"
 
-               range-separator="-"
 
-               start-placeholder="开始日期"
 
-               end-placeholder="结束日期"
 
-            ></el-date-picker>
 
-         </el-form-item>
 
-         <el-form-item>
 
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
 
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
 
-         </el-form-item>
 
-      </el-form>
 
-
 
-      <el-row :gutter="10" class="mb8">
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="danger"
 
-               plain
 
-               icon="Delete"
 
-               :disabled="multiple"
 
-               @click="handleDelete"
 
-               v-hasPermi="['monitor:logininfor:remove']"
 
-            >删除</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="danger"
 
-               plain
 
-               icon="Delete"
 
-               @click="handleClean"
 
-               v-hasPermi="['monitor:logininfor:remove']"
 
-            >清空</el-button>
 
-         </el-col>
 
-         <!-- <el-col :span="1.5">
 
-            <el-button
 
-               type="warning"
 
-               plain
 
-               icon="Download"
 
-               @click="handleExport"
 
-               v-hasPermi="['monitor:logininfor:export']"
 
-            >导出</el-button>
 
-         </el-col> -->
 
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
 
-      </el-row>
 
-
 
-      <el-table ref="logininforRef" v-loading="loading" :data="logininforList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
 
-         <el-table-column type="selection" width="55" align="center" />
 
-         <el-table-column label="访问编号" align="center" prop="infoId" />
 
-         <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
 
-         <el-table-column label="登录状态" align="center" prop="status">
 
-            <template #default="scope">
 
-               <dict-tag :options="sys_common_status" :value="scope.row.status" />
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="描述" align="center" prop="msg" />
 
-         <el-table-column label="访问时间" align="center" prop="accessTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
 
-            <template #default="scope">
 
-               <span>{{ parseTime(scope.row.accessTime) }}</span>
 
-            </template>
 
-         </el-table-column>
 
-      </el-table>
 
-
 
-      <pagination
 
-         v-show="total > 0"
 
-         :total="total"
 
-         v-model:page="queryParams.pageNum"
 
-         v-model:limit="queryParams.pageSize"
 
-         @pagination="getList"
 
-      />
 
-   </div>
 
-</template>
 
-
 
-<script setup name="Logininfor">
 
-import { list, delLogininfor, cleanLogininfor } from "@/api/system/logininfor";
 
-
 
-const { proxy } = getCurrentInstance();
 
-const { sys_common_status } = proxy.useDict("sys_common_status");
 
-
 
-const logininforList = ref([]);
 
-const loading = ref(true);
 
-const showSearch = ref(true);
 
-const ids = ref([]);
 
-const multiple = ref(true);
 
-const total = ref(0);
 
-const dateRange = ref([]);
 
-const defaultSort = ref({ prop: "loginTime", order: "descending" });
 
-
 
-// 查询参数
 
-const queryParams = ref({
 
-  pageNum: 1,
 
-  pageSize: 10,
 
-  ipaddr: undefined,
 
-  userName: undefined,
 
-  status: undefined,
 
-  orderByColumn: undefined,
 
-  isAsc: undefined
 
-});
 
-
 
-/** 查询登录日志列表 */
 
-function getList() {
 
-  loading.value = true;
 
-  list(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
 
-    logininforList.value = response.data.rows;
 
-    total.value = response.data.total;
 
-    loading.value = false;
 
-  });
 
-}
 
-/** 搜索按钮操作 */
 
-function handleQuery() {
 
-  queryParams.value.pageNum = 1;
 
-  getList();
 
-}
 
-/** 重置按钮操作 */
 
-function resetQuery() {
 
-  dateRange.value = [];
 
-  proxy.resetForm("queryRef");
 
-  proxy.$refs["logininforRef"].sort(defaultSort.value.prop, defaultSort.value.order);
 
-  handleQuery();
 
-}
 
-/** 多选框选中数据 */
 
-function handleSelectionChange(selection) {
 
-  ids.value = selection.map(item => item.infoId);
 
-  multiple.value = !selection.length;
 
-}
 
-/** 排序触发事件 */
 
-function handleSortChange(column, prop, order) {
 
-  queryParams.value.orderByColumn = column.prop;
 
-  queryParams.value.isAsc = column.order;
 
-  getList();
 
-}
 
-/** 删除按钮操作 */
 
-function handleDelete(row) {
 
-  const infoIds = row.infoId || ids.value;
 
-  proxy.$modal.confirm('是否确认删除访问编号为"' + infoIds + '"的数据项?').then(function () {
 
-    return delLogininfor(infoIds);
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("删除成功");
 
-  }).catch(() => {});
 
-}
 
-/** 清空按钮操作 */
 
-function handleClean() {
 
-  proxy.$modal.confirm("是否确认清空所有登录日志数据项?").then(function () {
 
-    return cleanLogininfor();
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("清空成功");
 
-  }).catch(() => {});
 
-}
 
-/** 导出按钮操作 */
 
-function handleExport() {
 
-  proxy.download("system/logininfor/export", {
 
-    ...queryParams.value,
 
-  }, `config_${new Date().getTime()}.xlsx`);
 
-}
 
-
 
-getList();
 
-</script>

+ 0 - 451
src/views/system/menu/index.vue
View File 

@@ -1,451 +0,0 @@
 
-<template>
 
-   <div class="app-container">
 
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
 
-         <el-form-item label="菜单名称" prop="menuName">
 
-            <el-input
 
-               v-model="queryParams.menuName"
 
-               placeholder="请输入菜单名称"
 
-               clearable
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="状态" prop="status">
 
-            <el-select v-model="queryParams.status" placeholder="菜单状态" clearable>
 
-               <el-option
 
-                  v-for="dict in sys_normal_disable"
 
-                  :key="dict.value"
 
-                  :label="dict.label"
 
-                  :value="dict.value"
 
-               />
 
-            </el-select>
 
-         </el-form-item>
 
-         <el-form-item>
 
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
 
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
 
-         </el-form-item>
 
-      </el-form>
 
-
 
-      <el-row :gutter="10" class="mb8">
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="primary"
 
-               plain
 
-               icon="Plus"
 
-               @click="handleAdd"
 
-               v-hasPermi="['system:menu:add']"
 
-            >新增</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button 
-               type="info"
 
-               plain
 
-               icon="Sort"
 
-               @click="toggleExpandAll"
 
-            >展开/折叠</el-button>
 
-         </el-col>
 
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
 
-      </el-row>
 
-
 
-      <el-table
 
-         v-if="refreshTable"
 
-         v-loading="loading"
 
-         :data="menuList"
 
-         row-key="menuId"
 
-         :default-expand-all="isExpandAll"
 
-         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
 
-      >
 
-         <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
 
-         <el-table-column prop="icon" label="图标" align="center" width="100">
 
-            <template #default="scope">
 
-               <svg-icon :icon-class="scope.row.icon" />
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column prop="orderNum" label="排序" width="60"></el-table-column>
 
-         <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
 
-         <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
 
-         <el-table-column prop="status" label="状态" width="80">
 
-            <template #default="scope">
 
-               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="创建时间" align="center" prop="createTime">
 
-            <template #default="scope">
 
-               <span>{{ parseTime(scope.row.createTime) }}</span>
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
 
-            <template #default="scope">
 
-               <el-button
 
-                  type="text"
 
-                  icon="Edit"
 
-                  @click="handleUpdate(scope.row)"
 
-                  v-hasPermi="['system:menu:edit']"
 
-               >修改</el-button>
 
-               <el-button
 
-                  type="text"
 
-                  icon="Plus"
 
-                  @click="handleAdd(scope.row)"
 
-                  v-hasPermi="['system:menu:add']"
 
-               >新增</el-button>
 
-               <el-button
 
-                  type="text"
 
-                  icon="Delete"
 
-                  @click="handleDelete(scope.row)"
 
-                  v-hasPermi="['system:menu:remove']"
 
-               >删除</el-button>
 
-            </template>
 
-         </el-table-column>
 
-      </el-table>
 
-
 
-      <!-- 添加或修改菜单对话框 -->
 
-      <el-dialog :title="title" v-model="open" width="680px" append-to-body>
 
-         <el-form ref="menuRef" :model="form" :rules="rules" label-width="100px">
 
-            <el-row>
 
-               <el-col :span="24">
 
-                  <el-form-item label="上级菜单">
 
-                     <el-tree-select
 
-                        v-model="form.parentId"
 
-                        :data="menuOptions"
 
-                        :props="{ value: 'menuId', label: 'menuName', children: 'children' }"
 
-                        value-key="menuId"
 
-                        placeholder="选择上级菜单"
 
-                        check-strictly
 
-                     />
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="24">
 
-                  <el-form-item label="菜单类型" prop="menuType">
 
-                     <el-radio-group v-model="form.menuType">
 
-                        <el-radio label="M">目录</el-radio>
 
-                        <el-radio label="C">菜单</el-radio>
 
-                        <el-radio label="F">按钮</el-radio>
 
-                     </el-radio-group>
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="24" v-if="form.menuType != 'F'">
 
-                  <el-form-item label="菜单图标" prop="icon">
 
-                     <el-popover
 
-                        placement="bottom-start"
 
-                        :width="540"
 
-                        v-model:visible="showChooseIcon"
 
-                        trigger="click"
 
-                        @show="showSelectIcon"
 
-                     >
 
-                        <template #reference>
 
-                           <el-input v-model="form.icon" placeholder="点击选择图标" @click="showSelectIcon" v-click-outside="hideSelectIcon" readonly>
 
-                              <template #prefix>
 
-                                 <svg-icon
 
-                                    v-if="form.icon"
 
-                                    :icon-class="form.icon"
 
-                                    class="el-input__icon"
 
-                                    style="height: 32px;width: 16px;"
 
-                                 />
 
-                                 <el-icon v-else style="height: 32px;width: 16px;"><search /></el-icon>
 
-                              </template>
 
-                           </el-input>
 
-                        </template>
 
-                        <icon-select ref="iconSelectRef" @selected="selected" />
 
-                     </el-popover>
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="菜单名称" prop="menuName">
 
-                     <el-input v-model="form.menuName" placeholder="请输入菜单名称" />
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="显示排序" prop="orderNum">
 
-                     <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12" v-if="form.menuType != 'F'">
 
-                  <el-form-item>
 
-                     <template #label>
 
-                        <span>
 
-                           <el-tooltip content="选择是外链则路由地址需要以`http(s)://`开头" placement="top">
 
-                              <el-icon><question-filled /></el-icon>
 
-                           </el-tooltip>是否外链
 
-                        </span>
 
-                     </template>
 
-                     <el-radio-group v-model="form.isFrame">
 
-                        <el-radio label="0">是</el-radio>
 
-                        <el-radio label="1">否</el-radio>
 
-                     </el-radio-group>
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12" v-if="form.menuType != 'F'">
 
-                  <el-form-item prop="path">
 
-                     <template #label>
 
-                        <span>
 
-                           <el-tooltip content="访问的路由地址，如：`user`，如外网地址需内链访问则以`http(s)://`开头" placement="top">
 
-                              <el-icon><question-filled /></el-icon>
 
-                           </el-tooltip>
 
-                           路由地址
 
-                        </span>
 
-                     </template>
 
-                     <el-input v-model="form.path" placeholder="请输入路由地址" />
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12" v-if="form.menuType == 'C'">
 
-                  <el-form-item prop="component">
 
-                     <template #label>
 
-                        <span>
 
-                           <el-tooltip content="访问的组件路径，如：`system/user/index`，默认在`views`目录下" placement="top">
 
-                              <el-icon><question-filled /></el-icon>
 
-                           </el-tooltip>
 
-                           组件路径
 
-                        </span>
 
-                     </template>
 
-                     <el-input v-model="form.component" placeholder="请输入组件路径" />
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12" v-if="form.menuType != 'M'">
 
-                  <el-form-item>
 
-                     <el-input v-model="form.perms" placeholder="请输入权限标识" maxlength="100" />
 
-                     <template #label>
 
-                        <span>
 
-                           <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasPermi('system:user:list')`)" placement="top">
 
-                              <el-icon><question-filled /></el-icon>
 
-                           </el-tooltip>
 
-                           权限字符
 
-                        </span>
 
-                     </template>
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12" v-if="form.menuType == 'C'">
 
-                  <el-form-item>
 
-                     <el-input v-model="form.query" placeholder="请输入路由参数" maxlength="255" />
 
-                     <template #label>
 
-                        <span>
 
-                           <el-tooltip content='访问路由的默认传递参数，如：`{"id": 1, "name": "ry"}`' placement="top">
 
-                              <el-icon><question-filled /></el-icon>
 
-                           </el-tooltip>
 
-                           路由参数
 
-                        </span>
 
-                     </template>
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12" v-if="form.menuType == 'C'">
 
-                  <el-form-item>
 
-                     <template #label>
 
-                        <span>
 
-                           <el-tooltip content="选择是则会被`keep-alive`缓存，需要匹配组件的`name`和地址保持一致" placement="top">
 
-                              <el-icon><question-filled /></el-icon>
 
-                           </el-tooltip>
 
-                           是否缓存
 
-                        </span>
 
-                     </template>
 
-                     <el-radio-group v-model="form.isCache">
 
-                        <el-radio label="0">缓存</el-radio>
 
-                        <el-radio label="1">不缓存</el-radio>
 
-                     </el-radio-group>
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12" v-if="form.menuType != 'F'">
 
-                  <el-form-item>
 
-                     <template #label>
 
-                        <span>
 
-                           <el-tooltip content="选择隐藏则路由将不会出现在侧边栏，但仍然可以访问" placement="top">
 
-                              <el-icon><question-filled /></el-icon>
 
-                           </el-tooltip>
 
-                           显示状态
 
-                        </span>
 
-                     </template>
 
-                     <el-radio-group v-model="form.visible">
 
-                        <el-radio
 
-                           v-for="dict in sys_show_hide"
 
-                           :key="dict.value"
 
-                           :label="dict.value"
 
-                        >{{ dict.label }}</el-radio>
 
-                     </el-radio-group>
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12" v-if="form.menuType != 'F'">
 
-                  <el-form-item>
 
-                     <template #label>
 
-                        <span>
 
-                           <el-tooltip content="选择停用则路由将不会出现在侧边栏，也不能被访问" placement="top">
 
-                              <el-icon><question-filled /></el-icon>
 
-                           </el-tooltip>
 
-                           菜单状态
 
-                        </span>
 
-                     </template>
 
-                     <el-radio-group v-model="form.status">
 
-                        <el-radio
 
-                           v-for="dict in sys_normal_disable"
 
-                           :key="dict.value"
 
-                           :label="dict.value"
 
-                        >{{ dict.label }}</el-radio>
 
-                     </el-radio-group>
 
-                  </el-form-item>
 
-               </el-col>
 
-            </el-row>
 
-         </el-form>
 
-         <template #footer>
 
-            <div class="dialog-footer">
 
-               <el-button type="primary" @click="submitForm">确 定</el-button>
 
-               <el-button @click="cancel">取 消</el-button>
 
-            </div>
 
-         </template>
 
-      </el-dialog>
 
-   </div>
 
-</template>
 
-
 
-<script setup name="Menu">
 
-import { addMenu, delMenu, getMenu, listMenu, updateMenu } from "@/api/system/menu";
 
-import SvgIcon from "@/components/SvgIcon";
 
-import IconSelect from "@/components/IconSelect";
 
-import { ClickOutside as vClickOutside } from 'element-plus'
 
-
 
-const { proxy } = getCurrentInstance();
 
-const { sys_show_hide, sys_normal_disable } = proxy.useDict("sys_show_hide", "sys_normal_disable");
 
-
 
-const menuList = ref([]);
 
-const open = ref(false);
 
-const loading = ref(true);
 
-const showSearch = ref(true);
 
-const title = ref("");
 
-const menuOptions = ref([]);
 
-const isExpandAll = ref(false);
 
-const refreshTable = ref(true);
 
-const showChooseIcon = ref(false);
 
-const iconSelectRef = ref(null);
 
-
 
-const data = reactive({
 
-  form: {},
 
-  queryParams: {
 
-    menuName: undefined,
 
-    visible: undefined
 
-  },
 
-  rules: {
 
-    menuName: [{ required: true, message: "菜单名称不能为空", trigger: "blur" }],
 
-    orderNum: [{ required: true, message: "菜单顺序不能为空", trigger: "blur" }],
 
-    path: [{ required: true, message: "路由地址不能为空", trigger: "blur" }]
 
-  },
 
-});
 
-
 
-const { queryParams, form, rules } = toRefs(data);
 
-
 
-/** 查询菜单列表 */
 
-function getList() {
 
-  loading.value = true;
 
-  listMenu(queryParams.value).then(response => {
 
-    menuList.value = proxy.handleTree(response.data, "menuId");
 
-    loading.value = false;
 
-  });
 
-}
 
-/** 查询菜单下拉树结构 */
 
-function getTreeselect() {
 
-  menuOptions.value = [];
 
-  listMenu().then(response => {
 
-    const menu = { menuId: 0, menuName: "主类目", children: [] };
 
-    menu.children = proxy.handleTree(response.data, "menuId");
 
-    menuOptions.value.push(menu);
 
-  });
 
-}
 
-/** 取消按钮 */
 
-function cancel() {
 
-  open.value = false;
 
-  reset();
 
-}
 
-/** 表单重置 */
 
-function reset() {
 
-  form.value = {
 
-    menuId: undefined,
 
-    parentId: 0,
 
-    menuName: undefined,
 
-    icon: undefined,
 
-    menuType: "M",
 
-    orderNum: undefined,
 
-    isFrame: "1",
 
-    isCache: "0",
 
-    visible: "0",
 
-    status: "0"
 
-  };
 
-  proxy.resetForm("menuRef");
 
-}
 
-/** 展示下拉图标 */
 
-function showSelectIcon() {
 
-  iconSelectRef.value.reset();
 
-  showChooseIcon.value = true;
 
-}
 
-/** 选择图标 */
 
-function selected(name) {
 
-  form.value.icon = name;
 
-  showChooseIcon.value = false;
 
-}
 
-/** 图标外层点击隐藏下拉列表 */
 
-function hideSelectIcon() {
 
-  showChooseIcon.value = false;
 
-}
 
-/** 搜索按钮操作 */
 
-function handleQuery() {
 
-  getList();
 
-}
 
-/** 重置按钮操作 */
 
-function resetQuery() {
 
-  proxy.resetForm("queryRef");
 
-  handleQuery();
 
-}
 
-/** 新增按钮操作 */
 
-function handleAdd(row) {
 
-  reset();
 
-  getTreeselect();
 
-  if (row != null && row.menuId) {
 
-    form.value.parentId = row.menuId;
 
-  } else {
 
-    form.value.parentId = 0;
 
-  }
 
-  open.value = true;
 
-  title.value = "添加菜单";
 
-}
 
-/** 展开/折叠操作 */
 
-function toggleExpandAll() {
 
-  refreshTable.value = false;
 
-  isExpandAll.value = !isExpandAll.value;
 
-  nextTick(() => {
 
-    refreshTable.value = true;
 
-  });
 
-}
 
-/** 修改按钮操作 */
 
-async function handleUpdate(row) {
 
-  reset();
 
-  await getTreeselect();
 
-  getMenu(row.menuId).then(response => {
 
-    form.value = response.data;
 
-    open.value = true;
 
-    title.value = "修改菜单";
 
-  });
 
-}
 
-/** 提交按钮 */
 
-function submitForm() {
 
-  proxy.$refs["menuRef"].validate(valid => {
 
-    if (valid) {
 
-      if (form.value.menuId != undefined) {
 
-        updateMenu(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("修改成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      } else {
 
-        addMenu(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("新增成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      }
 
-    }
 
-  });
 
-}
 
-/** 删除按钮操作 */
 
-function handleDelete(row) {
 
-  proxy.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项?').then(function() {
 
-    return delMenu(row.menuId);
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("删除成功");
 
-  }).catch(() => {});
 
-}
 
-
 
-getList();
 
-</script>

+ 0 - 296
src/views/system/notice/index.vue
View File 

@@ -1,296 +0,0 @@
 
-<template>
 
-   <div class="app-container">
 
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
 
-         <el-form-item label="公告标题" prop="noticeTitle">
 
-            <el-input
 
-               v-model="queryParams.noticeTitle"
 
-               placeholder="请输入公告标题"
 
-               clearable
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="操作人员" prop="createBy">
 
-            <el-input
 
-               v-model="queryParams.createBy"
 
-               placeholder="请输入操作人员"
 
-               clearable
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="类型" prop="noticeType">
 
-            <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable>
 
-               <el-option
 
-                  v-for="dict in sys_notice_type"
 
-                  :key="dict.value"
 
-                  :label="dict.label"
 
-                  :value="dict.value"
 
-               />
 
-            </el-select>
 
-         </el-form-item>
 
-         <el-form-item>
 
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
 
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
 
-         </el-form-item>
 
-      </el-form>
 
-
 
-      <el-row :gutter="10" class="mb8">
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="primary"
 
-               plain
 
-               icon="Plus"
 
-               @click="handleAdd"
 
-               v-hasPermi="['system:notice:add']"
 
-            >新增</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="success"
 
-               plain
 
-               icon="Edit"
 
-               :disabled="single"
 
-               @click="handleUpdate"
 
-               v-hasPermi="['system:notice:edit']"
 
-            >修改</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="danger"
 
-               plain
 
-               icon="Delete"
 
-               :disabled="multiple"
 
-               @click="handleDelete"
 
-               v-hasPermi="['system:notice:remove']"
 
-            >删除</el-button>
 
-         </el-col>
 
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
 
-      </el-row>
 
-
 
-      <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
 
-         <el-table-column type="selection" width="55" align="center" />
 
-         <el-table-column label="序号" align="center" prop="noticeId" width="100" />
 
-         <el-table-column
 
-            label="公告标题"
 
-            align="center"
 
-            prop="noticeTitle"
 
-            :show-overflow-tooltip="true"
 
-         />
 
-         <el-table-column label="公告类型" align="center" prop="noticeType" width="100">
 
-            <template #default="scope">
 
-               <dict-tag :options="sys_notice_type" :value="scope.row.noticeType" />
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="状态" align="center" prop="status" width="100">
 
-            <template #default="scope">
 
-               <dict-tag :options="sys_notice_status" :value="scope.row.status" />
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="创建者" align="center" prop="createBy" width="100" />
 
-         <el-table-column label="创建时间" align="center" prop="createTime" width="100">
 
-            <template #default="scope">
 
-               <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
-            <template #default="scope">
 
-               <el-button
 
-                  type="text"
 
-                  icon="Edit"
 
-                  @click="handleUpdate(scope.row)"
 
-                  v-hasPermi="['system:notice:edit']"
 
-               >修改</el-button>
 
-               <el-button
 
-                  type="text"
 
-                  icon="Delete"
 
-                  @click="handleDelete(scope.row)"
 
-                  v-hasPermi="['system:notice:remove']"
 
-               >删除</el-button>
 
-            </template>
 
-         </el-table-column>
 
-      </el-table>
 
-
 
-      <pagination
 
-         v-show="total > 0"
 
-         :total="total"
 
-         v-model:page="queryParams.pageNum"
 
-         v-model:limit="queryParams.pageSize"
 
-         @pagination="getList"
 
-      />
 
-
 
-      <!-- 添加或修改公告对话框 -->
 
-      <el-dialog :title="title" v-model="open" width="780px" append-to-body>
 
-         <el-form ref="noticeRef" :model="form" :rules="rules" label-width="80px">
 
-            <el-row>
 
-               <el-col :span="12">
 
-                  <el-form-item label="公告标题" prop="noticeTitle">
 
-                     <el-input v-model="form.noticeTitle" placeholder="请输入公告标题" />
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="公告类型" prop="noticeType">
 
-                     <el-select v-model="form.noticeType" placeholder="请选择">
 
-                        <el-option
 
-                           v-for="dict in sys_notice_type"
 
-                           :key="dict.value"
 
-                           :label="dict.label"
 
-                           :value="dict.value"
 
-                        ></el-option>
 
-                     </el-select>
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="24">
 
-                  <el-form-item label="状态">
 
-                     <el-radio-group v-model="form.status">
 
-                        <el-radio
 
-                           v-for="dict in sys_notice_status"
 
-                           :key="dict.value"
 
-                           :label="dict.value"
 
-                        >{{ dict.label }}</el-radio>
 
-                     </el-radio-group>
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="24">
 
-                  <el-form-item label="内容">
 
-                     <el-input
 
-                        :rows="6"
 
-                        type="textarea"
 
-                        placeholder="请输入内容"
 
-                        v-model="form.noticeContent"
 
-                     />
 
-                  </el-form-item>
 
-               </el-col>
 
-            </el-row>
 
-         </el-form>
 
-         <template #footer>
 
-            <div class="dialog-footer">
 
-               <el-button type="primary" @click="submitForm">确 定</el-button>
 
-               <el-button @click="cancel">取 消</el-button>
 
-            </div>
 
-         </template>
 
-      </el-dialog>
 
-   </div>
 
-</template>
 
-
 
-<script setup name="Notice">
 
-import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api/system/notice";
 
-
 
-const { proxy } = getCurrentInstance();
 
-const { sys_notice_status, sys_notice_type } = proxy.useDict("sys_notice_status", "sys_notice_type");
 
-
 
-const noticeList = ref([]);
 
-const open = ref(false);
 
-const loading = ref(true);
 
-const showSearch = ref(true);
 
-const ids = ref([]);
 
-const single = ref(true);
 
-const multiple = ref(true);
 
-const total = ref(0);
 
-const title = ref("");
 
-
 
-const data = reactive({
 
-  form: {},
 
-  queryParams: {
 
-    pageNum: 1,
 
-    pageSize: 10,
 
-    noticeTitle: undefined,
 
-    createBy: undefined,
 
-    status: undefined
 
-  },
 
-  rules: {
 
-    noticeTitle: [{ required: true, message: "公告标题不能为空", trigger: "blur" }],
 
-    noticeType: [{ required: true, message: "公告类型不能为空", trigger: "change" }]
 
-  },
 
-});
 
-
 
-const { queryParams, form, rules } = toRefs(data);
 
-
 
-/** 查询公告列表 */
 
-function getList() {
 
-  loading.value = true;
 
-  listNotice(queryParams.value).then(response => {
 
-    noticeList.value = response.data.rows;
 
-    total.value = response.data.total;
 
-    loading.value = false;
 
-  });
 
-}
 
-/** 取消按钮 */
 
-function cancel() {
 
-  open.value = false;
 
-  reset();
 
-}
 
-/** 表单重置 */
 
-function reset() {
 
-  form.value = {
 
-    noticeId: undefined,
 
-    noticeTitle: undefined,
 
-    noticeType: undefined,
 
-    noticeContent: undefined,
 
-    status: "0"
 
-  };
 
-  proxy.resetForm("noticeRef");
 
-}
 
-/** 搜索按钮操作 */
 
-function handleQuery() {
 
-  queryParams.value.pageNum = 1;
 
-  getList();
 
-}
 
-/** 重置按钮操作 */
 
-function resetQuery() {
 
-  proxy.resetForm("queryRef");
 
-  handleQuery();
 
-}
 
-/** 多选框选中数据 */
 
-function handleSelectionChange(selection) {
 
-  ids.value = selection.map(item => item.noticeId);
 
-  single.value = selection.length != 1;
 
-  multiple.value = !selection.length;
 
-}
 
-/** 新增按钮操作 */
 
-function handleAdd() {
 
-  reset();
 
-  open.value = true;
 
-  title.value = "添加公告";
 
-}
 
-/**修改按钮操作 */
 
-function handleUpdate(row) {
 
-  reset();
 
-  const noticeId = row.noticeId || ids.value;
 
-  getNotice(noticeId).then(response => {
 
-    form.value = response.data;
 
-    open.value = true;
 
-    title.value = "修改公告";
 
-  });
 
-}
 
-/** 提交按钮 */
 
-function submitForm() {
 
-  proxy.$refs["noticeRef"].validate(valid => {
 
-    if (valid) {
 
-      if (form.value.noticeId != undefined) {
 
-        updateNotice(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("修改成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      } else {
 
-        addNotice(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("新增成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      }
 
-    }
 
-  });
 
-}
 
-/** 删除按钮操作 */
 
-function handleDelete(row) {
 
-  const noticeIds = row.noticeId || ids.value
 
-  proxy.$modal.confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项？').then(function() {
 
-    return delNotice(noticeIds);
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("删除成功");
 
-  }).catch(() => {});
 
-}
 
-
 
-getList();
 
-</script>

+ 0 - 286
src/views/system/operlog/index.vue
View File 

@@ -1,286 +0,0 @@
 
-<template>
 
-   <div class="app-container">
 
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
 
-         <el-form-item label="系统模块" prop="title">
 
-            <el-input
 
-               v-model="queryParams.title"
 
-               placeholder="请输入系统模块"
 
-               clearable
 
-               style="width: 240px;"
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="操作人员" prop="operName">
 
-            <el-input
 
-               v-model="queryParams.operName"
 
-               placeholder="请输入操作人员"
 
-               clearable
 
-               style="width: 240px;"
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="类型" prop="businessType">
 
-            <el-select
 
-               v-model="queryParams.businessType"
 
-               placeholder="操作类型"
 
-               clearable
 
-               style="width: 240px"
 
-            >
 
-               <el-option
 
-                  v-for="dict in sys_oper_type"
 
-                  :key="dict.value"
 
-                  :label="dict.label"
 
-                  :value="dict.value"
 
-               />
 
-            </el-select>
 
-         </el-form-item>
 
-         <el-form-item label="状态" prop="status">
 
-            <el-select
 
-               v-model="queryParams.status"
 
-               placeholder="操作状态"
 
-               clearable
 
-               style="width: 240px"
 
-            >
 
-               <el-option
 
-                  v-for="dict in sys_common_status"
 
-                  :key="dict.value"
 
-                  :label="dict.label"
 
-                  :value="dict.value"
 
-               />
 
-            </el-select>
 
-         </el-form-item>
 
-         <el-form-item label="操作时间" style="width: 308px">
 
-            <el-date-picker
 
-               v-model="dateRange"
 
-               value-format="YYYY-MM-DD"
 
-               type="daterange"
 
-               range-separator="-"
 
-               start-placeholder="开始日期"
 
-               end-placeholder="结束日期"
 
-            ></el-date-picker>
 
-         </el-form-item>
 
-         <el-form-item>
 
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
 
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
 
-         </el-form-item>
 
-      </el-form>
 
-
 
-      <el-row :gutter="10" class="mb8">
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="danger"
 
-               plain
 
-               icon="Delete"
 
-               :disabled="multiple"
 
-               @click="handleDelete"
 
-               v-hasPermi="['monitor:operlog:remove']"
 
-            >删除</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="danger"
 
-               plain
 
-               icon="Delete"
 
-               @click="handleClean"
 
-               v-hasPermi="['monitor:operlog:remove']"
 
-            >清空</el-button>
 
-         </el-col>
 
-         <!-- <el-col :span="1.5">
 
-            <el-button
 
-               type="warning"
 
-               plain
 
-               icon="Download"
 
-               @click="handleExport"
 
-               v-hasPermi="['monitor:operlog:export']"
 
-            >导出</el-button>
 
-         </el-col> -->
 
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
 
-      </el-row>
 
-
 
-      <el-table ref="operlogRef" v-loading="loading" :data="operlogList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
 
-         <el-table-column type="selection" width="55" align="center" />
 
-         <el-table-column label="日志编号" align="center" prop="operId" />
 
-         <el-table-column label="系统模块" align="center" prop="title" />
 
-         <el-table-column label="操作类型" align="center" prop="businessType">
 
-            <template #default="scope">
 
-               <dict-tag :options="sys_oper_type" :value="scope.row.businessType" />
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="请求方式" align="center" prop="requestMethod" />
 
-         <el-table-column label="操作状态" align="center" prop="status">
 
-            <template #default="scope">
 
-               <dict-tag :options="sys_common_status" :value="scope.row.status" />
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="操作日期" align="center" prop="operTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
 
-            <template #default="scope">
 
-               <span>{{ parseTime(scope.row.operTime) }}</span>
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
-            <template #default="scope">
 
-               <el-button
 
-                  type="text"
 
-                  icon="View"
 
-                  @click="handleView(scope.row, scope.index)"
 
-                  v-hasPermi="['monitor:operlog:query']"
 
-               >详细</el-button>
 
-            </template>
 
-         </el-table-column>
 
-      </el-table>
 
-
 
-      <pagination
 
-         v-show="total > 0"
 
-         :total="total"
 
-         v-model:page="queryParams.pageNum"
 
-         v-model:limit="queryParams.pageSize"
 
-         @pagination="getList"
 
-      />
 
-
 
-      <!-- 操作日志详细 -->
 
-      <el-dialog title="操作日志详细" v-model="open" width="700px" append-to-body>
 
-         <el-form :model="form" label-width="100px">
 
-            <el-row>
 
-               <el-col :span="12">
 
-                  <el-form-item label="操作模块：">{{ form.title }} / {{ typeFormat(form) }}</el-form-item>
 
-                  <el-form-item
 
-                    label="登录信息："
 
-                  >{{ form.operName }} / {{ form.operIp }} </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="请求地址：">{{ form.operUrl }}</el-form-item>
 
-                  <el-form-item label="请求方式：">{{ form.requestMethod }}</el-form-item>
 
-               </el-col>
 
-               <el-col :span="24">
 
-                  <el-form-item label="操作方法：">{{ form.method }}</el-form-item>
 
-               </el-col>
 
-               <el-col :span="24">
 
-                  <el-form-item label="请求参数：">{{ form.operParam }}</el-form-item>
 
-               </el-col>
 
-               <el-col :span="24">
 
-                  <el-form-item label="返回参数：">{{ form.jsonResult }}</el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="操作状态：">
 
-                     <div v-if="form.status === 0">正常</div>
 
-                     <div v-else-if="form.status === 1">失败</div>
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="操作时间：">{{ parseTime(form.operTime) }}</el-form-item>
 
-               </el-col>
 
-               <el-col :span="24">
 
-                  <el-form-item label="异常信息：" v-if="form.status === 1">{{ form.errorMsg }}</el-form-item>
 
-               </el-col>
 
-            </el-row>
 
-         </el-form>
 
-         <template #footer>
 
-            <div class="dialog-footer">
 
-               <el-button @click="open = false">关 闭</el-button>
 
-            </div>
 
-         </template>
 
-      </el-dialog>
 
-   </div>
 
-</template>
 
-
 
-<script setup name="Operlog">
 
-import { list, delOperlog, cleanOperlog } from "@/api/system/operlog";
 
-
 
-const { proxy } = getCurrentInstance();
 
-const { sys_oper_type, sys_common_status } = proxy.useDict("sys_oper_type","sys_common_status");
 
-
 
-const operlogList = ref([]);
 
-const open = ref(false);
 
-const loading = ref(true);
 
-const showSearch = ref(true);
 
-const ids = ref([]);
 
-const single = ref(true);
 
-const multiple = ref(true);
 
-const total = ref(0);
 
-const title = ref("");
 
-const dateRange = ref([]);
 
-const defaultSort = ref({ prop: "operTime", order: "descending" });
 
-
 
-const data = reactive({
 
-  form: {},
 
-  queryParams: {
 
-    pageNum: 1,
 
-    pageSize: 10,
 
-    title: undefined,
 
-    operName: undefined,
 
-    businessType: undefined,
 
-    status: undefined
 
-  }
 
-});
 
-
 
-const { queryParams, form } = toRefs(data);
 
-
 
-/** 查询登录日志 */
 
-function getList() {
 
-  loading.value = true;
 
-  list(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
 
-    operlogList.value = response.data.rows;
 
-    total.value = response.data.total;
 
-    loading.value = false;
 
-  });
 
-}
 
-/** 操作日志类型字典翻译 */
 
-function typeFormat(row, column) {
 
-  return proxy.selectDictLabel(sys_oper_type.value, row.businessType);
 
-}
 
-/** 搜索按钮操作 */
 
-function handleQuery() {
 
-  queryParams.value.pageNum = 1;
 
-  getList();
 
-}
 
-/** 重置按钮操作 */
 
-function resetQuery() {
 
-  dateRange.value = [];
 
-  proxy.resetForm("queryRef");
 
-  proxy.$refs["operlogRef"].sort(defaultSort.value.prop, defaultSort.value.order);
 
-  handleQuery();
 
-}
 
-/** 多选框选中数据 */
 
-function handleSelectionChange(selection) {
 
-  ids.value = selection.map(item => item.operId);
 
-  multiple.value = !selection.length;
 
-}
 
-/** 排序触发事件 */
 
-function handleSortChange(column, prop, order) {
 
-  queryParams.value.orderByColumn = column.prop;
 
-  queryParams.value.isAsc = column.order;
 
-  getList();
 
-}
 
-/** 详细按钮操作 */
 
-function handleView(row) {
 
-  open.value = true;
 
-  form.value = row;
 
-}
 
-/** 删除按钮操作 */
 
-function handleDelete(row) {
 
-  const operIds = row.operId || ids.value;
 
-  proxy.$modal.confirm('是否确认删除日志编号为"' + operIds + '"的数据项?').then(function () {
 
-    return delOperlog(operIds);
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("删除成功");
 
-  }).catch(() => {});
 
-}
 
-/** 清空按钮操作 */
 
-function handleClean() {
 
-  proxy.$modal.confirm("是否确认清空所有操作日志数据项?").then(function () {
 
-    return cleanOperlog();
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("清空成功");
 
-  }).catch(() => {});
 
-}
 
-/** 导出按钮操作 */
 
-function handleExport() {
 
-  proxy.download("system/operlog/export",{
 
-    ...queryParams.value,
 
-  }, `config_${new Date().getTime()}.xlsx`);
 
-}
 
-
 
-getList();
 
-</script>

+ 0 - 285
src/views/system/post/index.vue
View File 

@@ -1,285 +0,0 @@
 
-<template>
 
-   <div class="app-container">
 
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
 
-         <el-form-item label="岗位编码" prop="postCode">
 
-            <el-input
 
-               v-model="queryParams.postCode"
 
-               placeholder="请输入岗位编码"
 
-               clearable
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="岗位名称" prop="postName">
 
-            <el-input
 
-               v-model="queryParams.postName"
 
-               placeholder="请输入岗位名称"
 
-               clearable
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="状态" prop="status">
 
-            <el-select v-model="queryParams.status" placeholder="岗位状态" clearable>
 
-               <el-option
 
-                  v-for="dict in sys_normal_disable"
 
-                  :key="dict.value"
 
-                  :label="dict.label"
 
-                  :value="dict.value"
 
-               />
 
-            </el-select>
 
-         </el-form-item>
 
-         <el-form-item>
 
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
 
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
 
-         </el-form-item>
 
-      </el-form>
 
-
 
-      <el-row :gutter="10" class="mb8">
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="primary"
 
-               plain
 
-               icon="Plus"
 
-               @click="handleAdd"
 
-               v-hasPermi="['system:post:add']"
 
-            >新增</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="success"
 
-               plain
 
-               icon="Edit"
 
-               :disabled="single"
 
-               @click="handleUpdate"
 
-               v-hasPermi="['system:post:edit']"
 
-            >修改</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="danger"
 
-               plain
 
-               icon="Delete"
 
-               :disabled="multiple"
 
-               @click="handleDelete"
 
-               v-hasPermi="['system:post:remove']"
 
-            >删除</el-button>
 
-         </el-col>
 
-         <!-- <el-col :span="1.5">
 
-            <el-button
 
-               type="warning"
 
-               plain
 
-               icon="Download"
 
-               @click="handleExport"
 
-               v-hasPermi="['system:post:export']"
 
-            >导出</el-button>
 
-         </el-col> -->
 
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
 
-      </el-row>
 
-
 
-      <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
 
-         <el-table-column type="selection" width="55" align="center" />
 
-         <el-table-column label="岗位编号" align="center" prop="postId" />
 
-         <el-table-column label="岗位编码" align="center" prop="postCode" />
 
-         <el-table-column label="岗位名称" align="center" prop="postName" />
 
-         <el-table-column label="岗位排序" align="center" prop="postSort" />
 
-         <el-table-column label="状态" align="center" prop="status">
 
-            <template #default="scope">
 
-               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
 
-            <template #default="scope">
 
-               <span>{{ parseTime(scope.row.createTime) }}</span>
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
-            <template #default="scope">
 
-               <el-button
 
-                  type="text"
 
-                  icon="Edit"
 
-                  @click="handleUpdate(scope.row)"
 
-                  v-hasPermi="['system:post:edit']"
 
-               >修改</el-button>
 
-               <el-button
 
-                  type="text"
 
-                  icon="Delete"
 
-                  @click="handleDelete(scope.row)"
 
-                  v-hasPermi="['system:post:remove']"
 
-               >删除</el-button>
 
-            </template>
 
-         </el-table-column>
 
-      </el-table>
 
-
 
-      <pagination
 
-         v-show="total > 0"
 
-         :total="total"
 
-         v-model:page="queryParams.pageNum"
 
-         v-model:limit="queryParams.pageSize"
 
-         @pagination="getList"
 
-      />
 
-
 
-      <!-- 添加或修改岗位对话框 -->
 
-      <el-dialog :title="title" v-model="open" width="500px" append-to-body>
 
-         <el-form ref="postRef" :model="form" :rules="rules" label-width="80px">
 
-            <el-form-item label="岗位名称" prop="postName">
 
-               <el-input v-model="form.postName" placeholder="请输入岗位名称" />
 
-            </el-form-item>
 
-            <el-form-item label="岗位编码" prop="postCode">
 
-               <el-input v-model="form.postCode" placeholder="请输入编码名称" />
 
-            </el-form-item>
 
-            <el-form-item label="岗位顺序" prop="postSort">
 
-               <el-input-number v-model="form.postSort" controls-position="right" :min="0" />
 
-            </el-form-item>
 
-            <el-form-item label="岗位状态" prop="status">
 
-               <el-radio-group v-model="form.status">
 
-                  <el-radio
 
-                     v-for="dict in sys_normal_disable"
 
-                     :key="dict.value"
 
-                     :label="dict.value"
 
-                  >{{ dict.label }}</el-radio>
 
-               </el-radio-group>
 
-            </el-form-item>
 
-            <el-form-item label="备注" prop="remark">
 
-               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
 
-            </el-form-item>
 
-         </el-form>
 
-         <template #footer>
 
-            <div class="dialog-footer">
 
-               <el-button type="primary" @click="submitForm">确 定</el-button>
 
-               <el-button @click="cancel">取 消</el-button>
 
-            </div>
 
-         </template>
 
-      </el-dialog>
 
-   </div>
 
-</template>
 
-
 
-<script setup name="Post">
 
-import { listPost, addPost, delPost, getPost, updatePost } from "@/api/system/post";
 
-
 
-const { proxy } = getCurrentInstance();
 
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 
-
 
-const postList = ref([]);
 
-const open = ref(false);
 
-const loading = ref(true);
 
-const showSearch = ref(true);
 
-const ids = ref([]);
 
-const single = ref(true);
 
-const multiple = ref(true);
 
-const total = ref(0);
 
-const title = ref("");
 
-
 
-const data = reactive({
 
-  form: {},
 
-  queryParams: {
 
-    pageNum: 1,
 
-    pageSize: 10,
 
-    postCode: undefined,
 
-    postName: undefined,
 
-    status: undefined
 
-  },
 
-  rules: {
 
-    postName: [{ required: true, message: "岗位名称不能为空", trigger: "blur" }],
 
-    postCode: [{ required: true, message: "岗位编码不能为空", trigger: "blur" }],
 
-    postSort: [{ required: true, message: "岗位顺序不能为空", trigger: "blur" }],
 
-  }
 
-});
 
-
 
-const { queryParams, form, rules } = toRefs(data);
 
-
 
-/** 查询岗位列表 */
 
-function getList() {
 
-  loading.value = true;
 
-  listPost(queryParams.value).then(response => {
 
-    postList.value = response.data.rows;
 
-    total.value = response.data.total;
 
-    loading.value = false;
 
-  });
 
-}
 
-/** 取消按钮 */
 
-function cancel() {
 
-  open.value = false;
 
-  reset();
 
-}
 
-/** 表单重置 */
 
-function reset() {
 
-  form.value = {
 
-    postId: undefined,
 
-    postCode: undefined,
 
-    postName: undefined,
 
-    postSort: 0,
 
-    status: "0",
 
-    remark: undefined
 
-  };
 
-  proxy.resetForm("postRef");
 
-}
 
-/** 搜索按钮操作 */
 
-function handleQuery() {
 
-  queryParams.value.pageNum = 1;
 
-  getList();
 
-}
 
-/** 重置按钮操作 */
 
-function resetQuery() {
 
-  proxy.resetForm("queryRef");
 
-  handleQuery();
 
-}
 
-/** 多选框选中数据 */
 
-function handleSelectionChange(selection) {
 
-  ids.value = selection.map(item => item.postId);
 
-  single.value = selection.length != 1;
 
-  multiple.value = !selection.length;
 
-}
 
-/** 新增按钮操作 */
 
-function handleAdd() {
 
-  reset();
 
-  open.value = true;
 
-  title.value = "添加岗位";
 
-}
 
-/** 修改按钮操作 */
 
-function handleUpdate(row) {
 
-  reset();
 
-  const postId = row.postId || ids.value;
 
-  getPost(postId).then(response => {
 
-    form.value = response.data;
 
-    open.value = true;
 
-    title.value = "修改岗位";
 
-  });
 
-}
 
-/** 提交按钮 */
 
-function submitForm() {
 
-  proxy.$refs["postRef"].validate(valid => {
 
-    if (valid) {
 
-      if (form.value.postId != undefined) {
 
-        updatePost(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("修改成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      } else {
 
-        addPost(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("新增成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      }
 
-    }
 
-  });
 
-}
 
-/** 删除按钮操作 */
 
-function handleDelete(row) {
 
-  const postIds = row.postId || ids.value;
 
-  proxy.$modal.confirm('是否确认删除岗位编号为"' + postIds + '"的数据项？').then(function() {
 
-    return delPost(postIds);
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("删除成功");
 
-  }).catch(() => {});
 
-}
 
-/** 导出按钮操作 */
 
-function handleExport() {
 
-  proxy.download("system/post/export", {
 
-    ...queryParams.value
 
-  }, `post_${new Date().getTime()}.xlsx`);
 
-}
 
-
 
-getList();
 
-</script>

+ 0 - 177
src/views/system/role/authUser.vue
View File 

@@ -1,177 +0,0 @@
 
-
 
-<template>
 
-   <div class="app-container">
 
-      <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true">
 
-         <el-form-item label="用户名称" prop="userName">
 
-            <el-input
 
-               v-model="queryParams.userName"
 
-               placeholder="请输入用户名称"
 
-               clearable
 
-               style="width: 240px"
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="手机号码" prop="phonenumber">
 
-            <el-input
 
-               v-model="queryParams.phonenumber"
 
-               placeholder="请输入手机号码"
 
-               clearable
 
-               style="width: 240px"
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item>
 
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
 
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
 
-         </el-form-item>
 
-      </el-form>
 
-
 
-      <el-row :gutter="10" class="mb8">
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="primary"
 
-               plain
 
-               icon="Plus"
 
-               @click="openSelectUser"
 
-               v-hasPermi="['system:role:add']"
 
-            >添加用户</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="danger"
 
-               plain
 
-               icon="CircleClose"
 
-               :disabled="multiple"
 
-               @click="cancelAuthUserAll"
 
-               v-hasPermi="['system:role:remove']"
 
-            >批量取消授权</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button 
-               type="warning" 
-               plain 
-               icon="Close"
 
-               @click="handleClose"
 
-            >关闭</el-button>
 
-         </el-col>
 
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
 
-      </el-row>
 
-
 
-      <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
 
-         <el-table-column type="selection" width="55" align="center" />
 
-         <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
 
-         <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
 
-         <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
 
-         <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
 
-         <el-table-column label="状态" align="center" prop="status">
 
-            <template #default="scope">
 
-               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
 
-            <template #default="scope">
 
-               <span>{{ parseTime(scope.row.createTime) }}</span>
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
-            <template #default="scope">
 
-               <el-button
 
-                  type="text"
 
-                  icon="CircleClose"
 
-                  @click="cancelAuthUser(scope.row)"
 
-                  v-hasPermi="['system:role:remove']"
 
-               >取消授权</el-button>
 
-            </template>
 
-         </el-table-column>
 
-      </el-table>
 
-
 
-      <pagination
 
-         v-show="total > 0"
 
-         :total="total"
 
-         v-model:page="queryParams.pageNum"
 
-         v-model:limit="queryParams.pageSize"
 
-         @pagination="getList"
 
-      />
 
-      <select-user ref="selectRef" :roleId="queryParams.roleId" @ok="handleQuery" />
 
-   </div>
 
-</template>
 
-
 
-<script setup name="AuthUser">
 
-import selectUser from "./selectUser";
 
-import { allocatedUserList, authUserCancel, authUserCancelAll } from "@/api/system/role";
 
-
 
-const route = useRoute();
 
-const { proxy } = getCurrentInstance();
 
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 
-
 
-const userList = ref([]);
 
-const loading = ref(true);
 
-const showSearch = ref(true);
 
-const multiple = ref(true);
 
-const total = ref(0);
 
-const userIds = ref([]);
 
-
 
-const queryParams = reactive({
 
-  pageNum: 1,
 
-  pageSize: 10,
 
-  roleId: route.params.roleId,
 
-  userName: undefined,
 
-  phonenumber: undefined,
 
-});
 
-
 
-/** 查询授权用户列表 */
 
-function getList() {
 
-  loading.value = true;
 
-  allocatedUserList(queryParams).then(response => {
 
-    userList.value = response.rows;
 
-    total.value = response.total;
 
-    loading.value = false;
 
-  });
 
-}
 
-// 返回按钮
 
-function handleClose() {
 
-  const obj = { path: "/system/role" };
 
-  proxy.$tab.closeOpenPage(obj);
 
-}
 
-/** 搜索按钮操作 */
 
-function handleQuery() {
 
-  queryParams.pageNum = 1;
 
-  getList();
 
-}
 
-/** 重置按钮操作 */
 
-function resetQuery() {
 
-  proxy.resetForm("queryRef");
 
-  handleQuery();
 
-}
 
-// 多选框选中数据
 
-function handleSelectionChange(selection) {
 
-  userIds.value = selection.map(item => item.userId);
 
-  multiple.value = !selection.length;
 
-}
 
-/** 打开授权用户表弹窗 */
 
-function openSelectUser() {
 
-  proxy.$refs["selectRef"].show();
 
-}
 
-/** 取消授权按钮操作 */
 
-function cancelAuthUser(row) {
 
-  proxy.$modal.confirm('确认要取消该用户"' + row.userName + '"角色吗？').then(function () {
 
-    return authUserCancel({ userId: row.userId, roleId: queryParams.roleId });
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("取消授权成功");
 
-  }).catch(() => {});
 
-}
 
-/** 批量取消授权按钮操作 */
 
-function cancelAuthUserAll(row) {
 
-  const roleId = queryParams.roleId;
 
-  const uIds = userIds.value.join(",");
 
-  proxy.$modal.confirm("是否取消选中用户授权数据项?").then(function () {
 
-    return authUserCancelAll({ roleId: roleId, userIds: uIds });
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("取消授权成功");
 
-  }).catch(() => {});
 
-}
 
-
 
-getList();
 
-</script>

+ 0 - 580
src/views/system/role/index.vue
View File 

@@ -1,580 +0,0 @@
 
-<template>
 
-   <div class="app-container">
 
-      <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true">
 
-         <el-form-item label="角色名称" prop="roleName">
 
-            <el-input
 
-               v-model="queryParams.roleName"
 
-               placeholder="请输入角色名称"
 
-               clearable
 
-               style="width: 240px"
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="权限字符" prop="roleKey">
 
-            <el-input
 
-               v-model="queryParams.roleKey"
 
-               placeholder="请输入权限字符"
 
-               clearable
 
-               style="width: 240px"
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="状态" prop="status">
 
-            <el-select
 
-               v-model="queryParams.status"
 
-               placeholder="角色状态"
 
-               clearable
 
-               style="width: 240px"
 
-            >
 
-               <el-option
 
-                  v-for="dict in sys_normal_disable"
 
-                  :key="dict.value"
 
-                  :label="dict.label"
 
-                  :value="dict.value"
 
-               />
 
-            </el-select>
 
-         </el-form-item>
 
-         <el-form-item label="创建时间" style="width: 308px">
 
-            <el-date-picker
 
-               v-model="dateRange"
 
-               value-format="YYYY-MM-DD"
 
-               type="daterange"
 
-               range-separator="-"
 
-               start-placeholder="开始日期"
 
-               end-placeholder="结束日期"
 
-            ></el-date-picker>
 
-         </el-form-item>
 
-         <el-form-item>
 
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
 
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
 
-         </el-form-item>
 
-      </el-form>
 
-      <el-row :gutter="10" class="mb8">
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="primary"
 
-               plain
 
-               icon="Plus"
 
-               @click="handleAdd"
 
-               v-hasPermi="['system:role:add']"
 
-            >新增</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="success"
 
-               plain
 
-               icon="Edit"
 
-               :disabled="single"
 
-               @click="handleUpdate"
 
-               v-hasPermi="['system:role:edit']"
 
-            >修改</el-button>
 
-         </el-col>
 
-         <el-col :span="1.5">
 
-            <el-button
 
-               type="danger"
 
-               plain
 
-               icon="Delete"
 
-               :disabled="multiple"
 
-               @click="handleDelete"
 
-               v-hasPermi="['system:role:remove']"
 
-            >删除</el-button>
 
-         </el-col>
 
-         <!-- <el-col :span="1.5">
 
-            <el-button
 
-               type="warning"
 
-               plain
 
-               icon="Download"
 
-               @click="handleExport"
 
-               v-hasPermi="['system:role:export']"
 
-            >导出</el-button>
 
-         </el-col> -->
 
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
 
-      </el-row>
 
-
 
-      <!-- 表格数据 -->
 
-      <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
 
-         <el-table-column type="selection" width="55" align="center" />
 
-         <el-table-column label="角色编号" prop="roleId" width="120" />
 
-         <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
 
-         <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
 
-         <el-table-column label="显示顺序" prop="roleSort" width="100" />
 
-         <el-table-column label="状态" align="center" width="100">
 
-            <template #default="scope">
 
-               <el-switch
 
-                  v-model="scope.row.status"
 
-                  active-value="0"
 
-                  inactive-value="1"
 
-                  @change="handleStatusChange(scope.row)"
 
-               ></el-switch>
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="创建时间" align="center" prop="createTime">
 
-            <template #default="scope">
 
-               <span>{{ parseTime(scope.row.createTime) }}</span>
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
-            <template #default="scope">
 
-              <el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1">
 
-                <el-button
 
-                  type="text"
 
-                  icon="Edit"
 
-                  @click="handleUpdate(scope.row)"
 
-                  v-hasPermi="['system:role:edit']"
 
-                ></el-button>
 
-              </el-tooltip>
 
-              <el-tooltip content="删除" placement="top" v-if="scope.row.roleId !== 1">
 
-                <el-button
 
-                  type="text"
 
-                  icon="Delete"
 
-                  @click="handleDelete(scope.row)"
 
-                  v-hasPermi="['system:role:remove']"
 
-                ></el-button>
 
-              </el-tooltip>
 
-              <el-tooltip content="数据权限" placement="top" v-if="scope.row.roleId !== 1">
 
-                <el-button
 
-                  type="text"
 
-                  icon="CircleCheck"
 
-                  @click="handleDataScope(scope.row)"
 
-                  v-hasPermi="['system:role:edit']"
 
-                ></el-button>
 
-              </el-tooltip>
 
-              <el-tooltip content="分配用户" placement="top" v-if="scope.row.roleId !== 1">
 
-                <el-button
 
-                  type="text"
 
-                  icon="User"
 
-                  @click="handleAuthUser(scope.row)"
 
-                  v-hasPermi="['system:role:edit']"
 
-                ></el-button>
 
-              </el-tooltip>
 
-            </template>
 
-         </el-table-column>
 
-      </el-table>
 
-
 
-      <pagination
 
-         v-show="total > 0"
 
-         :total="total"
 
-         v-model:page="queryParams.pageNum"
 
-         v-model:limit="queryParams.pageSize"
 
-         @pagination="getList"
 
-      />
 
-
 
-      <!-- 添加或修改角色配置对话框 -->
 
-      <el-dialog :title="title" v-model="open" width="500px" append-to-body>
 
-         <el-form ref="roleRef" :model="form" :rules="rules" label-width="100px">
 
-            <el-form-item label="角色名称" prop="roleName">
 
-               <el-input v-model="form.roleName" placeholder="请输入角色名称" />
 
-            </el-form-item>
 
-            <el-form-item prop="roleKey">
 
-               <template #label>
 
-                  <span>
 
-                     <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
 
-                        <el-icon><question-filled /></el-icon>
 
-                     </el-tooltip>
 
-                     权限字符
 
-                  </span>
 
-               </template>
 
-               <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
 
-            </el-form-item>
 
-            <el-form-item label="角色顺序" prop="roleSort">
 
-               <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
 
-            </el-form-item>
 
-            <el-form-item label="状态">
 
-               <el-radio-group v-model="form.status">
 
-                  <el-radio
 
-                     v-for="dict in sys_normal_disable"
 
-                     :key="dict.value"
 
-                     :label="dict.value"
 
-                  >{{ dict.label }}</el-radio>
 
-               </el-radio-group>
 
-            </el-form-item>
 
-            <el-form-item label="菜单权限">
 
-               <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
 
-               <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
 
-               <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
 
-               <el-tree
 
-                  class="tree-border"
 
-                  :data="menuOptions"
 
-                  show-checkbox
 
-                  ref="menuRef"
 
-                  node-key="id"
 
-                  :check-strictly="!form.menuCheckStrictly"
 
-                  empty-text="加载中，请稍候"
 
-                  :props="{ label: 'label', children: 'children' }"
 
-               ></el-tree>
 
-            </el-form-item>
 
-            <el-form-item label="备注">
 
-               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
 
-            </el-form-item>
 
-         </el-form>
 
-         <template #footer>
 
-            <div class="dialog-footer">
 
-               <el-button type="primary" @click="submitForm">确 定</el-button>
 
-               <el-button @click="cancel">取 消</el-button>
 
-            </div>
 
-         </template>
 
-      </el-dialog>
 
-
 
-      <!-- 分配角色数据权限对话框 -->
 
-      <el-dialog :title="title" v-model="openDataScope" width="500px" append-to-body>
 
-         <el-form :model="form" label-width="80px">
 
-            <el-form-item label="角色名称">
 
-               <el-input v-model="form.roleName" :disabled="true" />
 
-            </el-form-item>
 
-            <el-form-item label="权限字符">
 
-               <el-input v-model="form.roleKey" :disabled="true" />
 
-            </el-form-item>
 
-            <el-form-item label="权限范围">
 
-               <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
 
-                  <el-option
 
-                     v-for="item in dataScopeOptions"
 
-                     :key="item.value"
 
-                     :label="item.label"
 
-                     :value="item.value"
 
-                  ></el-option>
 
-               </el-select>
 
-            </el-form-item>
 
-            <el-form-item label="数据权限" v-show="form.dataScope == 2">
 
-               <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
 
-               <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
 
-               <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
 
-               <el-tree
 
-                  class="tree-border"
 
-                  :data="deptOptions"
 
-                  show-checkbox
 
-                  default-expand-all
 
-                  ref="deptRef"
 
-                  node-key="id"
 
-                  :check-strictly="!form.deptCheckStrictly"
 
-                  empty-text="加载中，请稍候"
 
-                  :props="{ label: 'label', children: 'children' }"
 
-               ></el-tree>
 
-            </el-form-item>
 
-         </el-form>
 
-         <template #footer>
 
-            <div class="dialog-footer">
 
-               <el-button type="primary" @click="submitDataScope">确 定</el-button>
 
-               <el-button @click="cancelDataScope">取 消</el-button>
 
-            </div>
 
-         </template>
 
-      </el-dialog>
 
-   </div>
 
-</template>
 
-
 
-<script setup name="Role">
 
-import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole } from "@/api/system/role";
 
-import { roleMenuTreeselect, treeselect as menuTreeselect } from "@/api/system/menu";
 
-import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/dept";
 
-
 
-const router = useRouter();
 
-const { proxy } = getCurrentInstance();
 
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 
-
 
-const roleList = ref([]);
 
-const open = ref(false);
 
-const loading = ref(true);
 
-const showSearch = ref(true);
 
-const ids = ref([]);
 
-const single = ref(true);
 
-const multiple = ref(true);
 
-const total = ref(0);
 
-const title = ref("");
 
-const dateRange = ref([]);
 
-const menuOptions = ref([]);
 
-const menuExpand = ref(false);
 
-const menuNodeAll = ref(false);
 
-const deptExpand = ref(true);
 
-const deptNodeAll = ref(false);
 
-const deptOptions = ref([]);
 
-const openDataScope = ref(false);
 
-const menuRef = ref(null);
 
-const deptRef = ref(null);
 
-
 
-/** 数据范围选项*/
 
-const dataScopeOptions = ref([
 
-  { value: "1", label: "全部数据权限" },
 
-  { value: "2", label: "自定数据权限" },
 
-  { value: "3", label: "本部门数据权限" },
 
-  { value: "4", label: "本部门及以下数据权限" },
 
-  { value: "5", label: "仅本人数据权限" }
 
-]);
 
-
 
-const data = reactive({
 
-  form: {},
 
-  queryParams: {
 
-    pageNum: 1,
 
-    pageSize: 10,
 
-    roleName: undefined,
 
-    roleKey: undefined,
 
-    status: undefined
 
-  },
 
-  rules: {
 
-    roleName: [{ required: true, message: "角色名称不能为空", trigger: "blur" }],
 
-    roleKey: [{ required: true, message: "权限字符不能为空", trigger: "blur" }],
 
-    roleSort: [{ required: true, message: "角色顺序不能为空", trigger: "blur" }]
 
-  },
 
-});
 
-
 
-const { queryParams, form, rules } = toRefs(data);
 
-
 
-/** 查询角色列表 */
 
-function getList() {
 
-  loading.value = true;
 
-  listRole(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
 
-    roleList.value = response.data.rows;
 
-    total.value = response.data.total;
 
-    loading.value = false;
 
-  });
 
-}
 
-/** 搜索按钮操作 */
 
-function handleQuery() {
 
-  queryParams.value.pageNum = 1;
 
-  getList();
 
-}
 
-/** 重置按钮操作 */
 
-function resetQuery() {
 
-  dateRange.value = [];
 
-  proxy.resetForm("queryRef");
 
-  handleQuery();
 
-}
 
-/** 删除按钮操作 */
 
-function handleDelete(row) {
 
-  const roleIds = row.roleId || ids.value;
 
-  proxy.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?').then(function () {
 
-    return delRole(roleIds);
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("删除成功");
 
-  }).catch(() => {});
 
-}
 
-/** 导出按钮操作 */
 
-function handleExport() {
 
-  proxy.download("system/role/export", {
 
-    ...queryParams.value,
 
-  }, `role_${new Date().getTime()}.xlsx`);
 
-}
 
-/** 多选框选中数据 */
 
-function handleSelectionChange(selection) {
 
-  ids.value = selection.map(item => item.roleId);
 
-  single.value = selection.length != 1;
 
-  multiple.value = !selection.length;
 
-}
 
-/** 角色状态修改 */
 
-function handleStatusChange(row) {
 
-  let text = row.status === "0" ? "启用" : "停用";
 
-  proxy.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗?').then(function () {
 
-    return changeRoleStatus(row.roleId, row.status);
 
-  }).then(() => {
 
-    proxy.$modal.msgSuccess(text + "成功");
 
-  }).catch(function () {
 
-    row.status = row.status === "0" ? "1" : "0";
 
-  });
 
-}
 
-/** 更多操作 */
 
-function handleCommand(command, row) {
 
-  switch (command) {
 
-    case "handleDataScope":
 
-      handleDataScope(row);
 
-      break;
 
-    case "handleAuthUser":
 
-      handleAuthUser(row);
 
-      break;
 
-    default:
 
-      break;
 
-  }
 
-}
 
-/** 分配用户 */
 
-function handleAuthUser(row) {
 
-  router.push("/system/role-auth/user/" + row.roleId);
 
-}
 
-/** 查询菜单树结构 */
 
-function getMenuTreeselect() {
 
-  menuTreeselect().then(response => {
 
-    menuOptions.value = response.data;
 
-  });
 
-}
 
-/** 所有部门节点数据 */
 
-function getDeptAllCheckedKeys() {
 
-  // 目前被选中的部门节点
 
-  let checkedKeys = deptRef.value.getCheckedKeys();
 
-  // 半选中的部门节点
 
-  let halfCheckedKeys = deptRef.value.getHalfCheckedKeys();
 
-  checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
 
-  return checkedKeys;
 
-}
 
-/** 重置新增的表单以及其他数据  */
 
-function reset() {
 
-  if (menuRef.value != undefined) {
 
-    menuRef.value.setCheckedKeys([]);
 
-  }
 
-  menuExpand.value = false;
 
-  menuNodeAll.value = false;
 
-  deptExpand.value = true;
 
-  deptNodeAll.value = false;
 
-  form.value = {
 
-    roleId: undefined,
 
-    roleName: undefined,
 
-    roleKey: undefined,
 
-    roleSort: 0,
 
-    status: "0",
 
-    menuIds: [],
 
-    deptIds: [],
 
-    menuCheckStrictly: true,
 
-    deptCheckStrictly: true,
 
-    remark: undefined
 
-  };
 
-  proxy.resetForm("roleRef");
 
-}
 
-/** 添加角色 */
 
-function handleAdd() {
 
-  reset();
 
-  getMenuTreeselect();
 
-  open.value = true;
 
-  title.value = "添加角色";
 
-}
 
-/** 修改角色 */
 
-function handleUpdate(row) {
 
-  reset();
 
-  const roleId = row.roleId || ids.value;
 
-  const roleMenu = getRoleMenuTreeselect(roleId);
 
-  getRole(roleId).then(response => {
 
-    form.value = response.data;
 
-    form.value.roleSort = Number(form.value.roleSort);
 
-    open.value = true;
 
-    nextTick(() => {
 
-      roleMenu.then((res) => {
 
-        let checkedKeys = res.data.checkedKeys;
 
-        checkedKeys.forEach((v) => {
 
-          nextTick(() => {
 
-            menuRef.value.setChecked(v, true, false);
 
-          });
 
-        });
 
-      });
 
-    });
 
-    title.value = "修改角色";
 
-  });
 
-}
 
-/** 根据角色ID查询菜单树结构 */
 
-function getRoleMenuTreeselect(roleId) {
 
-  return roleMenuTreeselect(roleId).then(response => {
 
-    menuOptions.value = response.data.menus;
 
-    return response;
 
-  });
 
-}
 
-/** 根据角色ID查询部门树结构 */
 
-function getRoleDeptTreeselect(roleId) {
 
-  return roleDeptTreeselect(roleId).then(response => {
 
-    deptOptions.value = response.data.depts;
 
-    return response;
 
-  });
 
-}
 
-/** 树权限（展开/折叠）*/
 
-function handleCheckedTreeExpand(value, type) {
 
-  if (type == "menu") {
 
-    let treeList = menuOptions.value;
 
-    for (let i = 0; i < treeList.length; i++) {
 
-      menuRef.value.store.nodesMap[treeList[i].id].expanded = value;
 
-    }
 
-  } else if (type == "dept") {
 
-    let treeList = deptOptions.value;
 
-    for (let i = 0; i < treeList.length; i++) {
 
-      deptRef.value.store.nodesMap[treeList[i].id].expanded = value;
 
-    }
 
-  }
 
-}
 
-/** 树权限（全选/全不选） */
 
-function handleCheckedTreeNodeAll(value, type) {
 
-  if (type == "menu") {
 
-    menuRef.value.setCheckedNodes(value ? menuOptions.value : []);
 
-  } else if (type == "dept") {
 
-    deptRef.value.setCheckedNodes(value ? deptOptions.value : []);
 
-  }
 
-}
 
-/** 树权限（父子联动） */
 
-function handleCheckedTreeConnect(value, type) {
 
-  if (type == "menu") {
 
-    form.value.menuCheckStrictly = value ? true : false;
 
-  } else if (type == "dept") {
 
-    form.value.deptCheckStrictly = value ? true : false;
 
-  }
 
-}
 
-/** 所有菜单节点数据 */
 
-function getMenuAllCheckedKeys() {
 
-  // 目前被选中的菜单节点
 
-  let checkedKeys = menuRef.value.getCheckedKeys();
 
-  // 半选中的菜单节点
 
-  let halfCheckedKeys = menuRef.value.getHalfCheckedKeys();
 
-  checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
 
-  return checkedKeys;
 
-}
 
-/** 提交按钮 */
 
-function submitForm() {
 
-  proxy.$refs["roleRef"].validate(valid => {
 
-    if (valid) {
 
-      if (form.value.roleId != undefined) {
 
-        form.value.menuIds = getMenuAllCheckedKeys();
 
-        updateRole(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("修改成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      } else {
 
-        form.value.menuIds = getMenuAllCheckedKeys();
 
-        addRole(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("新增成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      }
 
-    }
 
-  });
 
-}
 
-/** 取消按钮 */
 
-function cancel() {
 
-  open.value = false;
 
-  reset();
 
-}
 
-/** 选择角色权限范围触发 */
 
-function dataScopeSelectChange(value) {
 
-  if (value !== "2") {
 
-    deptRef.value.setCheckedKeys([]);
 
-  }
 
-}
 
-/** 分配数据权限操作 */
 
-function handleDataScope(row) {
 
-  reset();
 
-  const roleDeptTreeselect = getRoleDeptTreeselect(row.roleId);
 
-  getRole(row.roleId).then(response => {
 
-    form.value = response.data;
 
-    openDataScope.value = true;
 
-    nextTick(() => {
 
-      roleDeptTreeselect.then(res => {
 
-        nextTick(() => {
 
-          if (deptRef.value) {
 
-            deptRef.value.setCheckedKeys(res.checkedKeys);
 
-          }
 
-        });
 
-      });
 
-    });
 
-    title.value = "分配数据权限";
 
-  });
 
-}
 
-/** 提交按钮（数据权限） */
 
-function submitDataScope() {
 
-  if (form.value.roleId != undefined) {
 
-    form.value.deptIds = getDeptAllCheckedKeys();
 
-    dataScope(form.value).then(response => {
 
-      proxy.$modal.msgSuccess("修改成功");
 
-      openDataScope.value = false;
 
-      getList();
 
-    });
 
-  }
 
-}
 
-/** 取消按钮（数据权限）*/
 
-function cancelDataScope() {
 
-  openDataScope.value = false;
 
-  reset();
 
-}
 
-
 
-getList();
 
-</script>

+ 0 - 138
src/views/system/role/selectUser.vue
View File 

@@ -1,138 +0,0 @@
 
-<template>
 
-   <!-- 授权用户 -->
 
-   <el-dialog title="选择用户" v-model="visible" width="800px" top="5vh" append-to-body>
 
-      <el-form :model="queryParams" ref="queryRef" :inline="true">
 
-         <el-form-item label="用户名称" prop="userName">
 
-            <el-input
 
-               v-model="queryParams.userName"
 
-               placeholder="请输入用户名称"
 
-               clearable
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item label="手机号码" prop="phonenumber">
 
-            <el-input
 
-               v-model="queryParams.phonenumber"
 
-               placeholder="请输入手机号码"
 
-               clearable
 
-               @keyup.enter="handleQuery"
 
-            />
 
-         </el-form-item>
 
-         <el-form-item>
 
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
 
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
 
-         </el-form-item>
 
-      </el-form>
 
-      <el-row>
 
-         <el-table @row-click="clickRow" ref="refTable" :data="userList" @selection-change="handleSelectionChange" height="260px">
 
-            <el-table-column type="selection" width="55"></el-table-column>
 
-            <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
 
-            <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
 
-            <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
 
-            <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
 
-            <el-table-column label="状态" align="center" prop="status">
 
-               <template #default="scope">
 
-                  <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
 
-               </template>
 
-            </el-table-column>
 
-            <el-table-column label="创建时间" align="center" prop="createTime" width="180">
 
-               <template #default="scope">
 
-                  <span>{{ parseTime(scope.row.createTime) }}</span>
 
-               </template>
 
-            </el-table-column>
 
-         </el-table>
 
-         <pagination
 
-            v-show="total > 0"
 
-            :total="total"
 
-            v-model:page="queryParams.pageNum"
 
-            v-model:limit="queryParams.pageSize"
 
-            @pagination="getList"
 
-         />
 
-      </el-row>
 
-      <template #footer>
 
-         <div class="dialog-footer">
 
-            <el-button type="primary" @click="handleSelectUser">确 定</el-button>
 
-            <el-button @click="visible = false">取 消</el-button>
 
-         </div>
 
-      </template>
 
-   </el-dialog>
 
-</template>
 
-
 
-<script setup name="SelectUser">
 
-import { authUserSelectAll, unallocatedUserList } from "@/api/system/role";
 
-
 
-const props = defineProps({
 
-  roleId: {
 
-    type: [Number, String]
 
-  }
 
-});
 
-
 
-const { proxy } = getCurrentInstance();
 
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 
-
 
-const userList = ref([]);
 
-const visible = ref(false);
 
-const total = ref(0);
 
-const userIds = ref([]);
 
-
 
-const queryParams = reactive({
 
-  pageNum: 1,
 
-  pageSize: 10,
 
-  roleId: undefined,
 
-  userName: undefined,
 
-  phonenumber: undefined
 
-});
 
-
 
-// 显示弹框
 
-function show() {
 
-  queryParams.roleId = props.roleId;
 
-  getList();
 
-  visible.value = true;
 
-}
 
-/**选择行 */
 
-function clickRow(row) {
 
-  proxy.$refs["refTable"].toggleRowSelection(row);
 
-}
 
-// 多选框选中数据
 
-function handleSelectionChange(selection) {
 
-  userIds.value = selection.map(item => item.userId);
 
-}
 
-// 查询表数据
 
-function getList() {
 
-  unallocatedUserList(queryParams).then(res => {
 
-    userList.value = res.rows;
 
-    total.value = res.total;
 
-  });
 
-}
 
-/** 搜索按钮操作 */
 
-function handleQuery() {
 
-  queryParams.pageNum = 1;
 
-  getList();
 
-}
 
-/** 重置按钮操作 */
 
-function resetQuery() {
 
-  proxy.resetForm("queryRef");
 
-  handleQuery();
 
-}
 
-const emit = defineEmits(["ok"]);
 
-/** 选择授权用户操作 */
 
-function handleSelectUser() {
 
-  const roleId = queryParams.roleId;
 
-  const uIds = userIds.value.join(",");
 
-  if (uIds == "") {
 
-    proxy.$modal.msgError("请选择要分配的用户");
 
-    return;
 
-  }
 
-  authUserSelectAll({ roleId: roleId, userIds: uIds }).then(res => {
 
-    proxy.$modal.msgSuccess(res.msg);
 
-    if (res.code === 200) {
 
-      visible.value = false;
 
-      emit("ok");
 
-    }
 
-  });
 
-}
 
-
 
-defineExpose({
 
-  show,
 
-});
 
-</script>

+ 0 - 112
src/views/system/user/authRole.vue
View File 

@@ -1,112 +0,0 @@
 
-<template>
 
-   <div class="app-container">
 
-      <h4 class="form-header h4">基本信息</h4>
 
-      <el-form :model="form" label-width="80px">
 
-         <el-row>
 
-            <el-col :span="8" :offset="2">
 
-               <el-form-item label="用户昵称" prop="nickName">
 
-                  <el-input v-model="form.nickName" disabled />
 
-               </el-form-item>
 
-            </el-col>
 
-            <el-col :span="8" :offset="2">
 
-               <el-form-item label="登录账号" prop="userName">
 
-                  <el-input v-model="form.userName" disabled />
 
-               </el-form-item>
 
-            </el-col>
 
-         </el-row>
 
-      </el-form>
 
-
 
-      <h4 class="form-header h4">角色信息</h4>
 
-      <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="roleRef" @selection-change="handleSelectionChange" :data="roles.slice((pageNum - 1) * pageSize, pageNum * pageSize)">
 
-         <el-table-column label="序号" width="55" type="index" align="center">
 
-            <template #default="scope">
 
-               <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
 
-            </template>
 
-         </el-table-column>
 
-         <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
 
-         <el-table-column label="角色编号" align="center" prop="roleId" />
 
-         <el-table-column label="角色名称" align="center" prop="roleName" />
 
-         <el-table-column label="权限字符" align="center" prop="roleKey" />
 
-         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
 
-            <template #default="scope">
 
-               <span>{{ parseTime(scope.row.createTime) }}</span>
 
-            </template>
 
-         </el-table-column>
 
-      </el-table>
 
-
 
-      <pagination v-show="total > 0" :total="total" v-model:page="pageNum" v-model:limit="pageSize" />
 
-
 
-      <el-form label-width="100px">
 
-         <div style="text-align: center;margin-left:-120px;margin-top:30px;">
 
-            <el-button type="primary" @click="submitForm()">提交</el-button>
 
-            <el-button @click="close()">返回</el-button>
 
-         </div>
 
-      </el-form>
 
-   </div>
 
-</template>
 
-
 
-<script setup name="AuthRole">
 
-import { getAuthRole, updateAuthRole } from "@/api/system/user";
 
-
 
-const route = useRoute();
 
-const { proxy } = getCurrentInstance();
 
-
 
-const loading = ref(true);
 
-const total = ref(0);
 
-const pageNum = ref(1);
 
-const pageSize = ref(10);
 
-const roleIds = ref([]);
 
-const roles = ref([]);
 
-const form = ref({
 
-  nickName: undefined,
 
-  userName: undefined,
 
-  userId: undefined
 
-});
 
-
 
-/** 单击选中行数据 */
 
-function clickRow(row) {
 
-  proxy.$refs["roleRef"].toggleRowSelection(row);
 
-};
 
-/** 多选框选中数据 */
 
-function handleSelectionChange(selection) {
 
-  roleIds.value = selection.map(item => item.roleId);
 
-};
 
-/** 保存选中的数据编号 */
 
-function getRowKey(row) {
 
-  return row.roleId;
 
-};
 
-/** 关闭按钮 */
 
-function close() {
 
-  const obj = { path: "/system/user" };
 
-  proxy.$tab.closeOpenPage(obj);
 
-};
 
-/** 提交按钮 */
 
-function submitForm() {
 
-  const userId = form.value.userId;
 
-  const rIds = roleIds.value.join(",");
 
-  updateAuthRole({ userId: userId, roleIds: rIds }).then(response => {
 
-    proxy.$modal.msgSuccess("授权成功");
 
-    close();
 
-  });
 
-};
 
-
 
-(() => {
 
-  const userId = route.params && route.params.userId;
 
-  if (userId) {
 
-    loading.value = true;
 
-    getAuthRole(userId).then(response => {
 
-      form.value = response.user;
 
-      roles.value = response.roles;
 
-      total.value = roles.value.length;
 
-      nextTick(() => {
 
-        roles.value.forEach(row => {
 
-          if (row.flag) {
 
-            proxy.$refs["roleRef"].toggleRowSelection(row);
 
-          }
 
-        });
 
-      });
 
-      loading.value = false;
 
-    });
 
-  }
 
-})();
 
-</script>

+ 0 - 636
src/views/system/user/index.vue
View File 

@@ -1,636 +0,0 @@
 
-<template>
 
-   <div class="app-container">
 
-      <el-row :gutter="20">
 
-         <!--部门数据-->
 
-         <el-col :span="4" :xs="24">
 
-            <div class="head-container">
 
-               <el-input
 
-                  v-model="deptName"
 
-                  placeholder="请输入部门名称"
 
-                  clearable
 
-                  prefix-icon="Search"
 
-                  style="margin-bottom: 20px"
 
-               />
 
-            </div>
 
-            <div class="head-container">
 
-               <el-tree
 
-                  :data="deptOptions"
 
-                  :props="{ label: 'label', children: 'children' }"
 
-                  :expand-on-click-node="false"
 
-                  :filter-node-method="filterNode"
 
-                  ref="deptTreeRef"
 
-                  highlight-current
 
-                  default-expand-all
 
-                  @node-click="handleNodeClick"
 
-               />
 
-            </div>
 
-         </el-col>
 
-         <!--用户数据-->
 
-         <el-col :span="20" :xs="24">
 
-            <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
 
-               <el-form-item label="用户名称" prop="userName">
 
-                  <el-input
 
-                     v-model="queryParams.userName"
 
-                     placeholder="请输入用户名称"
 
-                     clearable
 
-                     style="width: 240px"
 
-                     @keyup.enter="handleQuery"
 
-                  />
 
-               </el-form-item>
 
-               <el-form-item label="手机号码" prop="phonenumber">
 
-                  <el-input
 
-                     v-model="queryParams.phonenumber"
 
-                     placeholder="请输入手机号码"
 
-                     clearable
 
-                     style="width: 240px"
 
-                     @keyup.enter="handleQuery"
 
-                  />
 
-               </el-form-item>
 
-               <el-form-item label="状态" prop="status">
 
-                  <el-select
 
-                     v-model="queryParams.status"
 
-                     placeholder="用户状态"
 
-                     clearable
 
-                     style="width: 240px"
 
-                  >
 
-                     <el-option
 
-                        v-for="dict in sys_normal_disable"
 
-                        :key="dict.value"
 
-                        :label="dict.label"
 
-                        :value="dict.value"
 
-                     />
 
-                  </el-select>
 
-               </el-form-item>
 
-               <el-form-item label="创建时间" style="width: 308px;">
 
-                  <el-date-picker
 
-                     v-model="dateRange"
 
-                     value-format="YYYY-MM-DD"
 
-                     type="daterange"
 
-                     range-separator="-"
 
-                     start-placeholder="开始日期"
 
-                     end-placeholder="结束日期"
 
-                  ></el-date-picker>
 
-               </el-form-item>
 
-               <el-form-item>
 
-                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
 
-                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
 
-               </el-form-item>
 
-            </el-form>
 
-
 
-            <el-row :gutter="10" class="mb8">
 
-               <el-col :span="1.5">
 
-                  <el-button
 
-                     type="primary"
 
-                     plain
 
-                     icon="Plus"
 
-                     @click="handleAdd"
 
-                     v-hasPermi="['system:user:add']"
 
-                  >新增</el-button>
 
-               </el-col>
 
-               <el-col :span="1.5">
 
-                  <el-button
 
-                     type="success"
 
-                     plain
 
-                     icon="Edit"
 
-                     :disabled="single"
 
-                     @click="handleUpdate"
 
-                     v-hasPermi="['system:user:edit']"
 
-                  >修改</el-button>
 
-               </el-col>
 
-               <el-col :span="1.5">
 
-                  <el-button
 
-                     type="danger"
 
-                     plain
 
-                     icon="Delete"
 
-                     :disabled="multiple"
 
-                     @click="handleDelete"
 
-                     v-hasPermi="['system:user:remove']"
 
-                  >删除</el-button>
 
-               </el-col>
 
-               <!-- <el-col :span="1.5">
 
-                  <el-button
 
-                     type="info"
 
-                     plain
 
-                     icon="Upload"
 
-                     @click="handleImport"
 
-                     v-hasPermi="['system:user:import']"
 
-                  >导入</el-button>
 
-               </el-col>
 
-               <el-col :span="1.5">
 
-                  <el-button
 
-                     type="warning"
 
-                     plain
 
-                     icon="Download"
 
-                     @click="handleExport"
 
-                     v-hasPermi="['system:user:export']"
 
-                  >导出</el-button>
 
-               </el-col> -->
 
-               <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
 
-            </el-row>
 
-
 
-            <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
 
-               <el-table-column type="selection" width="50" align="center" />
 
-               <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
 
-               <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
 
-               <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
 
-               <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
 
-               <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
 
-               <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
 
-                  <template #default="scope">
 
-                     <el-switch
 
-                        v-model="scope.row.status"
 
-                        active-value="0"
 
-                        inactive-value="1"
 
-                        @change="handleStatusChange(scope.row)"
 
-                     ></el-switch>
 
-                  </template>
 
-               </el-table-column>
 
-               <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
 
-                  <template #default="scope">
 
-                     <span>{{ parseTime(scope.row.createTime) }}</span>
 
-                  </template>
 
-               </el-table-column>
 
-               <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
 
-                  <template #default="scope">
 
-                     <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
 
-                        <el-button
 
-                           type="text"
 
-                           icon="Edit"
 
-                           @click="handleUpdate(scope.row)"
 
-                           v-hasPermi="['system:user:edit']"
 
-                        ></el-button>
 
-                     </el-tooltip>
 
-                     <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
 
-                        <el-button
 
-                           type="text"
 
-                           icon="Delete"
 
-                           @click="handleDelete(scope.row)"
 
-                           v-hasPermi="['system:user:remove']"
 
-                        ></el-button>
 
-                     </el-tooltip>
 
-                     <el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">
 
-                        <el-button
 
-                           type="text"
 
-                           icon="Key"
 
-                           @click="handleResetPwd(scope.row)"
 
-                           v-hasPermi="['system:user:resetPwd']"
 
-                        ></el-button>
 
-                     </el-tooltip>
 
-                     <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
 
-                        <el-button
 
-                           type="text"
 
-                           icon="CircleCheck"
 
-                           @click="handleAuthRole(scope.row)"
 
-                           v-hasPermi="['system:user:edit']"
 
-                        ></el-button>
 
-                     </el-tooltip>
 
-                  </template>
 
-               </el-table-column>
 
-            </el-table>
 
-            <pagination
 
-               v-show="total > 0"
 
-               :total="total"
 
-               v-model:page="queryParams.pageNum"
 
-               v-model:limit="queryParams.pageSize"
 
-               @pagination="getList"
 
-            />
 
-         </el-col>
 
-      </el-row>
 
-
 
-      <!-- 添加或修改用户配置对话框 -->
 
-      <el-dialog :title="title" v-model="open" width="600px" append-to-body>
 
-         <el-form :model="form" :rules="rules" ref="userRef" label-width="80px">
 
-            <el-row>
 
-               <el-col :span="12">
 
-                  <el-form-item label="用户昵称" prop="nickName">
 
-                     <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="归属部门" prop="deptId">
 
-                     <el-tree-select
 
-                        v-model="form.deptId"
 
-                        :data="deptOptions"
 
-                        :props="{ value: 'id', label: 'label', children: 'children' }"
 
-                        value-key="id"
 
-                        placeholder="请选择归属部门"
 
-                        check-strictly
 
-                     />
 
-                  </el-form-item>
 
-               </el-col>
 
-            </el-row>
 
-            <el-row>
 
-               <el-col :span="12">
 
-                  <el-form-item label="手机号码" prop="phonenumber">
 
-                     <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="邮箱" prop="email">
 
-                     <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
 
-                  </el-form-item>
 
-               </el-col>
 
-            </el-row>
 
-            <el-row>
 
-               <el-col :span="12">
 
-                  <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
 
-                     <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
 
-                     <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
 
-                  </el-form-item>
 
-               </el-col>
 
-            </el-row>
 
-            <el-row>
 
-               <el-col :span="12">
 
-                  <el-form-item label="用户性别">
 
-                     <el-select v-model="form.sex" placeholder="请选择">
 
-                        <el-option
 
-                           v-for="dict in sys_user_sex"
 
-                           :key="dict.value"
 
-                           :label="dict.label"
 
-                           :value="dict.value"
 
-                        ></el-option>
 
-                     </el-select>
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="状态">
 
-                     <el-radio-group v-model="form.status">
 
-                        <el-radio
 
-                           v-for="dict in sys_normal_disable"
 
-                           :key="dict.value"
 
-                           :label="dict.value"
 
-                        >{{ dict.label }}</el-radio>
 
-                     </el-radio-group>
 
-                  </el-form-item>
 
-               </el-col>
 
-            </el-row>
 
-            <el-row>
 
-               <el-col :span="12">
 
-                  <el-form-item label="岗位">
 
-                     <el-select v-model="form.postIds" multiple placeholder="请选择">
 
-                        <el-option
 
-                           v-for="item in postOptions"
 
-                           :key="item.postId"
 
-                           :label="item.postName"
 
-                           :value="item.postId"
 
-                           :disabled="item.status == 1"
 
-                        ></el-option>
 
-                     </el-select>
 
-                  </el-form-item>
 
-               </el-col>
 
-               <el-col :span="12">
 
-                  <el-form-item label="角色">
 
-                     <el-select v-model="form.roleIds" multiple placeholder="请选择">
 
-                        <el-option
 
-                           v-for="item in roleOptions"
 
-                           :key="item.roleId"
 
-                           :label="item.roleName"
 
-                           :value="item.roleId"
 
-                           :disabled="item.status == 1"
 
-                        ></el-option>
 
-                     </el-select>
 
-                  </el-form-item>
 
-               </el-col>
 
-            </el-row>
 
-            <el-row>
 
-               <el-col :span="24">
 
-                  <el-form-item label="备注">
 
-                     <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
 
-                  </el-form-item>
 
-               </el-col>
 
-            </el-row>
 
-         </el-form>
 
-         <template #footer>
 
-            <div class="dialog-footer">
 
-               <el-button type="primary" @click="submitForm">确 定</el-button>
 
-               <el-button @click="cancel">取 消</el-button>
 
-            </div>
 
-         </template>
 
-      </el-dialog>
 
-
 
-      <!-- 用户导入对话框 -->
 
-      <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
 
-         <el-upload
 
-            ref="uploadRef"
 
-            :limit="1"
 
-            accept=".xlsx, .xls"
 
-            :headers="upload.headers"
 
-            :action="upload.url + '?updateSupport=' + upload.updateSupport"
 
-            :disabled="upload.isUploading"
 
-            :on-progress="handleFileUploadProgress"
 
-            :on-success="handleFileSuccess"
 
-            :auto-upload="false"
 
-            drag
 
-         >
 
-            <el-icon class="el-icon--upload"><upload-filled /></el-icon>
 
-            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
 
-            <template #tip>
 
-               <div class="el-upload__tip text-center">
 
-                  <div class="el-upload__tip">
 
-                     <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
 
-                  </div>
 
-                  <span>仅允许导入xls、xlsx格式文件。</span>
 
-                  <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
 
-               </div>
 
-            </template>
 
-         </el-upload>
 
-         <template #footer>
 
-            <div class="dialog-footer">
 
-               <el-button type="primary" @click="submitFileForm">确 定</el-button>
 
-               <el-button @click="upload.open = false">取 消</el-button>
 
-            </div>
 
-         </template>
 
-      </el-dialog>
 
-   </div>
 
-</template>
 
-
 
-<script setup name="User">
 
-import { getToken } from "@/utils/auth";
 
-import { treeselect } from "@/api/system/dept";
 
-import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser } from "@/api/system/user";
 
-
 
-const router = useRouter();
 
-const { proxy } = getCurrentInstance();
 
-const { sys_normal_disable, sys_user_sex } = proxy.useDict("sys_normal_disable", "sys_user_sex");
 
-
 
-const userList = ref([]);
 
-const open = ref(false);
 
-const loading = ref(true);
 
-const showSearch = ref(true);
 
-const ids = ref([]);
 
-const single = ref(true);
 
-const multiple = ref(true);
 
-const total = ref(0);
 
-const title = ref("");
 
-const dateRange = ref([]);
 
-const deptName = ref("");
 
-const deptOptions = ref(undefined);
 
-const initPassword = ref(undefined);
 
-const postOptions = ref([]);
 
-const roleOptions = ref([]);
 
-/*** 用户导入参数 */
 
-const upload = reactive({
 
-  // 是否显示弹出层（用户导入）
 
-  open: false,
 
-  // 弹出层标题（用户导入）
 
-  title: "",
 
-  // 是否禁用上传
 
-  isUploading: false,
 
-  // 是否更新已经存在的用户数据
 
-  updateSupport: 0,
 
-  // 设置上传的请求头部
 
-  headers: { Authorization: "Bearer " + getToken() },
 
-  // 上传的地址
 
-  url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
 
-});
 
-// 列显隐信息
 
-const columns = ref([
 
-  { key: 0, label: `用户编号`, visible: true },
 
-  { key: 1, label: `用户名称`, visible: true },
 
-  { key: 2, label: `用户昵称`, visible: true },
 
-  { key: 3, label: `部门`, visible: true },
 
-  { key: 4, label: `手机号码`, visible: true },
 
-  { key: 5, label: `状态`, visible: true },
 
-  { key: 6, label: `创建时间`, visible: true }
 
-]);
 
-
 
-const data = reactive({
 
-  form: {},
 
-  queryParams: {
 
-    pageNum: 1,
 
-    pageSize: 10,
 
-    userName: undefined,
 
-    phonenumber: undefined,
 
-    status: undefined,
 
-    deptId: undefined
 
-  },
 
-  rules: {
 
-    userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
 
-    nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
 
-    password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }],
 
-    email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
 
-    phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
 
-  }
 
-});
 
-
 
-const { queryParams, form, rules } = toRefs(data);
 
-
 
-/** 通过条件过滤节点  */
 
-const filterNode = (value, data) => {
 
-  if (!value) return true;
 
-  return data.label.indexOf(value) !== -1;
 
-};
 
-/** 根据名称筛选部门树 */
 
-watch(deptName, val => {
 
-  proxy.$refs["deptTreeRef"].filter(val);
 
-});
 
-/** 查询部门下拉树结构 */
 
-function getTreeselect() {
 
-  treeselect().then(response => {
 
-    deptOptions.value = response.data;
 
-  });
 
-};
 
-/** 查询用户列表 */
 
-function getList() {
 
-  loading.value = true;
 
-  listUser(proxy.addDateRange(queryParams.value, dateRange.value)).then(res => {
 
-    loading.value = false;
 
-    userList.value = res.data.rows;
 
-    total.value = res.data.total;
 
-  });
 
-};
 
-/** 节点单击事件 */
 
-function handleNodeClick(data) {
 
-  queryParams.value.deptId = data.id;
 
-  handleQuery();
 
-};
 
-/** 搜索按钮操作 */
 
-function handleQuery() {
 
-  queryParams.value.pageNum = 1;
 
-  getList();
 
-};
 
-/** 重置按钮操作 */
 
-function resetQuery() {
 
-  dateRange.value = [];
 
-  proxy.resetForm("queryRef");
 
-  handleQuery();
 
-};
 
-/** 删除按钮操作 */
 
-function handleDelete(row) {
 
-  const userIds = row.userId || ids.value;
 
-  proxy.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
 
-    return delUser(userIds);
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("删除成功");
 
-  }).catch(() => {});
 
-};
 
-/** 导出按钮操作 */
 
-function handleExport() {
 
-  proxy.download("system/user/export", {
 
-    ...queryParams.value,
 
-  },`user_${new Date().getTime()}.xlsx`);
 
-};
 
-/** 用户状态修改  */
 
-function handleStatusChange(row) {
 
-  let text = row.status === "0" ? "启用" : "停用";
 
-  proxy.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?').then(function () {
 
-    return changeUserStatus(row.userId, row.status);
 
-  }).then(() => {
 
-    proxy.$modal.msgSuccess(text + "成功");
 
-  }).catch(function () {
 
-    row.status = row.status === "0" ? "1" : "0";
 
-  });
 
-};
 
-/** 更多操作 */
 
-function handleCommand(command, row) {
 
-  switch (command) {
 
-    case "handleResetPwd":
 
-      handleResetPwd(row);
 
-      break;
 
-    case "handleAuthRole":
 
-      handleAuthRole(row);
 
-      break;
 
-    default:
 
-      break;
 
-  }
 
-};
 
-/** 跳转角色分配 */
 
-function handleAuthRole(row) {
 
-  const userId = row.userId;
 
-  router.push("/system/user-auth/role/" + userId);
 
-};
 
-/** 重置密码按钮操作 */
 
-function handleResetPwd(row) {
 
-  proxy.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
 
-    confirmButtonText: "确定",
 
-    cancelButtonText: "取消",
 
-    closeOnClickModal: false,
 
-    inputPattern: /^.{5,20}$/,
 
-    inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
 
-  }).then(({ value }) => {
 
-    resetUserPwd(row.userId, value).then(response => {
 
-      proxy.$modal.msgSuccess("修改成功，新密码是：" + value);
 
-    });
 
-  }).catch(() => {});
 
-};
 
-/** 选择条数  */
 
-function handleSelectionChange(selection) {
 
-  ids.value = selection.map(item => item.userId);
 
-  single.value = selection.length != 1;
 
-  multiple.value = !selection.length;
 
-};
 
-/** 导入按钮操作 */
 
-function handleImport() {
 
-  upload.title = "用户导入";
 
-  upload.open = true;
 
-};
 
-/** 下载模板操作 */
 
-function importTemplate() {
 
-  proxy.download("system/user/importTemplate", {
 
-  }, `user_template_${new Date().getTime()}.xlsx`);
 
-};
 
-/**文件上传中处理 */
 
-const handleFileUploadProgress = (event, file, fileList) => {
 
-  upload.isUploading = true;
 
-};
 
-/** 文件上传成功处理 */
 
-const handleFileSuccess = (response, file, fileList) => {
 
-  upload.open = false;
 
-  upload.isUploading = false;
 
-  proxy.$refs["uploadRef"].handleRemove(file);
 
-  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
 
-  getList();
 
-};
 
-/** 提交上传文件 */
 
-function submitFileForm() {
 
-  proxy.$refs["uploadRef"].submit();
 
-};
 
-/** 初始化部门数据 */
 
-function initTreeData() {
 
-  // 判断部门的数据是否存在，存在不获取，不存在则获取
 
-  if (deptOptions.value === undefined) {
 
-    treeselect().then(response => {
 
-      deptOptions.value = response.data;
 
-    });
 
-  }
 
-};
 
-/** 重置操作表单 */
 
-function reset() {
 
-  form.value = {
 
-    userId: undefined,
 
-    deptId: undefined,
 
-    userName: undefined,
 
-    nickName: undefined,
 
-    password: undefined,
 
-    phonenumber: undefined,
 
-    email: undefined,
 
-    sex: undefined,
 
-    status: "0",
 
-    remark: undefined,
 
-    postIds: [],
 
-    roleIds: []
 
-  };
 
-  proxy.resetForm("userRef");
 
-};
 
-/** 取消按钮 */
 
-function cancel() {
 
-  open.value = false;
 
-  reset();
 
-};
 
-/** 新增按钮操作 */
 
-function handleAdd() {
 
-  reset();
 
-  initTreeData();
 
-  getUser().then(response => {
 
-    postOptions.value = response.data.posts;
 
-    roleOptions.value = response.data.roles;
 
-    open.value = true;
 
-    title.value = "添加用户";
 
-    form.value.password = initPassword.value;
 
-  });
 
-};
 
-/** 修改按钮操作 */
 
-function handleUpdate(row) {
 
-  reset();
 
-  initTreeData();
 
-  const userId = row.userId || ids.value;
 
-  getUser(userId).then(response => {
 
-    form.value = response.data.data;
 
-    postOptions.value = response.data.posts;
 
-    roleOptions.value = response.data.roles;
 
-    form.value.postIds = response.data.postIds;
 
-    form.value.roleIds = response.data.roleIds;
 
-    open.value = true;
 
-    title.value = "修改用户";
 
-    form.password = "";
 
-  });
 
-};
 
-/** 提交按钮 */
 
-function submitForm() {
 
-  proxy.$refs["userRef"].validate(valid => {
 
-    if (valid) {
 
-      if (form.value.userId != undefined) {
 
-        updateUser(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("修改成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      } else {
 
-        addUser(form.value).then(response => {
 
-          proxy.$modal.msgSuccess("新增成功");
 
-          open.value = false;
 
-          getList();
 
-        });
 
-      }
 
-    }
 
-  });
 
-};
 
-
 
-getTreeselect();
 
-getList();
 
-</script>

+ 0 - 87
src/views/system/user/profile/index.vue
View File 

@@ -1,87 +0,0 @@
 
-<template>
 
-   <div class="app-container">
 
-      <el-row :gutter="20">
 
-         <el-col :span="6" :xs="24">
 
-            <el-card class="box-card">
 
-               <template v-slot:header>
 
-                 <div class="clearfix">
 
-                   <span>个人信息</span>
 
-                 </div>
 
-               </template>
 
-               <div>
 
-                  <div class="text-center">
 
-                     <userAvatar :user="state.user" />
 
-                  </div>
 
-                  <ul class="list-group list-group-striped">
 
-                     <li class="list-group-item">
 
-                        <svg-icon icon-class="user" />用户名称
 
-                        <div class="pull-right">{{ state.user.userName }}</div>
 
-                     </li>
 
-                     <li class="list-group-item">
 
-                        <svg-icon icon-class="phone" />手机号码
 
-                        <div class="pull-right">{{ state.user.phonenumber }}</div>
 
-                     </li>
 
-                     <li class="list-group-item">
 
-                        <svg-icon icon-class="email" />用户邮箱
 
-                        <div class="pull-right">{{ state.user.email }}</div>
 
-                     </li>
 
-                     <li class="list-group-item">
 
-                        <svg-icon icon-class="tree" />所属部门
 
-                        <div class="pull-right" v-if="state.user.dept">{{ state.user.dept.deptName }} / {{ state.postGroup }}</div>
 
-                     </li>
 
-                     <li class="list-group-item">
 
-                        <svg-icon icon-class="peoples" />所属角色
 
-                        <div class="pull-right">{{ state.roleGroup }}</div>
 
-                     </li>
 
-                     <li class="list-group-item">
 
-                        <svg-icon icon-class="date" />创建日期
 
-                        <div class="pull-right">{{ state.user.createTime }}</div>
 
-                     </li>
 
-                  </ul>
 
-               </div>
 
-            </el-card>
 
-         </el-col>
 
-         <el-col :span="18" :xs="24">
 
-            <el-card>
 
-               <template v-slot:header>
 
-                 <div class="clearfix">
 
-                   <span>基本资料</span>
 
-                 </div>
 
-               </template>
 
-               <el-tabs v-model="activeTab">
 
-                  <el-tab-pane label="基本资料" name="userinfo">
 
-                     <userInfo :user="state.user" />
 
-                  </el-tab-pane>
 
-                  <el-tab-pane label="修改密码" name="resetPwd">
 
-                     <resetPwd :user="state.user" />
 
-                  </el-tab-pane>
 
-               </el-tabs>
 
-            </el-card>
 
-         </el-col>
 
-      </el-row>
 
-   </div>
 
-</template>
 
-
 
-<script setup name="Profile">
 
-import userAvatar from "./userAvatar";
 
-import userInfo from "./userInfo";
 
-import resetPwd from "./resetPwd";
 
-import { getUserProfile } from "@/api/system/user";
 
-
 
-const activeTab = ref("userinfo");
 
-const state = reactive({
 
-  user: {},
 
-  roleGroup: {},
 
-  postGroup: {}
 
-});
 
-
 
-function getUser() {
 
-  getUserProfile().then(response => {
 
-    state.user = response.data;
 
-    state.roleGroup = response.roleGroup;
 
-    state.postGroup = response.postGroup;
 
-  });
 
-};
 
-
 
-getUser();
 
-</script>

+ 0 - 57
src/views/system/user/profile/resetPwd.vue
View File 

@@ -1,57 +0,0 @@
 
-<template>
 
-   <el-form ref="pwdRef" :model="user" :rules="rules" label-width="80px">
 
-      <el-form-item label="旧密码" prop="oldPassword">
 
-         <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password />
 
-      </el-form-item>
 
-      <el-form-item label="新密码" prop="newPassword">
 
-         <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password />
 
-      </el-form-item>
 
-      <el-form-item label="确认密码" prop="confirmPassword">
 
-         <el-input v-model="user.confirmPassword" placeholder="请确认密码" type="password" show-password/>
 
-      </el-form-item>
 
-      <el-form-item>
 
-      <el-button type="primary" @click="submit">保存</el-button>
 
-      <el-button type="danger" @click="close">关闭</el-button>
 
-      </el-form-item>
 
-   </el-form>
 
-</template>
 
-
 
-<script setup>
 
-import { updateUserPwd } from "@/api/system/user";
 
-
 
-const { proxy } = getCurrentInstance();
 
-
 
-const user = reactive({
 
-  oldPassword: undefined,
 
-  newPassword: undefined,
 
-  confirmPassword: undefined
 
-});
 
-
 
-const equalToPassword = (rule, value, callback) => {
 
-  if (user.newPassword !== value) {
 
-    callback(new Error("两次输入的密码不一致"));
 
-  } else {
 
-    callback();
 
-  }
 
-};
 
-const rules = ref({
 
-  oldPassword: [{ required: true, message: "旧密码不能为空", trigger: "blur" }],
 
-  newPassword: [{ required: true, message: "新密码不能为空", trigger: "blur" }, { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }],
 
-  confirmPassword: [{ required: true, message: "确认密码不能为空", trigger: "blur" }, { required: true, validator: equalToPassword, trigger: "blur" }]
 
-});
 
-
 
-/** 提交按钮 */
 
-function submit() {
 
-  proxy.$refs.pwdRef.validate(valid => {
 
-    if (valid) {
 
-      updateUserPwd(user.oldPassword, user.newPassword).then(response => {
 
-        proxy.$modal.msgSuccess("修改成功");
 
-      });
 
-    }
 
-  });
 
-};
 
-/** 关闭按钮 */
 
-function close() {
 
-  proxy.$tab.closePage();
 
-};
 
-</script>

+ 0 - 161
src/views/system/user/profile/userAvatar.vue
View File 

@@ -1,161 +0,0 @@
 
-<template>
 
-  <div class="user-info-head" @click="editCropper()"><img :src="options.img" title="点击上传头像" class="img-circle img-lg" /></div>
 
-  <el-dialog :title="title" v-model="open" width="800px" append-to-body @opened="modalOpened"  @close="closeDialog">
 
-    <el-row>
 
-      <el-col :xs="24" :md="12" :style="{height: '350px'}">
 
-        <vue-cropper
 
-            ref="cropper"
 
-            :img="options.img"
 
-            :info="true"
 
-            :autoCrop="options.autoCrop"
 
-            :autoCropWidth="options.autoCropWidth"
 
-            :autoCropHeight="options.autoCropHeight"
 
-            :fixedBox="options.fixedBox"
 
-            @realTime="realTime"
 
-            v-if="visible"
 
-        />
 
-      </el-col>
 
-      <el-col :xs="24" :md="12" :style="{height: '350px'}">
 
-        <div class="avatar-upload-preview">
 
-          <img :src="options.previews.url" :style="options.previews.img"/>
 
-        </div>
 
-      </el-col>
 
-    </el-row>
 
-    <br/>
 
-    <el-row>
 
-      <el-col :lg="2" :md="2">
 
-        <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
 
-          <el-button>
 
-            选择
 
-            <el-icon class="el-icon--right"><Upload /></el-icon>
 
-          </el-button>
 
-        </el-upload>
 
-      </el-col>
 
-      <el-col :lg="{span: 1, offset: 2}" :md="2">
 
-        <el-button icon="Plus" @click="changeScale(1)"></el-button>
 
-      </el-col>
 
-      <el-col :lg="{span: 1, offset: 1}" :md="2">
 
-        <el-button icon="Minus" @click="changeScale(-1)"></el-button>
 
-      </el-col>
 
-      <el-col :lg="{span: 1, offset: 1}" :md="2">
 
-        <el-button icon="RefreshLeft" @click="rotateLeft()"></el-button>
 
-      </el-col>
 
-      <el-col :lg="{span: 1, offset: 1}" :md="2">
 
-        <el-button icon="RefreshRight" @click="rotateRight()"></el-button>
 
-      </el-col>
 
-      <el-col :lg="{span: 2, offset: 6}" :md="2">
 
-        <el-button type="primary" @click="uploadImg()">提 交</el-button>
 
-      </el-col>
 
-    </el-row>
 
-  </el-dialog>
 
-</template>
 
-
 
-<script setup>
 
-import "vue-cropper/dist/index.css";
 
-import { VueCropper } from "vue-cropper";
 
-import { uploadAvatar } from "@/api/system/user";
 
-import useUserStore from '@/store/modules/user'
 
-
 
-const userStore = useUserStore()
 
-const { proxy } = getCurrentInstance();
 
-
 
-const open = ref(false);
 
-const visible = ref(false);
 
-const title = ref("修改头像");
 
-
 
-//图片裁剪数据
 
-const options = reactive({
 
-  img: userStore.avatar, // 裁剪图片的地址
 
-  autoCrop: true, // 是否默认生成截图框
 
-  autoCropWidth: 200, // 默认生成截图框宽度
 
-  autoCropHeight: 200, // 默认生成截图框高度
 
-  fixedBox: true, // 固定截图框大小 不允许改变
 
-  previews: {} //预览数据
 
-});
 
-
 
-/** 编辑头像 */
 
-function editCropper() {
 
-  open.value = true;
 
-};
 
-/** 打开弹出层结束时的回调 */
 
-function modalOpened() {
 
-  visible.value = true;
 
-};
 
-/** 覆盖默认上传行为 */
 
-function requestUpload() {
 
-};
 
-/** 向左旋转 */
 
-function rotateLeft() {
 
-  proxy.$refs.cropper.rotateLeft();
 
-};
 
-/** 向右旋转 */
 
-function rotateRight() {
 
-  proxy.$refs.cropper.rotateRight();
 
-};
 
-/** 图片缩放 */
 
-function changeScale(num) {
 
-  num = num || 1;
 
-  proxy.$refs.cropper.changeScale(num);
 
-};
 
-/** 上传预处理 */
 
-function beforeUpload(file) {
 
-  if (file.type.indexOf("image/") == -1) {
 
-    proxy.$modal.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");
 
-  } else {
 
-    const reader = new FileReader();
 
-    reader.readAsDataURL(file);
 
-    reader.onload = () => {
 
-      options.img = reader.result;
 
-    };
 
-  }
 
-};
 
-/** 上传图片 */
 
-function uploadImg() {
 
-  proxy.$refs.cropper.getCropBlob(data => {
 
-    let formData = new FormData();
 
-    formData.append("avatarfile", data);
 
-    uploadAvatar(formData).then(response => {
 
-      open.value = false;
 
-      options.img = response.imgUrl;
 
-      userStore.avatar = options.img;
 
-      proxy.$modal.msgSuccess("修改成功");
 
-      visible.value = false;
 
-    });
 
-  });
 
-};
 
-/** 实时预览 */
 
-function realTime(data) {
 
-  options.previews = data;
 
-};
 
-/** 关闭窗口 */
 
-function closeDialog() {
 
-  options.img = userStore.avatar;
 
-  options.visible = false;
 
-};
 
-</script>
 
-
 
-<style lang='scss' scoped>
 
-.user-info-head {
 
-  position: relative;
 
-  display: inline-block;
 
-  height: 120px;
 
-}
 
-
 
-.user-info-head:hover:after {
 
-  content: "+";
 
-  position: absolute;
 
-  left: 0;
 
-  right: 0;
 
-  top: 0;
 
-  bottom: 0;
 
-  color: #eee;
 
-  background: rgba(0, 0, 0, 0.5);
 
-  font-size: 24px;
 
-  font-style: normal;
 
-  -webkit-font-smoothing: antialiased;
 
-  -moz-osx-font-smoothing: grayscale;
 
-  cursor: pointer;
 
-  line-height: 110px;
 
-  border-radius: 50%;
 
-}
 
-</style>

+ 0 - 56
src/views/system/user/profile/userInfo.vue
View File 

@@ -1,56 +0,0 @@
 
-<template>
 
-   <el-form ref="userRef" :model="user" :rules="rules" label-width="80px">
 
-      <el-form-item label="用户昵称" prop="nickName">
 
-         <el-input v-model="user.nickName" maxlength="30" />
 
-      </el-form-item>
 
-      <el-form-item label="手机号码" prop="phonenumber">
 
-         <el-input v-model="user.phonenumber" maxlength="11" />
 
-      </el-form-item>
 
-      <el-form-item label="邮箱" prop="email">
 
-         <el-input v-model="user.email" maxlength="50" />
 
-      </el-form-item>
 
-      <el-form-item label="性别">
 
-         <el-radio-group v-model="user.sex">
 
-            <el-radio label="0">男</el-radio>
 
-            <el-radio label="1">女</el-radio>
 
-         </el-radio-group>
 
-      </el-form-item>
 
-      <el-form-item>
 
-      <el-button type="primary" @click="submit">保存</el-button>
 
-      <el-button type="danger" @click="close">关闭</el-button>
 
-      </el-form-item>
 
-   </el-form>
 
-</template>
 
-
 
-<script setup>
 
-import { updateUserProfile } from "@/api/system/user";
 
-
 
-const props = defineProps({
 
-  user: {
 
-    type: Object
 
-  }
 
-});
 
-
 
-const { proxy } = getCurrentInstance();
 
-
 
-const rules = ref({
 
-  nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
 
-  email: [{ required: true, message: "邮箱地址不能为空", trigger: "blur" }, { type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
 
-  phonenumber: [{ required: true, message: "手机号码不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
 
-});
 
-
 
-/** 提交按钮 */
 
-function submit() {
 
-  proxy.$refs.userRef.validate(valid => {
 
-    if (valid) {
 
-      updateUserProfile(props.user).then(response => {
 
-        proxy.$modal.msgSuccess("修改成功");
 
-      });
 
-    }
 
-  });
 
-};
 
-/** 关闭按钮 */
 
-function close() {
 
-  proxy.$tab.closePage();
 
-};
 
-</script>

+ 0 - 3
src/views/tool/build/index.vue
View File 

@@ -1,3 +0,0 @@
 
-<template>
 
-   <div> 表单构建 <svg-icon icon-class="build" /> </div>
 
-</template>

+ 0 - 48
src/views/tool/gen/basicInfoForm.vue
View File 

@@ -1,48 +0,0 @@
 
-<template>
 
-  <el-form ref="basicInfoForm" :model="info" :rules="rules" label-width="150px">
 
-    <el-row>
 
-      <el-col :span="12">
 
-        <el-form-item label="表名称" prop="tableName">
 
-          <el-input placeholder="请输入仓库名称" v-model="info.tableName" />
 
-        </el-form-item>
 
-      </el-col>
 
-      <el-col :span="12">
 
-        <el-form-item label="表描述" prop="tableComment">
 
-          <el-input placeholder="请输入" v-model="info.tableComment" />
 
-        </el-form-item>
 
-      </el-col>
 
-      <el-col :span="12">
 
-        <el-form-item label="实体类名称" prop="className">
 
-          <el-input placeholder="请输入" v-model="info.className" />
 
-        </el-form-item>
 
-      </el-col>
 
-      <el-col :span="12">
 
-        <el-form-item label="作者" prop="functionAuthor">
 
-          <el-input placeholder="请输入" v-model="info.functionAuthor" />
 
-        </el-form-item>
 
-      </el-col>
 
-      <el-col :span="24">
 
-        <el-form-item label="备注" prop="remark">
 
-          <el-input type="textarea" :rows="3" v-model="info.remark"></el-input>
 
-        </el-form-item>
 
-      </el-col>
 
-    </el-row>
 
-  </el-form>
 
-</template>
 
-
 
-<script setup>
 
-defineProps({
 
-  info: {
 
-    type: Object,
 
-    default: null
 
-  }
 
-});
 
-
 
-// 表单校验
 
-const rules = ref({
 
-  tableName: [{ required: true, message: "请输入表名称", trigger: "blur" }],
 
-  tableComment: [{ required: true, message: "请输入表描述", trigger: "blur" }],
 
-  className: [{ required: true, message: "请输入实体类名称", trigger: "blur" }],
 
-  functionAuthor: [{ required: true, message: "请输入作者", trigger: "blur" }]
 
-});
 
-</script>

+ 0 - 198
src/views/tool/gen/editTable.vue
View File 

@@ -1,198 +0,0 @@
 
-<template>
 
-  <el-card>
 
-    <el-tabs v-model="activeName">
 
-      <el-tab-pane label="基本信息" name="basic">
 
-        <basic-info-form ref="basicInfo" :info="info" />
 
-      </el-tab-pane>
 
-      <el-tab-pane label="字段信息" name="columnInfo">
 
-        <el-table ref="dragTable" :data="columns" row-key="columnId" :max-height="tableHeight">
 
-          <el-table-column label="序号" type="index" min-width="5%"/>
 
-          <el-table-column
 
-            label="字段列名"
 
-            prop="columnName"
 
-            min-width="10%"
 
-            :show-overflow-tooltip="true"
 
-          />
 
-          <el-table-column label="字段描述" min-width="10%">
 
-            <template #default="scope">
 
-              <el-input v-model="scope.row.columnComment"></el-input>
 
-            </template>
 
-          </el-table-column>
 
-          <el-table-column
 
-            label="物理类型"
 
-            prop="columnType"
 
-            min-width="10%"
 
-            :show-overflow-tooltip="true"
 
-          />
 
-          <el-table-column label="Java类型" min-width="11%">
 
-            <template #default="scope">
 
-              <el-select v-model="scope.row.javaType">
 
-                <el-option label="Long" value="Long" />
 
-                <el-option label="String" value="String" />
 
-                <el-option label="Integer" value="Integer" />
 
-                <el-option label="Double" value="Double" />
 
-                <el-option label="BigDecimal" value="BigDecimal" />
 
-                <el-option label="Date" value="Date" />
 
-                <el-option label="Boolean" value="Boolean" />
 
-              </el-select>
 
-            </template>
 
-          </el-table-column>
 
-          <el-table-column label="java属性" min-width="10%">
 
-            <template #default="scope">
 
-              <el-input v-model="scope.row.javaField"></el-input>
 
-            </template>
 
-          </el-table-column>
 
-
 
-          <el-table-column label="插入" min-width="5%">
 
-            <template #default="scope">
 
-              <el-checkbox true-label="1" v-model="scope.row.isInsert"></el-checkbox>
 
-            </template>
 
-          </el-table-column>
 
-          <el-table-column label="编辑" min-width="5%">
 
-            <template #default="scope">
 
-              <el-checkbox true-label="1" v-model="scope.row.isEdit"></el-checkbox>
 
-            </template>
 
-          </el-table-column>
 
-          <el-table-column label="列表" min-width="5%">
 
-            <template #default="scope">
 
-              <el-checkbox true-label="1" v-model="scope.row.isList"></el-checkbox>
 
-            </template>
 
-          </el-table-column>
 
-          <el-table-column label="查询" min-width="5%">
 
-            <template #default="scope">
 
-              <el-checkbox true-label="1" v-model="scope.row.isQuery"></el-checkbox>
 
-            </template>
 
-          </el-table-column>
 
-          <el-table-column label="查询方式" min-width="10%">
 
-            <template #default="scope">
 
-              <el-select v-model="scope.row.queryType">
 
-                <el-option label="=" value="EQ" />
 
-                <el-option label="!=" value="NE" />
 
-                <el-option label=">" value="GT" />
 
-                <el-option label=">=" value="GTE" />
 
-                <el-option label="<" value="LT" />
 
-                <el-option label="<=" value="LTE" />
 
-                <el-option label="LIKE" value="LIKE" />
 
-                <el-option label="BETWEEN" value="BETWEEN" />
 
-              </el-select>
 
-            </template>
 
-          </el-table-column>
 
-          <el-table-column label="必填" min-width="5%">
 
-            <template #default="scope">
 
-              <el-checkbox true-label="1" v-model="scope.row.isRequired"></el-checkbox>
 
-            </template>
 
-          </el-table-column>
 
-          <el-table-column label="显示类型" min-width="12%">
 
-            <template #default="scope">
 
-              <el-select v-model="scope.row.htmlType">
 
-                <el-option label="文本框" value="input" />
 
-                <el-option label="文本域" value="textarea" />
 
-                <el-option label="下拉框" value="select" />
 
-                <el-option label="单选框" value="radio" />
 
-                <el-option label="复选框" value="checkbox" />
 
-                <el-option label="日期控件" value="datetime" />
 
-                <el-option label="图片上传" value="imageUpload" />
 
-                <el-option label="文件上传" value="fileUpload" />
 
-                <el-option label="富文本控件" value="editor" />
 
-              </el-select>
 
-            </template>
 
-          </el-table-column>
 
-          <el-table-column label="字典类型" min-width="12%">
 
-            <template #default="scope">
 
-              <el-select v-model="scope.row.dictType" clearable filterable placeholder="请选择">
 
-                <el-option
 
-                  v-for="dict in dictOptions"
 
-                  :key="dict.dictType"
 
-                  :label="dict.dictName"
 
-                  :value="dict.dictType">
 
-                  <span style="float: left">{{ dict.dictName }}</span>
 
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.dictType }}</span>
 
-              </el-option>
 
-              </el-select>
 
-            </template>
 
-          </el-table-column>
 
-        </el-table>
 
-      </el-tab-pane>
 
-      <el-tab-pane label="生成信息" name="genInfo">
 
-        <gen-info-form ref="genInfo" :info="info" :tables="tables" />
 
-      </el-tab-pane>
 
-    </el-tabs>
 
-    <el-form label-width="100px">
 
-      <div style="text-align: center;margin-left:-100px;margin-top:10px;">
 
-        <el-button type="primary" @click="submitForm()">提交</el-button>
 
-        <el-button @click="close()">返回</el-button>
 
-      </div>
 
-    </el-form>
 
-  </el-card>
 
-</template>
 
-
 
-<script setup name="GenEdit">
 
-import { getGenTable, updateGenTable } from "@/api/tool/gen";
 
-import { optionselect as getDictOptionselect } from "@/api/system/dict/type";
 
-import basicInfoForm from "./basicInfoForm";
 
-import genInfoForm from "./genInfoForm";
 
-
 
-const route = useRoute();
 
-const { proxy } = getCurrentInstance();
 
-
 
-const activeName = ref("columnInfo");
 
-const tableHeight = ref(document.documentElement.scrollHeight - 245 + "px");
 
-const tables = ref([]);
 
-const columns = ref([]);
 
-const dictOptions = ref([]);
 
-const info = ref({});
 
-
 
-/** 提交按钮 */
 
-function submitForm() {
 
-  const basicForm = proxy.$refs.basicInfo.$refs.basicInfoForm;
 
-  const genForm = proxy.$refs.genInfo.$refs.genInfoForm;
 
-  Promise.all([basicForm, genForm].map(getFormPromise)).then(res => {
 
-    const validateResult = res.every(item => !!item);
 
-    if (validateResult) {
 
-      const genTable = Object.assign({}, info.value);
 
-      genTable.columns = columns.value;
 
-      genTable.params = {
 
-        treeCode: info.value.treeCode,
 
-        treeName: info.value.treeName,
 
-        treeParentCode: info.value.treeParentCode,
 
-        parentMenuId: info.value.parentMenuId
 
-      };
 
-      updateGenTable(genTable).then(res => {
 
-        proxy.$modal.msgSuccess(res.msg);
 
-        if (res.code === 200) {
 
-          close();
 
-        }
 
-      });
 
-    } else {
 
-      proxy.$modal.msgError("表单校验未通过，请重新检查提交内容");
 
-    }
 
-  });
 
-}
 
-function getFormPromise(form) {
 
-  return new Promise(resolve => {
 
-    form.validate(res => {
 
-      resolve(res);
 
-    });
 
-  });
 
-}
 
-function close() {
 
-  const obj = { path: "/tool/gen", query: { t: Date.now(), pageNum: route.query.pageNum } };
 
-  proxy.$tab.closeOpenPage(obj);
 
-}
 
-
 
-(() => {
 
-  const tableId = route.params && route.params.tableId;
 
-  if (tableId) {
 
-    // 获取表详细信息
 
-    getGenTable(tableId).then(res => {
 
-      columns.value = res.data.rows;
 
-      info.value = res.data.info;
 
-      tables.value = res.data.tables;
 
-    });
 
-    /** 查询字典下拉列表 */
 
-    getDictOptionselect().then(response => {
 
-      dictOptions.value = response.data;
 
-    });
 
-  }
 
-})();
 
-</script>

+ 0 - 281
src/views/tool/gen/genInfoForm.vue
View File 

@@ -1,281 +0,0 @@
 
-<template>
 
-  <el-form ref="genInfoForm" :model="info" :rules="rules" label-width="150px">
 
-    <el-row>
 
-      <el-col :span="12">
 
-        <el-form-item prop="tplCategory">
 
-          <template #label>生成模板</template>
 
-          <el-select v-model="info.tplCategory" @change="tplSelectChange">
 
-            <el-option label="单表（增删改查）" value="crud" />
 
-            <el-option label="树表（增删改查）" value="tree" />
 
-            <el-option label="主子表（增删改查）" value="sub" />
 
-          </el-select>
 
-        </el-form-item>
 
-      </el-col>
 
-
 
-      <el-col :span="12">
 
-        <el-form-item prop="packageName">
 
-          <template #label>
 
-            生成包路径
 
-            <el-tooltip content="生成在哪个java包下，例如 com.ruoyi.system" placement="top">
 
-              <el-icon><question-filled /></el-icon>
 
-            </el-tooltip>
 
-          </template>
 
-          <el-input v-model="info.packageName" />
 
-        </el-form-item>
 
-      </el-col>
 
-
 
-      <el-col :span="12">
 
-        <el-form-item prop="moduleName">
 
-          <template #label>
 
-            生成模块名
 
-            <el-tooltip content="可理解为子系统名，例如 system" placement="top">
 
-              <el-icon><question-filled /></el-icon>
 
-            </el-tooltip>
 
-          </template>
 
-          <el-input v-model="info.moduleName" />
 
-        </el-form-item>
 
-      </el-col>
 
-
 
-      <el-col :span="12">
 
-        <el-form-item prop="businessName">
 
-          <template #label>
 
-            生成业务名
 
-            <el-tooltip content="可理解为功能英文名，例如 user" placement="top">
 
-              <el-icon><question-filled /></el-icon>
 
-            </el-tooltip>
 
-          </template>
 
-          <el-input v-model="info.businessName" />
 
-        </el-form-item>
 
-      </el-col>
 
-
 
-      <el-col :span="12">
 
-        <el-form-item prop="functionName">
 
-          <template #label>
 
-            生成功能名
 
-            <el-tooltip content="用作类描述，例如 用户" placement="top">
 
-              <el-icon><question-filled /></el-icon>
 
-            </el-tooltip>
 
-          </template>
 
-          <el-input v-model="info.functionName" />
 
-        </el-form-item>
 
-      </el-col>
 
-
 
-      <el-col :span="12">
 
-        <el-form-item>
 
-          <template #label>
 
-            上级菜单
 
-            <el-tooltip content="分配到指定菜单下，例如 系统管理" placement="top">
 
-              <el-icon><question-filled /></el-icon>
 
-            </el-tooltip>
 
-          </template>
 
-          <tree-select
 
-            v-model:value="info.parentMenuId"
 
-            :options="menuOptions"
 
-            :objMap="{ value: 'menuId', label: 'menuName', children: 'children' }"
 
-            placeholder="请选择系统菜单"
 
-          />
 
-        </el-form-item>
 
-      </el-col>
 
-
 
-      <el-col :span="12">
 
-        <el-form-item prop="genType">
 
-          <template #label>
 
-            生成代码方式
 
-            <el-tooltip content="默认为zip压缩包下载，也可以自定义生成路径" placement="top">
 
-              <el-icon><question-filled /></el-icon>
 
-            </el-tooltip>
 
-          </template>
 
-          <el-radio v-model="info.genType" label="0">zip压缩包</el-radio>
 
-          <el-radio v-model="info.genType" label="1">自定义路径</el-radio>
 
-        </el-form-item>
 
-      </el-col>
 
-
 
-      <el-col :span="24" v-if="info.genType == '1'">
 
-        <el-form-item prop="genPath">
 
-          <template #label>
 
-            自定义路径
 
-            <el-tooltip content="填写磁盘绝对路径，若不填写，则生成到当前Web项目下" placement="top">
 
-              <el-icon><question-filled /></el-icon>
 
-            </el-tooltip>
 
-          </template>
 
-          <el-input v-model="info.genPath">
 
-            <template #append>
 
-              <el-dropdown>
 
-                <el-button type="primary">
 
-                  最近路径快速选择
 
-                  <i class="el-icon-arrow-down el-icon--right"></i>
 
-                </el-button>
 
-                <template #dropdown>
 
-                  <el-dropdown-menu>
 
-                    <el-dropdown-item @click="info.genPath = '/'">恢复默认的生成基础路径</el-dropdown-item>
 
-                  </el-dropdown-menu>
 
-                </template>
 
-              </el-dropdown>
 
-            </template>
 
-          </el-input>
 
-        </el-form-item>
 
-      </el-col>
 
-    </el-row>
 
-    
-    <template v-if="info.tplCategory == 'tree'">
 
-      <h4 class="form-header">其他信息</h4>
 
-      <el-row v-show="info.tplCategory == 'tree'">
 
-        <el-col :span="12">
 
-          <el-form-item>
 
-            <template #label>
 
-              树编码字段
 
-              <el-tooltip content="树显示的编码字段名， 如：dept_id" placement="top">
 
-                <el-icon><question-filled /></el-icon>
 
-              </el-tooltip>
 
-            </template>
 
-            <el-select v-model="info.treeCode" placeholder="请选择">
 
-              <el-option
 
-                v-for="(column, index) in info.columns"
 
-                :key="index"
 
-                :label="column.columnName + '：' + column.columnComment"
 
-                :value="column.columnName"
 
-              ></el-option>
 
-            </el-select>
 
-          </el-form-item>
 
-        </el-col>
 
-        <el-col :span="12">
 
-          <el-form-item>
 
-            <template #label>
 
-              树父编码字段
 
-              <el-tooltip content="树显示的父编码字段名， 如：parent_Id" placement="top">
 
-                <el-icon><question-filled /></el-icon>
 
-              </el-tooltip>
 
-            </template>
 
-            <el-select v-model="info.treeParentCode" placeholder="请选择">
 
-              <el-option
 
-                v-for="(column, index) in info.columns"
 
-                :key="index"
 
-                :label="column.columnName + '：' + column.columnComment"
 
-                :value="column.columnName"
 
-              ></el-option>
 
-            </el-select>
 
-          </el-form-item>
 
-        </el-col>
 
-        <el-col :span="12">
 
-          <el-form-item>
 
-            <template #label>
 
-              树名称字段
 
-              <el-tooltip content="树节点的显示名称字段名， 如：dept_name" placement="top">
 
-                <el-icon><question-filled /></el-icon>
 
-              </el-tooltip>
 
-            </template>
 
-            <el-select v-model="info.treeName" placeholder="请选择">
 
-              <el-option
 
-                v-for="(column, index) in info.columns"
 
-                :key="index"
 
-                :label="column.columnName + '：' + column.columnComment"
 
-                :value="column.columnName"
 
-              ></el-option>
 
-            </el-select>
 
-          </el-form-item>
 
-        </el-col>
 
-      </el-row>
 
-    </template>
 
-
 
-    <template v-if="info.tplCategory == 'sub'">
 
-      <h4 class="form-header">关联信息</h4>
 
-      <el-row>
 
-        <el-col :span="12">
 
-          <el-form-item>
 
-            <template #label>
 
-              关联子表的表名
 
-              <el-tooltip content="关联子表的表名， 如：sys_user" placement="top">
 
-                <el-icon><question-filled /></el-icon>
 
-              </el-tooltip>
 
-            </template>
 
-            <el-select v-model="info.subTableName" placeholder="请选择" @change="subSelectChange">
 
-              <el-option
 
-                v-for="(table, index) in tables"
 
-                :key="index"
 
-                :label="table.tableName + '：' + table.tableComment"
 
-                :value="table.tableName"
 
-              ></el-option>
 
-            </el-select>
 
-          </el-form-item>
 
-        </el-col>
 
-        <el-col :span="12">
 
-          <el-form-item>
 
-            <template #label>
 
-              子表关联的外键名
 
-              <el-tooltip content="子表关联的外键名， 如：user_id" placement="top">
 
-                <el-icon><question-filled /></el-icon>
 
-              </el-tooltip>
 
-            </template>
 
-            <el-select v-model="info.subTableFkName" placeholder="请选择">
 
-              <el-option
 
-                v-for="(column, index) in subColumns"
 
-                :key="index"
 
-                :label="column.columnName + '：' + column.columnComment"
 
-                :value="column.columnName"
 
-              ></el-option>
 
-            </el-select>
 
-          </el-form-item>
 
-        </el-col>
 
-      </el-row>
 
-    </template>
 
-
 
-  </el-form>
 
-</template>
 
-
 
-<script setup>
 
-import { listMenu } from "@/api/system/menu";
 
-
 
-const subColumns = ref([]);
 
-const menuOptions = ref({});
 
-const { proxy } = getCurrentInstance();
 
-
 
-const props = defineProps({
 
-  info: {
 
-    type: Object,
 
-    default: null
 
-  },
 
-  tables: {
 
-    type: Array,
 
-    default: null
 
-  }
 
-});
 
-
 
-// 表单校验
 
-const rules = ref({
 
-  tplCategory: [{ required: true, message: "请选择生成模板", trigger: "blur" }],
 
-  packageName: [{ required: true, message: "请输入生成包路径", trigger: "blur" }],
 
-  moduleName: [{ required: true, message: "请输入生成模块名", trigger: "blur" }],
 
-  businessName: [{ required: true, message: "请输入生成业务名", trigger: "blur" }],
 
-  functionName: [{ required: true, message: "请输入生成功能名", trigger: "blur" }]
 
-});
 
-function subSelectChange(value) {
 
-  props.info.subTableFkName = "";
 
-}
 
-function tplSelectChange(value) {
 
-  if (value !== "sub") {
 
-    props.info.subTableName = "";
 
-    props.info.subTableFkName = "";
 
-  }
 
-}
 
-function setSubTableColumns(value) {
 
-  for (var item in props.tables) {
 
-    const name = props.tables[item].tableName;
 
-    if (value === name) {
 
-      subColumns.value = props.tables[item].columns;
 
-      break;
 
-    }
 
-  }
 
-}
 
-/** 查询菜单下拉树结构 */
 
-function getMenuTreeselect() {
 
-  listMenu().then(response => {
 
-    menuOptions.value = proxy.handleTree(response.data, "menuId");
 
-  });
 
-}
 
-
 
-watch(() => props.info.subTableName, val => {
 
-  setSubTableColumns(val);
 
-});
 
-
 
-getMenuTreeselect();
 
-</script>

+ 0 - 118
src/views/tool/gen/importTable.vue
View File 

@@ -1,118 +0,0 @@
 
-<template>
 
-  <!-- 导入表 -->
 
-  <el-dialog title="导入表" v-model="visible" width="800px" top="5vh" append-to-body>
 
-    <el-form :model="queryParams" ref="queryRef" :inline="true">
 
-      <el-form-item label="表名称" prop="tableName">
 
-        <el-input
 
-          v-model="queryParams.tableName"
 
-          placeholder="请输入表名称"
 
-          clearable
 
-          @keyup.enter="handleQuery"
 
-        />
 
-      </el-form-item>
 
-      <el-form-item label="表描述" prop="tableComment">
 
-        <el-input
 
-          v-model="queryParams.tableComment"
 
-          placeholder="请输入表描述"
 
-          clearable
 
-          @keyup.enter="handleQuery"
 
-        />
 
-      </el-form-item>
 
-      <el-form-item>
 
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
 
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
 
-      </el-form-item>
 
-    </el-form>
 
-    <el-row>
 
-      <el-table @row-click="clickRow" ref="table" :data="dbTableList" @selection-change="handleSelectionChange" height="260px">
 
-        <el-table-column type="selection" width="55"></el-table-column>
 
-        <el-table-column prop="tableName" label="表名称" :show-overflow-tooltip="true"></el-table-column>
 
-        <el-table-column prop="tableComment" label="表描述" :show-overflow-tooltip="true"></el-table-column>
 
-        <el-table-column prop="createTime" label="创建时间"></el-table-column>
 
-        <el-table-column prop="updateTime" label="更新时间"></el-table-column>
 
-      </el-table>
 
-      <pagination
 
-        v-show="total>0"
 
-        :total="total"
 
-        v-model:page="queryParams.pageNum"
 
-        v-model:limit="queryParams.pageSize"
 
-        @pagination="getList"
 
-      />
 
-    </el-row>
 
-    <template #footer>
 
-      <div class="dialog-footer">
 
-        <el-button type="primary" @click="handleImportTable">确 定</el-button>
 
-        <el-button @click="visible = false">取 消</el-button>
 
-      </div>
 
-    </template>
 
-  </el-dialog>
 
-</template>
 
-
 
-<script setup>
 
-import { listDbTable, importTable } from "@/api/tool/gen";
 
-
 
-const total = ref(0);
 
-const visible = ref(false);
 
-const tables = ref([]);
 
-const dbTableList = ref([]);
 
-const { proxy } = getCurrentInstance();
 
-
 
-const queryParams = reactive({
 
-  pageNum: 1,
 
-  pageSize: 10,
 
-  tableName: undefined,
 
-  tableComment: undefined
 
-});
 
-
 
-const emit = defineEmits(["ok"]);
 
-
 
-/** 查询参数列表 */
 
-function show() {
 
-  getList();
 
-  visible.value = true;
 
-}
 
-/** 单击选择行 */
 
-function clickRow(row) {
 
-  proxy.$refs.table.toggleRowSelection(row);
 
-}
 
-/** 多选框选中数据 */
 
-function handleSelectionChange(selection) {
 
-  tables.value = selection.map(item => item.tableName);
 
-}
 
-/** 查询表数据 */
 
-function getList() {
 
-  listDbTable(queryParams).then(res => {
 
-    dbTableList.value = res.rows;
 
-    total.value = res.total;
 
-  });
 
-}
 
-/** 搜索按钮操作 */
 
-function handleQuery() {
 
-  queryParams.pageNum = 1;
 
-  getList();
 
-}
 
-/** 重置按钮操作 */
 
-function resetQuery() {
 
-  proxy.resetForm("queryRef");
 
-  handleQuery();
 
-}
 
-/** 导入按钮操作 */
 
-function handleImportTable() {
 
-  const tableNames = tables.value.join(",");
 
-  if (tableNames == "") {
 
-    proxy.$modal.msgError("请选择要导入的表");
 
-    return;
 
-  }
 
-  importTable({ tables: tableNames }).then(res => {
 
-    proxy.$modal.msgSuccess(res.msg);
 
-    if (res.code === 200) {
 
-      visible.value = false;
 
-      emit("ok");
 
-    }
 
-  });
 
-}
 
-
 
-defineExpose({
 
-  show,
 
-});
 
-</script>

+ 0 - 306
src/views/tool/gen/index.vue
View File 

@@ -1,306 +0,0 @@
 
-<template>
 
-  <div class="app-container">
 
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
 
-      <el-form-item label="表名称" prop="tableName">
 
-        <el-input
 
-          v-model="queryParams.tableName"
 
-          placeholder="请输入表名称"
 
-          clearable
 
-          @keyup.enter="handleQuery"
 
-        />
 
-      </el-form-item>
 
-      <el-form-item label="表描述" prop="tableComment">
 
-        <el-input
 
-          v-model="queryParams.tableComment"
 
-          placeholder="请输入表描述"
 
-          clearable
 
-          @keyup.enter="handleQuery"
 
-        />
 
-      </el-form-item>
 
-      <el-form-item label="创建时间" style="width: 308px">
 
-        <el-date-picker
 
-          v-model="dateRange"
 
-          value-format="YYYY-MM-DD"
 
-          type="daterange"
 
-          range-separator="-"
 
-          start-placeholder="开始日期"
 
-          end-placeholder="结束日期"
 
-        ></el-date-picker>
 
-      </el-form-item>
 
-      <el-form-item>
 
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
 
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
 
-      </el-form-item>
 
-    </el-form>
 
-
 
-    <el-row :gutter="10" class="mb8">
 
-      <el-col :span="1.5">
 
-        <el-button
 
-          type="primary"
 
-          plain
 
-          icon="Download"
 
-          @click="handleGenTable"
 
-          v-hasPermi="['tool:gen:code']"
 
-        >生成</el-button>
 
-      </el-col>
 
-      <el-col :span="1.5">
 
-        <el-button
 
-          type="info"
 
-          plain
 
-          icon="Upload"
 
-          @click="openImportTable"
 
-          v-hasPermi="['tool:gen:import']"
 
-        >导入</el-button>
 
-      </el-col>
 
-      <el-col :span="1.5">
 
-        <el-button
 
-          type="success"
 
-          plain
 
-          icon="Edit"
 
-          :disabled="single"
 
-          @click="handleEditTable"
 
-          v-hasPermi="['tool:gen:edit']"
 
-        >修改</el-button>
 
-      </el-col>
 
-      <el-col :span="1.5">
 
-        <el-button
 
-          type="danger"
 
-          plain
 
-          icon="Delete"
 
-          :disabled="multiple"
 
-          @click="handleDelete"
 
-          v-hasPermi="['tool:gen:remove']"
 
-        >删除</el-button>
 
-      </el-col>
 
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
 
-    </el-row>
 
-
 
-    <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
 
-      <el-table-column type="selection" align="center" width="55"></el-table-column>
 
-      <el-table-column label="序号" type="index" width="50" align="center">
 
-        <template #default="scope">
 
-          <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
 
-        </template>
 
-      </el-table-column>
 
-      <el-table-column
 
-        label="表名称"
 
-        align="center"
 
-        prop="tableName"
 
-        :show-overflow-tooltip="true"
 
-      />
 
-      <el-table-column
 
-        label="表描述"
 
-        align="center"
 
-        prop="tableComment"
 
-        :show-overflow-tooltip="true"
 
-      />
 
-      <el-table-column
 
-        label="实体"
 
-        align="center"
 
-        prop="className"
 
-        :show-overflow-tooltip="true"
 
-      />
 
-      <el-table-column label="创建时间" align="center" prop="createTime" width="160" />
 
-      <el-table-column label="更新时间" align="center" prop="updateTime" width="160" />
 
-      <el-table-column label="操作" align="center" width="330" class-name="small-padding fixed-width">
 
-        <template #default="scope">
 
-          <el-tooltip content="预览" placement="top">
 
-            <el-button
 
-              type="text"
 
-              icon="View"
 
-              @click="handlePreview(scope.row)"
 
-              v-hasPermi="['tool:gen:preview']"
 
-            ></el-button>
 
-          </el-tooltip>
 
-          <el-tooltip content="编辑" placement="top">
 
-            <el-button
 
-              type="text"
 
-              icon="Edit"
 
-              @click="handleEditTable(scope.row)"
 
-              v-hasPermi="['tool:gen:edit']"
 
-            ></el-button>
 
-          </el-tooltip>
 
-          <el-tooltip content="删除" placement="top">
 
-            <el-button
 
-              type="text"
 
-              icon="Delete"
 
-              @click="handleDelete(scope.row)"
 
-              v-hasPermi="['tool:gen:remove']"
 
-            ></el-button>
 
-          </el-tooltip>
 
-          <el-tooltip content="同步" placement="top">
 
-            <el-button
 
-              type="text"
 
-              icon="Refresh"
 
-              @click="handleSynchDb(scope.row)"
 
-              v-hasPermi="['tool:gen:edit']"
 
-            ></el-button>
 
-          </el-tooltip>
 
-          <el-tooltip content="生成代码" placement="top">
 
-            <el-button
 
-              type="text"
 
-              icon="Download"
 
-              @click="handleGenTable(scope.row)"
 
-              v-hasPermi="['tool:gen:code']"
 
-            ></el-button>
 
-          </el-tooltip>
 
-        </template>
 
-      </el-table-column>
 
-    </el-table>
 
-    <pagination
 
-      v-show="total>0"
 
-      :total="total"
 
-      v-model:page="queryParams.pageNum"
 
-      v-model:limit="queryParams.pageSize"
 
-      @pagination="getList"
 
-    />
 
-    <!-- 预览界面 -->
 
-    <el-dialog :title="preview.title" v-model="preview.open" width="80%" top="5vh" append-to-body custom-class="scrollbar">
 
-      <el-tabs v-model="preview.activeName">
 
-        <el-tab-pane
 
-          v-for="(value, key) in preview.data"
 
-          :label="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
 
-          :name="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
 
-          :key="value"
 
-        >
 
-          <el-link :underline="false" icon="DocumentCopy" v-copyText="value" v-copyText:callback="copyTextSuccess" style="float:right">&nbsp;复制</el-link>
 
-          <pre>{{ value }}</pre>
 
-        </el-tab-pane>
 
-      </el-tabs>
 
-    </el-dialog>
 
-    <import-table ref="importRef" @ok="handleQuery" />
 
-  </div>
 
-</template>
 
-
 
-<script setup name="Gen">
 
-import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/tool/gen";
 
-import router from "@/router";
 
-import importTable from "./importTable";
 
-
 
-const route = useRoute();
 
-const { proxy } = getCurrentInstance();
 
-
 
-const tableList = ref([]);
 
-const loading = ref(true);
 
-const showSearch = ref(true);
 
-const ids = ref([]);
 
-const single = ref(true);
 
-const multiple = ref(true);
 
-const total = ref(0);
 
-const tableNames = ref([]);
 
-const dateRange = ref([]);
 
-const uniqueId = ref("");
 
-
 
-const data = reactive({
 
-  queryParams: {
 
-    pageNum: 1,
 
-    pageSize: 10,
 
-    tableName: undefined,
 
-    tableComment: undefined
 
-  },
 
-  preview: {
 
-    open: false,
 
-    title: "代码预览",
 
-    data: {},
 
-    activeName: "domain.java"
 
-  }
 
-});
 
-
 
-const { queryParams, preview } = toRefs(data);
 
-
 
-onActivated(() => {
 
-  const time = route.query.t;
 
-  if (time != null && time != uniqueId.value) {
 
-    uniqueId.value = time;
 
-    queryParams.value.pageNum = Number(route.query.pageNum);
 
-    dateRange.value = [];
 
-    proxy.resetForm("queryForm");
 
-    getList();
 
-  }
 
-})
 
-
 
-/** 查询表集合 */
 
-function getList() {
 
-  loading.value = true;
 
-  listTable(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
 
-    tableList.value = response.rows;
 
-    total.value = response.total;
 
-    loading.value = false;
 
-  });
 
-}
 
-/** 搜索按钮操作 */
 
-function handleQuery() {
 
-  queryParams.value.pageNum = 1;
 
-  getList();
 
-}
 
-/** 生成代码操作 */
 
-function handleGenTable(row) {
 
-  const tbNames = row.tableName || tableNames.value;
 
-  if (tbNames == "") {
 
-    proxy.$modal.msgError("请选择要生成的数据");
 
-    return;
 
-  }
 
-  if (row.genType === "1") {
 
-    genCode(row.tableName).then(response => {
 
-      proxy.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath);
 
-    });
 
-  } else {
 
-    proxy.$download.zip("/code/gen/batchGenCode?tables=" + tbNames, "ruoyi");
 
-  }
 
-}
 
-/** 同步数据库操作 */
 
-function handleSynchDb(row) {
 
-  const tableName = row.tableName;
 
-  proxy.$modal.confirm('确认要强制同步"' + tableName + '"表结构吗？').then(function () {
 
-    return synchDb(tableName);
 
-  }).then(() => {
 
-    proxy.$modal.msgSuccess("同步成功");
 
-  }).catch(() => {});
 
-}
 
-/** 打开导入表弹窗 */
 
-function openImportTable() {
 
-  proxy.$refs["importRef"].show();
 
-}
 
-/** 重置按钮操作 */
 
-function resetQuery() {
 
-  dateRange.value = [];
 
-  proxy.resetForm("queryRef");
 
-  handleQuery();
 
-}
 
-/** 预览按钮 */
 
-function handlePreview(row) {
 
-  previewTable(row.tableId).then(response => {
 
-    preview.value.data = response.data;
 
-    preview.value.open = true;
 
-    preview.value.activeName = "domain.java";
 
-  });
 
-}
 
-/** 复制代码成功 */
 
-function copyTextSuccess() {
 
-  proxy.$modal.msgSuccess("复制成功");
 
-}
 
-// 多选框选中数据
 
-function handleSelectionChange(selection) {
 
-  ids.value = selection.map(item => item.tableId);
 
-  tableNames.value = selection.map(item => item.tableName);
 
-  single.value = selection.length != 1;
 
-  multiple.value = !selection.length;
 
-}
 
-/** 修改按钮操作 */
 
-function handleEditTable(row) {
 
-  const tableId = row.tableId || ids.value[0];
 
-  router.push({ path: "/tool/gen-edit/index/" + tableId, query: { pageNum: queryParams.value.pageNum } });
 
-}
 
-/** 删除按钮操作 */
 
-function handleDelete(row) {
 
-  const tableIds = row.tableId || ids.value;
 
-  proxy.$modal.confirm('是否确认删除表编号为"' + tableIds + '"的数据项？').then(function () {
 
-    return delTable(tableIds);
 
-  }).then(() => {
 
-    getList();
 
-    proxy.$modal.msgSuccess("删除成功");
 
-  }).catch(() => {});
 
-}
 
-
 
-getList();
 
-</script>

Some files were not shown because too many files changed in this diff