From 34bf9f91cf7cad6b434173b5a7082d2e8ab352d7 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Tue, 14 May 2024 15:18:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/produceData/index.js                  |  16 +-
 src/assets/icons/svg/orgTreeIcon.svg          |  14 +
 src/assets/icons/svg/orgTreeIcon2.svg         |  15 +
 src/assets/styles/index.scss                  |   2 +-
 src/layout/components/AppMain.vue             |  18 +-
 src/main.js                                   |   3 +
 src/mixins/tableHeightMixin.js                |  20 +
 src/views/copilot/factoryData/index.vue       |  13 +-
 src/views/system/components/statusBtn.vue     |  38 +
 src/views/system/post/assets/images/Qian.png  | Bin 0 -> 612 bytes
 src/views/system/post/assets/images/arrow.png | Bin 0 -> 181 bytes
 .../post/assets/images/factory-icon.png       | Bin 0 -> 710 bytes
 .../system/post/assets/images/tree-icon-2.png | Bin 0 -> 3264 bytes
 .../system/post/components/InPageLeftNav.vue  | 445 +++++++++++
 .../system/post/components/SearchBarTop.vue   |  78 ++
 src/views/system/post/index.vue               | 353 ++++-----
 src/views/system/post/index1.vue              | 243 ++++++
 src/views/system/role/components/dataAuth.vue | 162 ++++
 src/views/system/role/components/menuAuth.vue | 146 ++++
 src/views/system/role/components/roleAdd.vue  | 129 ++++
 src/views/system/role/index.vue               | 708 ++++++------------
 21 files changed, 1698 insertions(+), 705 deletions(-)
 create mode 100644 src/assets/icons/svg/orgTreeIcon.svg
 create mode 100644 src/assets/icons/svg/orgTreeIcon2.svg
 create mode 100644 src/mixins/tableHeightMixin.js
 create mode 100644 src/views/system/components/statusBtn.vue
 create mode 100644 src/views/system/post/assets/images/Qian.png
 create mode 100644 src/views/system/post/assets/images/arrow.png
 create mode 100644 src/views/system/post/assets/images/factory-icon.png
 create mode 100644 src/views/system/post/assets/images/tree-icon-2.png
 create mode 100644 src/views/system/post/components/InPageLeftNav.vue
 create mode 100644 src/views/system/post/components/SearchBarTop.vue
 create mode 100644 src/views/system/post/index1.vue
 create mode 100644 src/views/system/role/components/dataAuth.vue
 create mode 100644 src/views/system/role/components/menuAuth.vue
 create mode 100644 src/views/system/role/components/roleAdd.vue

diff --git a/src/api/produceData/index.js b/src/api/produceData/index.js
index 3f01035..427ba52 100644
--- a/src/api/produceData/index.js
+++ b/src/api/produceData/index.js
@@ -31,18 +31,10 @@ export function getProduceDataDetail(data){
   })
 }
 
-// export function cockpitDataMonitor(data) {
-//   return request({
-//     url: '/ip/prod-output/cockpitDataMonitor',
-//     method: 'post',
-//     data: data
-//   })
-// }
-
-export function cockpitDataMonitor(query) {
+export function cockpitDataMonitor(data) {
   return request({
-    url: 'https://restapi.amap.com/v3/weather/weatherInfo?key=95bdbdc1c387a170105f84cd416c4c9f&city=110108',
-    method: 'get',
-    query: query
+    url: '/ip/prod-output/cockpitDataMonitor',
+    method: 'post',
+    data: data
   })
 }
diff --git a/src/assets/icons/svg/orgTreeIcon.svg b/src/assets/icons/svg/orgTreeIcon.svg
new file mode 100644
index 0000000..247a5ae
--- /dev/null
+++ b/src/assets/icons/svg/orgTreeIcon.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>菜单</title>
+    <g id="10系统管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="用户管理" transform="translate(-284.000000, -164.000000)" fill-rule="nonzero">
+            <g id="编组-7" transform="translate(284.000000, 162.000000)">
+                <g id="菜单" transform="translate(0.000000, 2.000000)">
+                    <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                    <path d="M3.00057813,4.49926562 L13.0025156,4.49926562 C13.2786563,4.49926562 13.5025156,4.27540625 13.5025156,3.99926563 C13.5025156,3.723125 13.2786563,3.49926563 13.0025156,3.49926563 L3.00057813,3.49926563 C2.7244375,3.49926563 2.50057813,3.723125 2.50057813,3.99926563 C2.50057813,4.27540625 2.7244375,4.49926562 3.00057813,4.49926562 Z M3.0004375,8.48703125 L12.9786875,8.48703125 C13.2548281,8.48703125 13.4786875,8.26317187 13.4786875,7.98703125 C13.4786875,7.71089062 13.2548281,7.48703125 12.9786875,7.48703125 L3.0004375,7.48703125 C2.72429687,7.48703125 2.5004375,7.71089062 2.5004375,7.98703125 C2.5004375,8.26317187 2.72429687,8.48703125 3.0004375,8.48703125 Z M13.0025156,11.4969063 L3.00057813,11.4969063 C2.7244375,11.4969063 2.50057813,11.7207656 2.50057813,11.9969063 C2.50057813,12.2730469 2.7244375,12.4969063 3.00057813,12.4969063 L13.0025156,12.4969063 C13.2786563,12.4969063 13.5025156,12.2730469 13.5025156,11.9969063 C13.5025156,11.7207656 13.2786563,11.4969063 13.0025156,11.4969063 L13.0025156,11.4969063 Z" id="形状" fill="#373738"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/orgTreeIcon2.svg b/src/assets/icons/svg/orgTreeIcon2.svg
new file mode 100644
index 0000000..a43bd80
--- /dev/null
+++ b/src/assets/icons/svg/orgTreeIcon2.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="127.000000pt" height="127.000000pt" viewBox="0 0 127.000000 127.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,127.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M520 831 c-19 -10 -48 -35 -64 -55 -25 -30 -31 -48 -34 -100 -8 -122
+69 -206 188 -206 119 0 196 84 188 205 -5 74 -36 123 -98 155 -51 26 -133 26
+-180 1z m137 -32 c67 -25 111 -99 98 -165 -8 -45 -57 -100 -101 -114 -100 -33
+-209 62 -190 165 12 62 82 124 143 125 12 0 34 -5 50 -11z"/>
+</g>
+</svg>
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 11d9c3d..f3c0b35 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -123,7 +123,7 @@ aside {
 
 //main-container全局样式
 .app-container {
-  padding: 16px;
+  // padding: 16px;
 }
 
 .components-container {
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 44fc12f..1845d89 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -17,20 +17,20 @@
 </template>
 
 <script>
-import iframeToggle from "./IframeToggle/index"
+import iframeToggle from "./IframeToggle/index";
 
 export default {
-  name: 'AppMain',
+  name: "AppMain",
   components: { iframeToggle },
   computed: {
     cachedViews() {
-      return this.$store.state.tagsView.cachedViews
+      return this.$store.state.tagsView.cachedViews;
     },
     key() {
-      return this.$route.path
-    }
-  }
-}
+      return this.$route.path;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -45,7 +45,7 @@ export default {
   // background-color: #fff;
 }
 
-.fixed-header+.app-main {
+.fixed-header + .app-main {
   padding-top: 56px;
 }
 
@@ -57,7 +57,7 @@ export default {
     flex-direction: column;
   }
 
-  .fixed-header+.app-main {
+  .fixed-header + .app-main {
     padding-top: 90px;
   }
 }
diff --git a/src/main.js b/src/main.js
index 1baa77b..f481d95 100644
--- a/src/main.js
+++ b/src/main.js
@@ -56,6 +56,9 @@ Vue.prototype.DICT_TYPE = DICT_TYPE;
 Vue.prototype.handleTree = handleTree;
 Vue.prototype.addBeginAndEndTime = addBeginAndEndTime;
 Vue.prototype.divide = divide;
+Vue.prototype.tableHeight = function (n) {
+	return window.innerHeight - n;
+};
 
 // 全局组件挂载
 Vue.component("DictTag", DictTag);
diff --git a/src/mixins/tableHeightMixin.js b/src/mixins/tableHeightMixin.js
new file mode 100644
index 0000000..ad23d16
--- /dev/null
+++ b/src/mixins/tableHeightMixin.js
@@ -0,0 +1,20 @@
+export default {
+	data() {
+		return {
+			tableH: this.tableHeight(260),
+		};
+	},
+	created() {
+		this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
+		window.addEventListener('resize', this._setTableHeight);
+	},
+	destroyed() {
+		window.removeEventListener('resize', this._setTableHeight);
+	},
+	methods: {
+		_setTableHeight() {
+			this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
+			// this.tableH = this.tableHeight(260);
+		},
+	},
+};
diff --git a/src/views/copilot/factoryData/index.vue b/src/views/copilot/factoryData/index.vue
index c0c0d1d..a757306 100644
--- a/src/views/copilot/factoryData/index.vue
+++ b/src/views/copilot/factoryData/index.vue
@@ -129,13 +129,12 @@ export default {
       this.companyName = obj.companyName;
     },
     getMes1() {
-      // cockpitDataMonitor({
-      //   factorys: ["1"],
-      //   date: 4,
-      // }).then((res) => {
-      //   console.log(res);
-      // });
-      cockpitDataMonitor().then((res) => {});
+      cockpitDataMonitor({
+        factorys: [1],
+        date: 4,
+      }).then((res) => {
+        console.log(res);
+      });
     },
   },
 };
diff --git a/src/views/system/components/statusBtn.vue b/src/views/system/components/statusBtn.vue
new file mode 100644
index 0000000..14dda42
--- /dev/null
+++ b/src/views/system/components/statusBtn.vue
@@ -0,0 +1,38 @@
+<template>
+  <div>
+    <span class="dot" :class="injectData.status === 1 ? 'red' : 'green'"></span>
+    <span>{{ state }}</span>
+  </div>
+</template>
+<script>
+export default {
+  name: "StatusBtn",
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  computed: {
+    state() {
+      return this.injectData.status === 1 ? "停用" : "启用";
+    },
+  },
+};
+</script>
+<style scoped>
+.dot {
+  display: inline-block;
+  width: 6px;
+  height: 6px;
+  border-radius: 3px;
+  vertical-align: middle;
+  margin-right: 8px;
+}
+.green {
+  background: #10dc76;
+}
+.red {
+  background: #ff5656;
+}
+</style>
diff --git a/src/views/system/post/assets/images/Qian.png b/src/views/system/post/assets/images/Qian.png
new file mode 100644
index 0000000000000000000000000000000000000000..07e4170e1cbeb87541ca2cdc6f47f838d26965b3
GIT binary patch
literal 612
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA#=yX+z<N>;$YDu$^mSxl*x1kgCy^D%w@8if
zO!M_+&;qhK7#Q0#8CZZUMj(~~Vg?4L1x#=eg9Xe8Hc0Zve?K#z;_IF+jv*PWZzFw!
z4jG8}HMw6j{&Jl8%2K^Kf})X?tg)7-PGwuXdU31w@<mf!TL$YrUXQxP)Hs(;*dp>`
zPu{GS@4r8O`gF<NBbR^bB%AZ%t6Yw~m}r$>6O$1-t@q!x>p5qA+B>^eZoixu?m21C
zjMrb!hnsZ@Tsyt#$<{jIS<`oHy3Bi&RiQ!6RGw}21&iPFm!GoL-?L=O8~^9q-kZqs
zX)KMJv~}vn*e}HbKkF)Z)vTONq*S-xewq}T{Y-)D@CNl3ivm#@*Ne<Hcc#k!6lgS4
zT99jUBf*4&?|rPSXp_$wp)7w<F_wdt0+!k*QnxO03og9*b)%T;gtSPRdfQ!Atm%I(
zd@rX@jqhG$@y|}Q>HZ29v*ZqkpBY>^KPHyha%2Rm6bs7yYUWy{wlt9C(C#_iyScbj
zwA}(-879gKI<N>drU_m+Cl$Q){crIAm7FbSV!pL*xzhOO!<$35e;&(eO0t~Z{yuv5
zzS|K>4Np1_2(fsX8>TF@OIf&F)#%zU<CKNTFD}>U1O>fnNNJM(e^PDJgfljCHWyCg
zwHKG{f8D{Lv|!7#t^*U^N;_3B&%LGe_J8(;;P<o3E2r)<;eNXHg5>jeykem<-_9`n
o#H{&6Hd`_J$pksU8;UG-j1yk>zfQU`uM`y3p00i_>zopr068A@#{d8T

literal 0
HcmV?d00001

diff --git a/src/views/system/post/assets/images/arrow.png b/src/views/system/post/assets/images/arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1aa06f685093b8e4dce62af3d3af0869758bafa
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa#^NA%Cx&(BWL^R}`JOJ0Ar}70
zDGI^{lUDX8a%A5*f8fA^^9LBdF$s$tzVTdALSju~V$-|hGHh&ZCnK2N*fTRbYcVq)
zj){?Sd{oK9!y`P=q}e3Z(7@n~gPB113Z-neok?1|v_H7IGXa(91GS~zcvQu4T=}A>
aI78(l9{vwmhh2eIGkCiCxvX<aXaWG@PB-xY

literal 0
HcmV?d00001

diff --git a/src/views/system/post/assets/images/factory-icon.png b/src/views/system/post/assets/images/factory-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f90ed824a8f2b71365b22fd56fa12d6fe8acb27
GIT binary patch
literal 710
zcmV;%0y+JOP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px%fJsC_RA@u(nLlV#Q5431=V?*!HDYO?pop8`=pZ^7aIBzXd=>2EAmS#1_~(hP
zbrD2Lp$=`VlY@h6bQ39v4kA`?62XcnNofV&kq8Mf$xGh7@0KL?Wz0Q)zVCeJo_Fti
z!jS)D$nldA=(mEI0yPD~P`$e!I1)u1M#<yxO_dkbNAjkdLb)kDIyS=VPY-3?R>{-~
z_-FKjDp!HMZ6JhYVCM2c9*3bs&Fg-k=QZNKz&qVWP+gR_HYBVG6hhtp>OFHP=Xxa;
z_=v}XDl49_UzI6U4mJFQmz5I7L_~YVYF)P?psL~rJVlwT2NdC_!V{D)BJ4vsrQr7h
zBv2m7ar*nL{OD!dY2AuIEl{qglM&1-<UL_#bd(#PXJxIPWOtx@en(tFxTwl_hvXX~
zJeU~g%E~?2umNB5u_jP+&QI&a+AmI2OR^XT;J~!*TwUiRa2y!JW7UJ@Xa~<K^YYae
zctiQL0s8HqN`ZcZ@7hBCSuGGzNDb1XTv?EE>Nqh0VioWM4K?Cs+Qi~<t5T9MZJap&
ztwBJ9=LpH$Kq;vHojMGJ0;V9E+t1Y3wAB)|kSU0afPoBF3iw66)|#WTBzNln{iA^C
z{^<n1%P6)Yu&bzTr^f1%G-A0L!HwfWmr=Ym3HX8DZfl{ETyM0Hi>G+PQEa7v!5*_V
zO*+Xk0@fw&;W$tVG*7MOX;tG8x0Vq|T7e`jH1rB2A=zq^w1C+ZvZ-zopMg?f==VTI
z!1ZY~Ne`#B8K^yALnb5O{90%#gUkDXX>Ql{-QJ2MdJ?+^WE#(ofQxIPDbhH5o3|3K
sa&LB=|M&aAW>?Nt{7eB?m9&lX2ga2lPy4yAW&i*H07*qoM6N<$g4y*@6#xJL

literal 0
HcmV?d00001

diff --git a/src/views/system/post/assets/images/tree-icon-2.png b/src/views/system/post/assets/images/tree-icon-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9e58018bb47354a9902ff2b857c05aa1938a1af
GIT binary patch
literal 3264
zcmbtX`9Bkm8=p|y9GfFl7)|*|F?Y^6MwZCONBI;h6kE($Y-J2FXC#WyL<gUIm_n|(
za$j?m`<N>?n{(y*?)xu%zpvNxJnz@@)APggem(E^6Ju+0MF@Nv3;+Ox(3U7WE|UM7
zz~kK7TrDHU1)hg?S4;tg4CzH~!-qAoHUR)WCkpJl@B;vX9%z(_J@L+JCJ1joc#?u;
zcM@Ui%6E7&G@)|hBCk^3hecbM42hSC_sKPtJI6)bv=`@jIrbhbVgk;K)>DspfVy8M
zXY3Mi%{Cl_zUCVWeJhpW%%ZG*X4iD~9g#H(M=bw|{q}c7@+R8B$9*E$XM%&AAA7hK
z+^uH<<@+Cl!;`&>50*&naI0^QcSmWwW$P5{_DbVaN=&NnAfs0y;4CqiYvTU-+OJ=~
zE>u=lg6@(JwrBGlXhtJ_eJ>CQ1k_bKV>LTFd)&mt#A~Mc*`E5PO9gsx_>8~3z5SVl
z;sz*A$|&)A3}lM82&7Lw+<)g&d$2=O#Z+oOz~TOozEn5mn|83jAAdeMW@7zY&?CaI
znW^b-eSLjQSXkKC;bJU#r&FU_`i)+I$Bn=L9>PeOWCgmyniLzOqQx~iJ=tb)v9Yls
z0+8zh5C~*pX-VDjqC|Cl-FWn-O|CHIt(OZ>Pbys4;_cH`y)8c>-bc%_`hhDy&RM-$
z!O)595c>Mo56ibD96|Q@_;}JF?Jl{bq~y`?YYi+l^hAr<MI?|00Rnr5@!Hn+wcqtx
zX6rWh1GdDe&Bpr&2c_<1qZnKRf;zzAaN_v+`So+JXN5?#1U!%l2D&xnvW6n0^#k#}
zjy~0;I~#KyVsJRznsY7D4<nW_E|-%}qg@~D?{BbOkEj#Yb~Z-VGMUauJ%fp5KbvtT
zQ%=ZOgHI4-)(TnL*xW30cXN|rY4O_Hk-(5d8w0;-)PN_gdPhH6^SCTN2X{07hQJ(j
z3^a8-BR%~$vtDL#aj`5pIr)r>AmK47C@4tbwo^dBHW3vDhzM5ZE0gm_=q>E+?FDF_
zMM)?oRJ=@0btv(lYZqN{wObJTL&-?Agf-KWs5<)jUdt0;CV-~xntv}1yK#K#xSgGy
zx8YWg+59UNOr<2vb9#DuZQ3?rTyPIwo8hQIiF+LdfgLvecXxfgy-7fL-D2lRQQhXw
z&W?Kc_xah`{ebPIA5|^@?cFJlcbOd4h%qp$`a%Ckq{(}GV!^Af-sLbc*)er4TY~d%
z7F?j@PBvqMp;n{6yqKApCyJb^0=@dEhCz4oK7G0!YAKrd&_e`}WZuD#P#7Ej;?_ao
z7m%PwJ>02GyeaviG0KvnTElT=P=w9|$|)c_)iTi1E%<1o_~)47z||2i>8w9TA=x1?
zmh^9O{S+VrIt$IWx_WiP?+}F&WJu!70Q5<odsV-GX807QBV4{=5r7Z*0D{naAaF6;
z&CRX*$H0KQDIdH+JsW!kg(CfGSEk`ZSx0qyg?lHd%*&FAU0q$5E?m6mBzf}W_6<+Z
z{N#ylKByzyKa}lQ=6zsT85I<7ek(-;MqUVo7;%`x?d|QkFJ8Rp1lB+K&e|fL4=i0C
zq>&#pGIiI@=<5b*X1r-SJ`+h@89GNI^Rz4G0LO<OGf4Vm{K6*D+`OrOVQJpT)Y^Vy
z-}w7Rg;bEPxu<ja36=P+g5`mN(T&;U>(mI`TFwDa-NX7c8yBfzFfYzb+*eCm+vA)(
zB{kY>^lNp5_f3M2)}N-Ngze7O^|1;Ko}7$RYq|`$04!6>bAY|Fvho!2ZKf8~9pjOW
z-<WNC8LerCIA(D=#M}6F+F|b%m|=qFy)StRpNKWt<>kav-@K&^AuegtRXOk8o#E1%
z;8LsOFk3nJ@2yQrm-}+sWxt%{HdxddC#%-OgT1VVLt}!@wyi1YJ6l9ZNN7f6t?L?{
zMb$b07;HRpcmKJ4;?!C#h_PzyPUhD&Hn+C!LUhzr5!TiB9aZkoFN<JMB%k`CSmZ{7
z)F`}n3#Uh{5pXFZaM`h*(}DY!F7z&zqi-6bQwu}GqNIl+C!Q>Q|L0V>#W^wLNrTBp
zdpoPwh{2(4_g$5Kx^~HkiS@sJ{@ga|VC_kF)z*jH+`-7m$kNTd*FK12_0VI_qvGpB
zZcw_9Oe5p8&yE?zN5nlW^i`K!_QGDhdX+a9uSChs8e|e0TUvC!4V`8k*qqN4hdFL?
z7x>q3)A(PP?4grAV`G^Bp3cq^C8KmhH8r-x&a<C_8TUHV)P(YOWvJ@OR*jT_fq}p2
z;_PaEIyK+h3D^4yle97{60UDhbwxnZBUokOG7%0ejG3;gtg5=T9LKq1n)sPY81glw
z%BOvhFr=afaEHCytS3&ffmxy2-F4jt)@bhN$c<QKoDDd!8R$G~P#d(n5GJY$rnF=j
zm;7_5@b}b6<>!v&$5A@ACM2w_t*xYHnZ}r?0_kT$Lc(Rbbl38rj+R!_=6T!Lbu=e4
zDJf}nNO3v{gvI0Wyv?Js2)p?+$b+qZK{~7pBw^*{<#jQh5lwok9ADYf({m>!v~)=E
zUQMbLRr5jLsr}xHC%M)IJKNiSv8ft(q{XoX*@$XjO@sezYZ5=_uqVlri7{JUU9Ifw
z?DSm7IS2T}u9k#Ng+Qn8&aRwJcL&hr#bO*<!+1};dKXt)mFvJpKH0(vqssi1UiWt(
zfRbm86>~#gQ;5HnBEi&d)`-@<=J@NZUD@eMJq>R>ugGugz~CU3*uUrJJ@Zo8;XJ0?
zcS=NoC;==OSEsN;Sf5*D_nsGrPz&3$BRF*xMD{eV<rlo=j*}%o3A|3T8Y=a4;Ms{P
zuX-HGe0l<MxIa-H^x1MtaNpbM1T8ywg8q2j<tTVkZ7bLW#GdkEEcWN#HTDnS+1>_J
zPioY9A97|Avs9Fo_fE!7g{6jE#uCx!Hi5ahIf1Du2?j#F|H=^I{{8!zQS;<)7aIF9
zy7p`m#@X4qCC5B&;#p!M?MgG!?zUgEs`otOjp`eHg15vH%h`gjyJnq_A!d8)mTnnW
z-n8gO{ASMrccJU>(7`elr}83k^gOOx-N=@Eg=Dp#zkC@WDC-b8cyMih;lT1Re&{29
zq-1d}L&t|<KDd4#U?9<T`^Js!@A<Tv%3=5756z8@zQT8dN|X%@=!EtZC9HGwT)FVM
z;(d`6kx8>%uJY}oEG!O-^Yc3x{&Cqu9;NAj23iNRn<S6I5!IpxXXV}oZO<7o)kr(*
zZwM1@2O2m$o)qy{W!~a8$Hq%b<kZo#`7Ck`aQr3tkyS+-2-qm9y1YGjcXDWSRA06s
zj7K)F>la*bRDR$MS4M)<GBO-RMMV7I7cMNx3NN=D`n-v3(A5o)vd3TyR~uu*x;Ip&
zxQ-@eVF4!=ZxU6I|M4T`17^JW*%^VU?I>TPIoRY)e|NAezl5YDZGwAOPNz7bp{=dh
zmGV9cj@kGXHuG?^?}HTtt`vk+Q~PYBt6RYnrLH@Z10|OYFuMl2kw+x3;8LokEEZnU
zGA&Jd(O>7n@Ak2<qGA}to7dIRF<Rr=6kGc%oP|QOL4tDhyu3ercGt#hK_C#?LZa{#
zAfhkiFAtATGBY~}(MA;_`OMccd1ryfmD!M4aDD5D8P`IkOueSZm^LUKtBB3Zm9Ga7
z2ceQFr@>(GL?|bSm7dh7XnT`%jJN3QwWEKFidc}=))p5h;n0@l3P588A-b?(J`>s}
z+ieko;G@ZgmJ1V0LC2X8-lC$wT&D3}i%|4&r+k9HA<z7$2Iv>hwioC2NN8eC2`6Gs
zhEKXGcyA}wCd=qRlP{L?XBsi}lK(L;VJcd_@o2Yrm()!ONe}a_Obfo%UJvBRMavxT
zeU*}8&+ns3<+Ab|V|3=%)hv_8Y!K@H57$eos#%G6GXIw?m`R-!$$JX(RazK2QW}v+
zwO*JT>Ym@%Evzca+Wje1_XoZeQq#_0Oh9~);e|2_`70>K(Kp3LSeR_0bx&KeBDvCM
zvgV|Y_gHI$NQ9}ch5_}6UeD(z#PSX#oZZs5l^1lzF$-=PYG4`r3W|#JnD6X)_AkTe
zwbFT>8VDza1Fr*efHx57WUiLRfBg7St;~D;s@H=DF=h(U5qUQGKSpBu3bZsdHa%|N
zzI_RH$h;tvuvi~*&S7y)GE4jj873b;w%n2(Hk#DzQU`j<ihK5K4(YPh)}sOpm;3*M
e#cQ0qC+VobqaB(30mc170BCa?RH3PJ_<sN*B1nS(

literal 0
HcmV?d00001

diff --git a/src/views/system/post/components/InPageLeftNav.vue b/src/views/system/post/components/InPageLeftNav.vue
new file mode 100644
index 0000000..20f4cf3
--- /dev/null
+++ b/src/views/system/post/components/InPageLeftNav.vue
@@ -0,0 +1,445 @@
+<template>
+  <div class="in-page-left-nav" style="overflow: hidden">
+    <div
+      class="factory-list__selector"
+      style="margin: 20px 12px"
+      title="株洲中建材光电材料有限公司"
+      @mouseenter="factoryListOpen = true"
+      @mouseleave="factoryListOpen = false"
+    >
+      <img src="./../assets/images/arrow.png" class="arrow" alt="" />
+      <div class="factory-list__content">{{ currentFactory.label }}</div>
+      <div class="factory-list__wrapper" :class="{ open: factoryListOpen }">
+        <ul
+          class="factory-list"
+          v-if="sidebarContent.length"
+          @click.capture="factoryClickHandler"
+        >
+          <li
+            v-for="fc in sidebarContent"
+            :key="fc.id"
+            class="factory-list__item"
+            :class="{ 'is-current': fc.id == currentFactory?.id }"
+          >
+            <span :data-value="fc.id">
+              {{ fc.label }}
+            </span>
+            <svg-icon
+              v-if="fc.id == currentFactory?.id"
+              icon-class="Confirm"
+              style="height: 14px; width: 14px"
+            />
+          </li>
+        </ul>
+        <div v-else style="color: #0008; width: 128px; text-align: center">
+          - 无 -
+        </div>
+      </div>
+    </div>
+    <!-- side bar  -->
+    <div class="side-bar__left" style="width: 100%; height: 100%">
+      <!-- <el-tree
+        class="custom-tree-class"
+        :data="currentFactory?.children"
+        :props="treeProps"
+        :empty-text="''"
+        icon-class="custom-icon-class"
+        @node-click="handleSidebarItemClick"
+      >
+      </el-tree> -->
+      <el-menu
+        default-active="2"
+        class="el-menu-vertical-demo"
+        @open="handleOpen"
+        @close="handleClose"
+      >
+        <el-submenu index="1">
+          <template slot="title">
+            <svg-icon
+              style="
+                font-size: 18px;
+                margin-right: 10px;
+                vertical-align: middle;
+              "
+              icon-class="orgTreeIcon"
+            />
+            <span>导航一</span>
+          </template>
+          <el-menu-item index="1-1"
+            ><svg-icon
+              style="
+                font-size: 18px;
+                margin-right: 10px;
+                vertical-align: middle;
+              "
+              icon-class="orgTreeIcon2"
+            />选项1</el-menu-item
+          >
+          <el-menu-item index="1-2"
+            ><svg-icon
+              style="
+                font-size: 18px;
+                margin-right: 10px;
+                vertical-align: middle;
+              "
+              icon-class="orgTreeIcon2"
+            />选项2</el-menu-item
+          >
+          <el-menu-item index="1-3"
+            ><svg-icon
+              style="
+                font-size: 18px;
+                margin-right: 10px;
+                vertical-align: middle;
+              "
+              icon-class="orgTreeIcon2"
+            />选项3</el-menu-item
+          >
+          <el-submenu index="1-4">
+            <template slot="title">
+              <svg-icon
+                style="
+                  font-size: 18px;
+                  margin-right: 10px;
+                  vertical-align: middle;
+                "
+                icon-class="orgTreeIcon"
+              />选项4</template
+            >
+            <el-menu-item index="1-4-1">
+              <svg-icon
+                style="
+                  font-size: 18px;
+                  margin-right: 10px;
+                  vertical-align: middle;
+                "
+                icon-class="orgTreeIcon2"
+              />选项1</el-menu-item
+            >
+          </el-submenu>
+        </el-submenu>
+        <el-menu-item index="2">
+          <svg-icon
+            style="font-size: 18px; margin-right: 10px; vertical-align: middle"
+            icon-class="orgTreeIcon"
+          />
+          <span slot="title">导航二</span>
+        </el-menu-item>
+      </el-menu>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "InpageLeftNav",
+  components: {},
+  props: {},
+  data() {
+    return {
+      factoryListOpen: false,
+      currentFactory: {
+        label: "点我选择设备",
+        id: null,
+        children: [],
+      },
+      treeProps: {
+        children: "children",
+        label: "label",
+      },
+      sidebarContent: [
+        {
+          id: 1,
+          label: "招商局",
+          children: [
+            {
+              label: "招商局地产",
+              children: [
+                {
+                  label: 1,
+                },
+              ],
+            },
+            {
+              label: "招商局商业",
+            },
+            {
+              label: "招商局物流",
+            },
+          ],
+        },
+        {
+          id: 2,
+          label: "株洲中建材光电材料有限公司",
+          children: [
+            {
+              label: "保利地产",
+            },
+            {
+              label: "保利投资",
+            },
+          ],
+        },
+        {
+          id: 3,
+          label: "中国建材集团",
+          children: [
+            {
+              label: "凯盛集团",
+            },
+            {
+              label: "蚌埠研究院",
+            },
+          ],
+        },
+      ],
+      queryParams: {
+        equipmentId: null,
+        lineId: null,
+        sectionId: null,
+        productId: null,
+      },
+    };
+  },
+  computed: {},
+  methods: {
+    /** 暴露给外部，用于更新sidebarContent */
+    async updateSidebarContent(id, url) {
+      // TODO
+      const { code, data } = await this.$axios({
+        url: (url || "/api/quality/deviceParameters") + `/${id}`,
+        method: "get",
+      });
+      if (code === 0) {
+        this.getTree(data);
+      }
+    },
+    /** 点击工厂名称 */
+    factoryClickHandler(event) {
+      this.currentFactory = {
+        label: "加载中...",
+        id: null,
+        children: [],
+      };
+      this.factoryListOpen = false;
+      const fcId = event.target.dataset.value;
+      this.handleSidebarItemClick({ id: fcId, type: "工厂" });
+      this.currentFactory = this.sidebarContent.find((item) => item.id == fcId);
+    },
+    /** 点击某一具体工厂或产线，或工段或设备 */
+    handleSidebarItemClick({ label, id, type }) {
+      this.equipmentId = id;
+      console.log("label clicked!", label, id, type);
+      switch (type) {
+        case "设备":
+          this.queryParams.equipmentId = id;
+          break;
+        case "工段":
+          this.queryParams.equipmentId = null;
+          this.queryParams.sectionId = id;
+          break;
+        case "产线":
+          this.queryParams.equipmentId = null;
+          this.queryParams.sectionId = null;
+          this.queryParams.lineId = id;
+          break;
+        case "工厂":
+          this.queryParams.equipmentId = null;
+          this.queryParams.sectionId = null;
+          this.queryParams.lineId = null;
+          break;
+      }
+    },
+    buildTree(data) {
+      data.forEach((factory) => {
+        this.$set(factory, "label", factory.name);
+        this.$set(factory, "type", "工厂");
+        delete factory.name;
+        factory.children?.forEach((line) => {
+          this.$set(line, "label", line.name);
+          this.$set(line, "type", "产线");
+          delete line.name;
+          line.children?.forEach((ws) => {
+            this.$set(ws, "label", ws.name);
+            this.$set(ws, "type", "工段");
+            delete ws.name;
+            ws.children?.forEach((eq) => {
+              this.$set(eq, "label", eq.name);
+              this.$set(eq, "type", "设备");
+              delete eq.name;
+            });
+          });
+        });
+      });
+    },
+
+    async getTree(data) {
+      // '@/api/quality/deviceParameters'
+      // const res = await getTreeData({ id: id });
+      this.buildTree(data);
+      this.sidebarContent = data;
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.in-page-left-nav {
+  display: inline-block;
+  background: #fff;
+  height: calc(100vh - 120px - 8px);
+  width: 256px;
+  border-radius: 8px;
+  padding: 0;
+  vertical-align: top;
+}
+
+.factory-list__selector {
+  position: relative;
+  height: 36px;
+  font-size: 16px;
+  line-height: 36px;
+  padding-left: 28px;
+  background: url(../assets/images/factory-icon.png) 0px 4px no-repeat;
+  background-size: 26px 26px;
+  padding-right: 16px;
+  .arrow {
+    position: absolute;
+    right: 0;
+    top: 13px;
+  }
+}
+
+.factory-list__selector:hover {
+  cursor: pointer;
+  color: #0008;
+}
+
+.factory-list__selector::after {
+  /* content: ''; */
+  position: absolute;
+  top: 16px;
+  right: 12px;
+  display: inline-block;
+  width: 8px;
+  height: 8px;
+  /* background: #5c5c5c; */
+  border-color: #000;
+  border-width: 4px;
+  border-style: solid;
+  border-top-color: transparent;
+  border-right-color: transparent;
+  border-bottom-color: transparent;
+}
+
+.factory-list__selector:hover::after {
+  /* cursor: pointer; */
+  border-left-color: #0008;
+}
+.factory-list__content {
+  height: 36px;
+  overflow: hidden; /* 确保超出容器的内容会被隐藏 */
+  white-space: nowrap; /* 防止文本自动换行 */
+  text-overflow: ellipsis; /* 使用省略号表示文本被截断 */
+}
+.factory-list__wrapper {
+  visibility: hidden;
+  position: absolute;
+  background: #fff;
+  box-shadow: 0 0 32px 10px #0002;
+  border-radius: 8px;
+  top: 36px;
+  // left: 90px;
+  /* max-width: 128px; */
+  height: auto;
+  width: 200px;
+  white-space: nowrap;
+  overflow: hidden;
+  /* transition: all 0.3s ease-out; */
+  z-index: 1000;
+}
+
+.factory-list__wrapper.open {
+  visibility: visible;
+}
+
+ul,
+li {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+
+.factory-list {
+  color: #0008;
+  max-height: 240px;
+  overflow-y: auto;
+}
+
+.factory-list__item {
+  font-size: 16px;
+  line-height: 1;
+  padding: 8px 16px 8px 16px;
+  min-width: 128px;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.factory-list__item:hover,
+.factory-list__item.is-current {
+  background: #e3efff;
+  color: #0b58ff;
+}
+
+/* .factory-list__item.is-current::after {
+	content: '√';
+	position: absolute;
+	top: 8px;
+	right: 16px;
+	font-weight: bold;
+} */
+</style>
+
+<style>
+.custom-tree-class .el-tree-node__content {
+  width: 100%;
+  height: auto !important;
+  padding: 8px 12px !important;
+}
+
+.custom-tree-class .el-tree-node__content:hover {
+  background: #e3efff;
+}
+
+.custom-tree-class .el-tree-node__children .el-tree-node__content {
+  padding: 8px 18px !important;
+}
+
+.custom-tree-class
+  .el-tree-node__children
+  .el-tree-node__children
+  .el-tree-node__content {
+  padding: 8px 24px !important;
+}
+
+.custom-icon-class {
+  margin-right: 8px;
+  width: 20px;
+  height: 20px;
+  background: url("../assets/images/Qian.png") center center / contain no-repeat;
+}
+
+.custom-icon-class.el-tree-node__expand-icon.expanded {
+  transform: unset;
+}
+
+.el-tree-node__children .custom-icon-class {
+  background: url("../assets/images/tree-icon-2.png") 100% / contain no-repeat;
+}
+
+.el-tree-node__children .el-tree-node__children .custom-icon-class {
+  background: unset;
+}
+</style>
diff --git a/src/views/system/post/components/SearchBarTop.vue b/src/views/system/post/components/SearchBarTop.vue
new file mode 100644
index 0000000..778b28e
--- /dev/null
+++ b/src/views/system/post/components/SearchBarTop.vue
@@ -0,0 +1,78 @@
+<template>
+  <div class="search-bar-top">
+    <el-form :inline="true">
+      <span class="blue-block"></span>
+      <span class="org-name">组织名称</span>
+      <el-form-item label="用户名">
+        <el-input placeholder="用户名" size="small"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="small" @click="onSearch"
+          >查询</el-button
+        >
+        <span class="separateStyle"></span>
+        <el-button type="success" size="small" plain @click="addNew"
+          >新增</el-button
+        >
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+export default {
+  name: "SearchBarTop",
+  data() {
+    return {
+      userName: "",
+    };
+  },
+  mounted() {},
+  methods: {
+    onSearch() {
+      console.log("查询");
+      this.$emit("emitFun", { btn: "onSearch", userName: this.userName });
+    },
+    addNew() {
+      console.log("新增");
+      this.$emit("emitFun", { btn: "addNew" });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.search-bar-top {
+  font-size: 14px;
+  .blue-block {
+    display: inline-block;
+    width: 4px;
+    height: 15px;
+    background-color: #0b58ff;
+    border-radius: 1px;
+    margin-right: 8px;
+    vertical-align: middle;
+  }
+  .org-name {
+    display: inline-block;
+    height: 36px;
+    line-height: 36px;
+    margin-right: 10px;
+    font-size: 14px;
+    color: #606266;
+    font-weight: 700;
+  }
+  .el-form--inline .el-form-item {
+    display: inline-block;
+    margin-right: 10px;
+    vertical-align: top;
+    margin-bottom: 16px;
+  }
+  .separateStyle {
+    display: inline-block;
+    width: 1px;
+    height: 24px;
+    background: #e8e8e8;
+    vertical-align: middle;
+    margin: 0 8px;
+  }
+}
+</style>
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 628cee7..fc6f5df 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -1,243 +1,162 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="岗位编码" prop="code">
-        <el-input v-model="queryParams.code" placeholder="请输入岗位编码" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="岗位名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入岗位名称" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="岗位状态" clearable>
-          <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-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="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['system:post:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['system:post:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="postList">
-      <el-table-column label="岗位编号" align="center" prop="id" />
-      <el-table-column label="岗位编码" align="center" prop="code" />
-      <el-table-column label="岗位名称" align="center" prop="name" />
-      <el-table-column label="岗位排序" align="center" prop="sort" />
-      <el-table-column label="状态" align="center" prop="status">
-        <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['system:post:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['system:post:delete']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 添加或修改岗位对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="岗位名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入岗位名称" />
-        </el-form-item>
-        <el-form-item label="岗位编码" prop="code">
-          <el-input v-model="form.code" placeholder="请输入编码名称" />
-        </el-form-item>
-        <el-form-item label="岗位顺序" prop="sort">
-          <el-input-number v-model="form.sort" 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 statusDictDatas" :key="parseInt(dict.value)" :label="parseInt(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>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+  <div class="user-manager">
+    <InPageLeftNav />
+    <div
+      class="table-area"
+      :class="{
+        'table-area-w': sidebar.opened,
+        'table-area-ws': !sidebar.opened,
+      }"
+    >
+      <SearchBarTop @emitFun="emitFun" />
+      <!-- 列表 -->
+      <base-table
+        :page="queryParams.pageNo"
+        :limit="queryParams.pageSize"
+        :table-props="tableProps"
+        :table-data="list"
+        :max-height="tableH"
+      >
+        <method-btn
+          v-if="tableBtn.length"
+          slot="handleBtn"
+          :width="120"
+          label="操作"
+          :method-list="tableBtn"
+          @clickBtn="handleClick"
+        />
+      </base-table>
+      <pagination
+        :page.sync="queryParams.pageNo"
+        :limit.sync="queryParams.pageSize"
+        :total="total"
+        @pagination="getList"
+      />
+    </div>
   </div>
 </template>
 
 <script>
-import { listPost, getPost, delPost, addPost, updatePost, exportPost } from "@/api/system/post";
-
-import {CommonStatusEnum} from '@/utils/constants'
-import { getDictDatas, DICT_TYPE } from '@/utils/dict'
-
+import { mapGetters } from "vuex";
+import InPageLeftNav from "./components/InPageLeftNav";
+import SearchBarTop from "./components/SearchBarTop";
+import tableHeightMixin from "@/mixins/tableHeightMixin";
+import { listUser } from "@/api/system/user";
+const tableProps = [
+  {
+    prop: "username",
+    label: "用户名",
+    minWidth: 120,
+    showOverflowtooltip: true,
+  },
+  {
+    prop: "email",
+    label: "邮箱",
+    minWidth: 150,
+    showOverflowtooltip: true,
+  },
+  {
+    prop: "mobile",
+    label: "手机号",
+    minWidth: 120,
+  },
+  {
+    prop: "deptName",
+    label: "组织",
+    minWidth: 120,
+  },
+  {
+    prop: "role",
+    label: "角色名称",
+  },
+  {
+    prop: "workno",
+    label: "工号",
+  },
+  {
+    prop: "status",
+    label: "状态",
+  },
+  {
+    prop: "remark",
+    label: "备注",
+    showOverflowtooltip: true,
+  },
+];
 export default {
   name: "SystemPost",
+  components: { InPageLeftNav, SearchBarTop },
+  mixins: [tableHeightMixin],
+  computed: {
+    ...mapGetters(["sidebar"]),
+  },
   data() {
     return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 岗位表格数据
-      postList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNo: 1,
-        pageSize: 10,
-        code: undefined,
-        name: undefined,
-        status: undefined
+        pageSize: 20,
+        name: null,
+        status: null,
+        planFinishTime: [],
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "岗位名称不能为空", trigger: "blur" }
-        ],
-        code: [
-          { required: true, message: "岗位编码不能为空", trigger: "blur" }
-        ],
-        sort: [
-          { required: true, message: "岗位顺序不能为空", trigger: "blur" }
-        ]
-      },
-
-      // 枚举
-      CommonStatusEnum: CommonStatusEnum,
-      // 数据字典
-      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
+      total: 0,
+      tableProps,
+      list: [{ username: "111" }],
+      tableBtn: [
+        {
+          type: "authorization",
+          btnName: "授权",
+        },
+        {
+          type: "edit",
+          btnName: "编辑",
+        },
+        {
+          type: "delete",
+          btnName: "删除",
+        },
+      ],
     };
   },
   created() {
     this.getList();
   },
   methods: {
-    /** 查询岗位列表 */
+    /** 查询用户列表 */
     getList() {
-      this.loading = true;
-      listPost(this.queryParams).then(response => {
-        this.postList = response.data.list;
+      listUser(this.queryParams).then((response) => {
+        this.list = response.data.list;
         this.total = response.data.total;
-        this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
+    emitFun(val) {
+      if (val.btn === "onSearch") {
+        this.queryParams.pageNo = 1;
+        this.getList();
+      } else {
+      }
     },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        code: undefined,
-        name: undefined,
-        sort: 0,
-        status: CommonStatusEnum.ENABLE,
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加岗位";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id
-      getPost(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改岗位";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id !== undefined) {
-            updatePost(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addPost(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id;
-      this.$modal.confirm('是否确认删除岗位编号为"' + ids + '"的数据项?').then(function() {
-          return delPost(ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有岗位数据项?').then(() => {
-          this.exportLoading = true;
-          return exportPost(queryParams);
-        }).then(response => {
-          this.$download.excel(response, '岗位数据.xls');
-          this.exportLoading = false;
-      }).catch(() => {});
-    }
-  }
+    handleClick() {},
+  },
 };
 </script>
+<style lang="scss" scoped>
+.user-manager {
+  display: flex;
+  .table-area {
+    display: inline-block;
+    height: calc(100vh - 120px - 8px);
+    background-color: #fff;
+    margin-left: 8px;
+    border-radius: 8px;
+    padding: 8px;
+  }
+  .table-area-w {
+    width: calc(100vw - 542px);
+  }
+  .table-area-ws {
+    width: calc(100vw - 348px);
+  }
+}
+</style>
diff --git a/src/views/system/post/index1.vue b/src/views/system/post/index1.vue
new file mode 100644
index 0000000..628cee7
--- /dev/null
+++ b/src/views/system/post/index1.vue
@@ -0,0 +1,243 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="岗位编码" prop="code">
+        <el-input v-model="queryParams.code" placeholder="请输入岗位编码" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="岗位名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入岗位名称" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="岗位状态" clearable>
+          <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-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="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['system:post:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['system:post:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="postList">
+      <el-table-column label="岗位编号" align="center" prop="id" />
+      <el-table-column label="岗位编码" align="center" prop="code" />
+      <el-table-column label="岗位名称" align="center" prop="name" />
+      <el-table-column label="岗位排序" align="center" prop="sort" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['system:post:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['system:post:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 添加或修改岗位对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="岗位名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入岗位名称" />
+        </el-form-item>
+        <el-form-item label="岗位编码" prop="code">
+          <el-input v-model="form.code" placeholder="请输入编码名称" />
+        </el-form-item>
+        <el-form-item label="岗位顺序" prop="sort">
+          <el-input-number v-model="form.sort" 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 statusDictDatas" :key="parseInt(dict.value)" :label="parseInt(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>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listPost, getPost, delPost, addPost, updatePost, exportPost } from "@/api/system/post";
+
+import {CommonStatusEnum} from '@/utils/constants'
+import { getDictDatas, DICT_TYPE } from '@/utils/dict'
+
+export default {
+  name: "SystemPost",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 岗位表格数据
+      postList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        code: undefined,
+        name: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "岗位名称不能为空", trigger: "blur" }
+        ],
+        code: [
+          { required: true, message: "岗位编码不能为空", trigger: "blur" }
+        ],
+        sort: [
+          { required: true, message: "岗位顺序不能为空", trigger: "blur" }
+        ]
+      },
+
+      // 枚举
+      CommonStatusEnum: CommonStatusEnum,
+      // 数据字典
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询岗位列表 */
+    getList() {
+      this.loading = true;
+      listPost(this.queryParams).then(response => {
+        this.postList = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        code: undefined,
+        name: undefined,
+        sort: 0,
+        status: CommonStatusEnum.ENABLE,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加岗位";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id
+      getPost(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改岗位";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id !== undefined) {
+            updatePost(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPost(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id;
+      this.$modal.confirm('是否确认删除岗位编号为"' + ids + '"的数据项?').then(function() {
+          return delPost(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有岗位数据项?').then(() => {
+          this.exportLoading = true;
+          return exportPost(queryParams);
+        }).then(response => {
+          this.$download.excel(response, '岗位数据.xls');
+          this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/src/views/system/role/components/dataAuth.vue b/src/views/system/role/components/dataAuth.vue
new file mode 100644
index 0000000..abb4fc2
--- /dev/null
+++ b/src/views/system/role/components/dataAuth.vue
@@ -0,0 +1,162 @@
+<template>
+  <el-form :model="form" label-width="80px">
+    <el-form-item label="角色名称">
+      <el-input v-model="form.name" :disabled="true" />
+    </el-form-item>
+    <el-form-item label="角色标识">
+      <el-input v-model="form.code" :disabled="true" />
+    </el-form-item>
+    <el-form-item label="权限范围">
+      <el-select v-model="form.dataScope" style="width: 100%">
+        <el-option
+          v-for="item in dataScopeDictDatas"
+          :key="parseInt(item.value)"
+          :label="item.label"
+          :value="parseInt(item.value)"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item
+      label="数据权限"
+      v-show="form.dataScope === SysDataScopeEnum.DEPT_CUSTOM"
+    >
+      <el-checkbox
+        :checked="!form.deptCheckStrictly"
+        @change="handleCheckedTreeConnect($event, 'dept')"
+        >父子联动(选中父节点，自动选择子节点)</el-checkbox
+      >
+      <el-checkbox
+        v-model="deptExpand"
+        @change="handleCheckedTreeExpand($event, 'dept')"
+        >展开/折叠</el-checkbox
+      >
+      <el-checkbox
+        v-model="deptNodeAll"
+        @change="handleCheckedTreeNodeAll($event, 'dept')"
+        >全选/全不选</el-checkbox
+      >
+      <el-tree
+        class="tree-border"
+        :data="deptOptions"
+        show-checkbox
+        default-expand-all
+        ref="dept"
+        node-key="id"
+        :check-strictly="form.deptCheckStrictly"
+        empty-text="加载中，请稍后"
+        :props="defaultProps"
+      ></el-tree>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import { SystemDataScopeEnum } from "@/utils/constants";
+import { getRole } from "@/api/system/role";
+import { listSimpleDepts } from "@/api/system/dept";
+import { DICT_TYPE, getDictDatas } from "@/utils/dict";
+import { assignRoleDataScope } from "@/api/system/permission";
+export default {
+  name: "DataAuth",
+  data() {
+    return {
+      form: {
+        id: undefined,
+        name: undefined,
+        code: undefined,
+        deptIds: [],
+        dataScope: undefined,
+        deptCheckStrictly: false,
+      },
+      deptExpand: true,
+      deptNodeAll: false,
+      // 部门列表
+      deptOptions: [], // 部门属性结构
+      depts: [], // 部门列表
+      defaultProps: {
+        label: "name",
+        children: "children",
+      },
+      // 枚举
+      SysDataScopeEnum: SystemDataScopeEnum,
+      // 数据字典
+      dataScopeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_DATA_SCOPE),
+    };
+  },
+  methods: {
+    init(id) {
+      this.form.id = id;
+      getRole(id).then((res) => {
+        this.form.name = res.data.name;
+        this.form.code = res.data.code;
+        this.form.dataScope = res.data.dataScope;
+        // 获得部门列表
+        listSimpleDepts().then((response) => {
+          // 处理 deptOptions 参数
+          this.deptOptions = [];
+          this.deptOptions.push(...this.handleTree(response.data, "id"));
+          this.depts = response.data;
+          this.$refs.dept.setCheckedKeys(res.data.dataScopeDeptIds, false);
+        });
+      });
+    },
+    submitForm() {
+      if (this.form.id !== undefined) {
+        assignRoleDataScope({
+          roleId: this.form.id,
+          dataScope: this.form.dataScope,
+          dataScopeDeptIds:
+            this.form.dataScope !== SystemDataScopeEnum.DEPT_CUSTOM
+              ? []
+              : this.$refs.dept.getCheckedKeys(),
+        }).then((response) => {
+          this.$modal.msgSuccess("修改成功");
+          this.$emit("successSubmitd");
+        });
+      }
+    },
+    formClear() {
+      this.deptExpand = true;
+      this.deptNodeAll = false;
+      this.form = {
+        id: undefined,
+        name: undefined,
+        code: undefined,
+        deptIds: [],
+        dataScope: undefined,
+        deptCheckStrictly: false,
+      };
+    },
+    // 树权限（父子联动）
+    handleCheckedTreeConnect(value, type) {
+      if (type === "menu") {
+        this.form.menuCheckStrictly = value;
+      } else if (type === "dept") {
+        this.form.deptCheckStrictly = !value;
+      }
+    },
+    // 树权限（展开/折叠）
+    handleCheckedTreeExpand(value, type) {
+      if (type === "menu") {
+        let treeList = this.menuOptions;
+        for (let i = 0; i < treeList.length; i++) {
+          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
+        }
+      } else if (type === "dept") {
+        let treeList = this.deptOptions;
+        for (let i = 0; i < treeList.length; i++) {
+          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
+        }
+      }
+    },
+    // 树权限（全选/全不选）
+    handleCheckedTreeNodeAll(value, type) {
+      if (type === "menu") {
+        this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
+      } else if (type === "dept") {
+        // this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
+        this.$refs.dept.setCheckedNodes(value ? this.depts : []);
+      }
+    },
+  },
+};
+</script>
diff --git a/src/views/system/role/components/menuAuth.vue b/src/views/system/role/components/menuAuth.vue
new file mode 100644
index 0000000..3311708
--- /dev/null
+++ b/src/views/system/role/components/menuAuth.vue
@@ -0,0 +1,146 @@
+<template>
+  <el-form :model="form" label-width="80px">
+    <el-form-item label="角色名称">
+      <el-input v-model="form.name" :disabled="true" />
+    </el-form-item>
+    <el-form-item label="角色标识">
+      <el-input v-model="form.code" :disabled="true" />
+    </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-tree
+        class="tree-border"
+        :data="menuOptions"
+        show-checkbox
+        ref="menu"
+        node-key="id"
+        :check-strictly="form.menuCheckStrictly"
+        empty-text="加载中，请稍后"
+        :props="defaultProps"
+      ></el-tree>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import { getRole } from "@/api/system/role";
+import { SystemDataScopeEnum } from "@/utils/constants";
+import { assignRoleMenu, listRoleMenus } from "@/api/system/permission";
+import { DICT_TYPE, getDictDatas } from "@/utils/dict";
+import { listSimpleMenus } from "@/api/system/menu";
+export default {
+  name: "MenuAuth",
+  data() {
+    return {
+      form: {
+        id: undefined,
+        name: undefined,
+        code: undefined,
+        menuIds: [],
+        menuCheckStrictly: true,
+      },
+      // 菜单列表
+      menuOptions: [],
+      menuExpand: false,
+      menuNodeAll: false,
+      SysDataScopeEnum: SystemDataScopeEnum,
+      // 数据字典
+      dataScopeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_DATA_SCOPE),
+      defaultProps: {
+        label: "name",
+        children: "children",
+      },
+    };
+  },
+  methods: {
+    init(id) {
+      this.form.id = id;
+      getRole(id).then((res) => {
+        this.form.name = res.data.name;
+        this.form.code = res.data.code;
+        listSimpleMenus().then((response) => {
+          // 处理 menuOptions 参数
+          this.menuOptions = [];
+          this.menuOptions.push(...this.handleTree(response.data, "id"));
+          // 获取角色拥有的菜单权限
+          listRoleMenus(id).then((response) => {
+            // 设置为严格，避免设置父节点自动选中子节点，解决半选中问题
+            this.form.menuCheckStrictly = true;
+            // 设置选中
+            this.$refs.menu.setCheckedKeys(response.data);
+            // 设置为非严格，继续使用半选中
+            this.form.menuCheckStrictly = false;
+          });
+        });
+      });
+    },
+    submitForm() {
+      if (this.form.id !== undefined) {
+        assignRoleMenu({
+          roleId: this.form.id,
+          menuIds: [
+            ...this.$refs.menu.getCheckedKeys(),
+            ...this.$refs.menu.getHalfCheckedKeys(),
+          ],
+        }).then((response) => {
+          this.$modal.msgSuccess("修改成功");
+          this.$emit("successSubmitm");
+        });
+      }
+    },
+    formClear() {
+      if (this.$refs.menu !== undefined) {
+        this.$refs.menu.setCheckedKeys([]);
+      }
+      this.menuExpand = false;
+      this.menuNodeAll = false;
+      this.form = {
+        id: undefined,
+        name: undefined,
+        code: undefined,
+        menuIds: [],
+        menuCheckStrictly: true,
+      };
+    },
+    // 树权限（父子联动）
+    handleCheckedTreeConnect(value, type) {
+      if (type === "menu") {
+        this.form.menuCheckStrictly = value;
+      } else if (type === "dept") {
+        this.form.deptCheckStrictly = !value;
+      }
+    },
+    // 树权限（展开/折叠）
+    handleCheckedTreeExpand(value, type) {
+      if (type === "menu") {
+        let treeList = this.menuOptions;
+        for (let i = 0; i < treeList.length; i++) {
+          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
+        }
+      } else if (type === "dept") {
+        let treeList = this.deptOptions;
+        for (let i = 0; i < treeList.length; i++) {
+          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
+        }
+      }
+    },
+    // 树权限（全选/全不选）
+    handleCheckedTreeNodeAll(value, type) {
+      if (type === "menu") {
+        this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
+      } else if (type === "dept") {
+        // this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
+        this.$refs.dept.setCheckedNodes(value ? this.depts : []);
+      }
+    },
+  },
+};
+</script>
diff --git a/src/views/system/role/components/roleAdd.vue b/src/views/system/role/components/roleAdd.vue
new file mode 100644
index 0000000..26de73b
--- /dev/null
+++ b/src/views/system/role/components/roleAdd.vue
@@ -0,0 +1,129 @@
+<template>
+  <el-form ref="form" :rules="rules" label-width="100px" :model="form">
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="角色编码" prop="code">
+          <el-input v-model="form.code"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="角色名称" prop="name">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="角色顺序" prop="sort">
+          <el-input-number
+            v-model="form.sort"
+            controls-position="right"
+            :min="1"
+            :max="999999999"
+            style="width: 100%"
+          ></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="状态" prop="status" v-if="isEdit">
+          <el-switch v-model="form.status"> </el-switch>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+import { addRole, getRole, updateRole } from "@/api/system/role";
+export default {
+  name: "RoleAdd",
+  data() {
+    return {
+      form: {
+        id: "",
+        code: "",
+        name: "",
+        sort: 1,
+        status: 0,
+        remark: "",
+      },
+      isEdit: false, //是否是编辑
+      rules: {
+        code: [
+          { required: true, message: "角色编码不能为空", trigger: "blur" },
+        ],
+        name: [
+          { required: true, message: "角色名称不能为空", trigger: "blur" },
+        ],
+        sort: [{ required: true }],
+      },
+    };
+  },
+  methods: {
+    init(id) {
+      if (id) {
+        this.isEdit = true;
+        this.form.id = id;
+        getRole(id).then((res) => {
+          if (res.code === 0) {
+            this.form.id = res.data.id;
+            this.form.code = res.data.code;
+            this.form.name = res.data.name;
+            this.form.sort = res.data.sort;
+            this.form.remark = res.data.remark;
+            this.form.status = res.data.status ? false : true;
+          }
+        });
+      } else {
+        this.isEdit = false;
+        this.form.id = "";
+      }
+    },
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.isEdit) {
+            //编辑
+            updateRole({
+              id: this.form.id,
+              code: this.form.code,
+              name: this.form.name,
+              sort: this.form.sort,
+              remark: this.form.remark,
+              status: this.form.status ? 0 : 1,
+            }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit("successSubmit");
+              }
+            });
+          } else {
+            addRole({
+              code: this.form.code,
+              name: this.form.name,
+              sort: this.form.sort,
+              remark: this.form.remark,
+              status: 0,
+            }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit("successSubmit");
+              }
+            });
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    formClear() {
+      this.$refs.form.resetFields();
+      this.isEdit = false;
+    },
+  },
+};
+</script>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 0cc9fb5..729b17e 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,250 +1,174 @@
 <template>
   <div class="app-container">
-    <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" />
-    <doc-alert title="数据权限" url="https://doc.iocoder.cn/data-permission" />
-    <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
-      <el-form-item label="角色名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入角色名称" clearable size="small" style="width: 240px"
-                  @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="角色标识" prop="code">
-        <el-input v-model="queryParams.code" placeholder="请输入角色标识" clearable size="small" style="width: 240px"
-                  @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="角色状态" clearable size="small" style="width: 240px">
-          <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+    <!-- <doc-alert
+      title="功能权限"
+      url="https://doc.iocoder.cn/resource-permission"
+    />
+    <doc-alert title="数据权限" url="https://doc.iocoder.cn/data-permission" /> -->
+    <!-- 搜索工作栏 -->
+    <search-bar
+      :formConfigs="formConfig"
+      ref="searchBarForm"
+      @headBtnClick="buttonClick"
+    />
+    <!-- 列表 -->
+    <base-table
+      :page="queryParams.pageNo"
+      :limit="queryParams.pageSize"
+      :table-props="tableProps"
+      :table-data="list"
+      :max-height="tableH"
+    >
+      <method-btn
+        v-if="tableBtn.length"
+        slot="handleBtn"
+        :width="230"
+        label="操作"
+        :method-list="tableBtn"
+        @clickBtn="handleClick"
+      />
+    </base-table>
+    <pagination
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      :total="total"
+      @pagination="getList"
+    />
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['system:role:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['system:role:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="roleList">
-      <el-table-column label="角色编号" prop="id" width="120" />
-      <el-table-column label="角色名称" prop="name" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="角色标识" prop="code" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="角色类型" prop="type" width="80">
-        <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.SYSTEM_ROLE_TYPE" :value="scope.row.type"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="显示顺序" prop="sort" width="100" />
-      <el-table-column label="状态" align="center" width="100">
-        <template v-slot="scope">
-          <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['system:role:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-circle-check" @click="handleMenu(scope.row)"
-                     v-hasPermi="['system:permission:assign-role-menu']">菜单权限</el-button>
-          <el-button size="mini" type="text" icon="el-icon-circle-check" @click="handleDataScope(scope.row)"
-                     v-hasPermi="['system:permission:assign-role-data-scope']">数据权限</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['system:role:delete']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="角色名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入角色名称" />
-        </el-form-item>
-        <el-form-item label="角色标识" prop="code">
-          <el-input v-model="form.code" placeholder="请输入角色标识" />
-        </el-form-item>
-        <el-form-item label="角色顺序" prop="sort">
-          <el-input-number v-model="form.sort" controls-position="right" :min="0" />
-        </el-form-item>
-        <el-form-item label="备注">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 分配角色的数据权限对话框 -->
-    <el-dialog title="分配数据权限" :visible.sync="openDataScope" width="500px" append-to-body>
-      <el-form :model="form" label-width="80px">
-        <el-form-item label="角色名称">
-          <el-input v-model="form.name" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="角色标识">
-          <el-input v-model="form.code" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="权限范围">
-          <el-select v-model="form.dataScope">
-            <el-option
-              v-for="item in dataScopeDictDatas"
-              :key="parseInt(item.value)"
-              :label="item.label"
-              :value="parseInt(item.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="数据权限" v-show="form.dataScope === SysDataScopeEnum.DEPT_CUSTOM">
-          <el-checkbox :checked="!form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动(选中父节点，自动选择子节点)</el-checkbox>
-          <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
-          <el-tree
-            class="tree-border"
-            :data="deptOptions"
-            show-checkbox
-            default-expand-all
-            ref="dept"
-            node-key="id"
-            :check-strictly="form.deptCheckStrictly"
-            empty-text="加载中，请稍后"
-            :props="defaultProps"
-          ></el-tree>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitDataScope">确 定</el-button>
-        <el-button @click="cancelDataScope">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 分配角色的菜单权限对话框 -->
-    <el-dialog :title="title" :visible.sync="openMenu" width="500px" append-to-body>
-      <el-form :model="form" label-width="80px">
-        <el-form-item label="角色名称">
-          <el-input v-model="form.name" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="角色标识">
-          <el-input v-model="form.code" :disabled="true" />
-        </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-tree class="tree-border" :data="menuOptions" show-checkbox ref="menu" node-key="id"
-              :check-strictly="form.menuCheckStrictly" empty-text="加载中，请稍后" :props="defaultProps"></el-tree>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitMenu">确 定</el-button>
-        <el-button @click="cancelMenu">取 消</el-button>
-      </div>
-    </el-dialog>
+    <!-- 新增&编辑 -->
+    <base-dialog
+      :dialogTitle="addOrEditTitle"
+      :dialogVisible="centervisible"
+      @cancel="handleCancel"
+      @confirm="handleConfirm"
+      :before-close="handleCancel"
+      width="50%"
+    >
+      <role-add ref="roleAdd" @successSubmit="successSubmit" />
+    </base-dialog>
+    <!-- 菜单权限 -->
+    <base-dialog
+      dialogTitle="分配菜单权限"
+      :dialogVisible="menuVisible"
+      @cancel="handleCancelm"
+      @confirm="handleConfirmm"
+      :before-close="handleCancelm"
+      width="50%"
+    >
+      <menu-auth ref="menuAuth" @successSubmitm="successSubmitm" />
+    </base-dialog>
+    <!-- 数据权限 -->
+    <base-dialog
+      dialogTitle="分配数据权限"
+      :dialogVisible="dataVisible"
+      @cancel="handleCanceld"
+      @confirm="handleConfirmd"
+      :before-close="handleCanceld"
+      width="50%"
+    >
+      <data-auth ref="dataAuth" @successSubmitd="successSubmitd" />
+    </base-dialog>
   </div>
 </template>
 
 <script>
-import {
-  addRole,
-  changeRoleStatus,
-  delRole,
-  exportRole,
-  getRole,
-  listRole,
-  updateRole
-} from "@/api/system/role";
-import {listSimpleMenus} from "@/api/system/menu";
-import {assignRoleMenu, listRoleMenus, assignRoleDataScope} from "@/api/system/permission";
-import {listSimpleDepts} from "@/api/system/dept";
-import {CommonStatusEnum, SystemDataScopeEnum} from "@/utils/constants";
-import {DICT_TYPE, getDictDatas} from "@/utils/dict";
-
+import { delRole, listRole } from "@/api/system/role";
+import tableHeightMixin from "@/mixins/tableHeightMixin";
+import RoleAdd from "./components/roleAdd";
+import MenuAuth from "./components/menuAuth";
+import DataAuth from "./components/dataAuth";
+import statusBtn from "./../components/statusBtn.vue";
+const tableProps = [
+  {
+    prop: "code",
+    label: "角色编码",
+    minWidth: 140,
+    showOverflowtooltip: true,
+  },
+  {
+    prop: "name",
+    label: "角色名称",
+    minWidth: 140,
+    showOverflowtooltip: true,
+  },
+  {
+    prop: "status",
+    label: "状态",
+    minWidth: 100,
+    subcomponent: statusBtn,
+  },
+  {
+    prop: "remark",
+    label: "角色描述",
+    minWidth: 140,
+    showOverflowtooltip: true,
+  },
+];
 export default {
   name: "SystemRole",
+  mixins: [tableHeightMixin],
+  components: { RoleAdd, MenuAuth, DataAuth },
   data() {
     return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 角色表格数据
-      roleList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 是否显示弹出层（数据权限）
-      openDataScope: false,
-      // 是否显示弹出层（菜单权限）
-      openMenu: false,
-      menuExpand: false,
-      menuNodeAll: false,
-      deptExpand: true,
-      deptNodeAll: false,
-      // 菜单列表
-      menuOptions: [],
-      // 部门列表
-      deptOptions: [], // 部门属性结构
-      depts: [], // 部门列表
-      // 查询参数
+      formConfig: [
+        {
+          type: "input",
+          label: "角色名称",
+          placeholder: "角色名称",
+          param: "name",
+        },
+        {
+          type: "button",
+          btnName: "查询",
+          name: "search",
+          color: "primary",
+        },
+        {
+          type: "separate",
+        },
+        {
+          type: "button",
+          btnName: "新增",
+          name: "add",
+          color: "success",
+          plain: true,
+        },
+      ],
       queryParams: {
         pageNo: 1,
-        pageSize: 10,
-        name: undefined,
-        code: undefined,
-        status: undefined,
-        createTime: []
+        pageSize: 20,
+        name: "",
       },
-      // 表单参数
-      form: {},
-      defaultProps: {
-        label: "name",
-        children: "children"
-      },
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "角色名称不能为空", trigger: "blur" }
-        ],
-        code: [
-          { required: true, message: "角色标识不能为空", trigger: "blur" }
-        ],
-        sort: [
-          { required: true, message: "角色顺序不能为空", trigger: "blur" }
-        ]
-      },
-
-      // 枚举
-      SysCommonStatusEnum: CommonStatusEnum,
-      SysDataScopeEnum: SystemDataScopeEnum,
-      // 数据字典
-      roleTypeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_ROLE_TYPE),
-      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
-      dataScopeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_DATA_SCOPE)
+      tableProps,
+      list: [],
+      tableBtn: [
+        {
+          type: "menuAuth",
+          btnName: "菜单权限",
+          // showTip: "新增工单",
+        },
+        {
+          type: "dataAuth",
+          btnName: "数据权限",
+          // showTip: "新增工单",
+        },
+        {
+          type: "edit",
+          btnName: "编辑",
+        },
+        {
+          type: "delete",
+          btnName: "删除",
+        },
+      ],
+      addOrEditTitle: "",
+      centervisible: false,
+      // 菜单权限
+      menuVisible: false,
+      // 数据权限
+      dataVisible: false,
+      // 总条数
+      total: 0,
     };
   },
   created() {
@@ -253,243 +177,109 @@ export default {
   methods: {
     /** 查询角色列表 */
     getList() {
-      this.loading = true;
-      listRole(this.queryParams).then(
-        response => {
-          this.roleList = response.data.list;
-          this.total = response.data.total;
-          this.loading = false;
-        }
-      );
-    },
-    // 角色状态修改
-    handleStatusChange(row) {
-      // 此时，row 已经变成目标状态了，所以可以直接提交请求和提示
-      let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.name + '"角色吗?').then(function() {
-          return changeRoleStatus(row.id, row.status);
-        }).then(() => {
-          this.$modal.msgSuccess(text + "成功");
-        }).catch(function() {
-          // 异常时，需要将 row.status 状态重置回之前的
-          row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE
-              : CommonStatusEnum.ENABLE;
-        });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 取消按钮（数据权限）
-    cancelDataScope() {
-      this.openDataScope = false;
-      this.reset();
-    },
-    // 取消按钮（菜单权限）
-    cancelMenu() {
-      this.openMenu = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      if (this.$refs.menu !== undefined) {
-        this.$refs.menu.setCheckedKeys([]);
-      }
-      this.menuExpand = false;
-      this.menuNodeAll = false;
-      this.deptExpand = true;
-      this.deptNodeAll = false;
-      this.form = {
-        id: undefined,
-        name: undefined,
-        code: undefined,
-        sort: 0,
-        deptIds: [],
-        menuIds: [],
-        dataScope: undefined,
-        deptCheckStrictly: false,
-        menuCheckStrictly: true,
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 树权限（展开/折叠）
-    handleCheckedTreeExpand(value, type) {
-      if (type === 'menu') {
-        let treeList = this.menuOptions;
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
-        }
-      } else if (type === 'dept') {
-        let treeList = this.deptOptions;
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
-        }
-      }
-    },
-    // 树权限（全选/全不选）
-    handleCheckedTreeNodeAll(value, type) {
-      if (type === 'menu') {
-        this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
-      } else if (type === 'dept') {
-        // this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
-        this.$refs.dept.setCheckedNodes(value ? this.depts: []);
-      }
-    },
-    // 树权限（父子联动）
-    handleCheckedTreeConnect(value, type) {
-      if (type === 'menu') {
-        this.form.menuCheckStrictly = value;
-      } else if (type === 'dept') {
-        this.form.deptCheckStrictly = !value;
-      }
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加角色";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id
-      getRole(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改角色";
+      listRole(this.queryParams).then((response) => {
+        this.list = response.data.list;
+        this.total = response.data.total;
       });
     },
-    /** 分配菜单权限操作 */
-    handleMenu(row) {
-      this.reset();
-      const id = row.id
-      // 处理了 form 的角色 name 和 code 的展示
-      this.form.id = id;
-      this.form.name = row.name;
-      this.form.code = row.code;
-      // 打开弹窗
-      this.openMenu = true;
-      // 获得菜单列表
-      listSimpleMenus().then(response => {
-        // 处理 menuOptions 参数
-        this.menuOptions = [];
-        this.menuOptions.push(...this.handleTree(response.data, "id"));
-        // 获取角色拥有的菜单权限
-        listRoleMenus(id).then(response => {
-          // 设置为严格，避免设置父节点自动选中子节点，解决半选中问题
-          this.form.menuCheckStrictly = true
-          // 设置选中
-          this.$refs.menu.setCheckedKeys(response.data);
-          // 设置为非严格，继续使用半选中
-          this.form.menuCheckStrictly = false
-        })
-      });
-
-    },
-    /** 分配数据权限操作 */
-    handleDataScope(row) {
-      this.reset();
-      // 处理了 form 的角色 name 和 code 的展示
-      this.form.id = row.id;
-      this.form.name = row.name;
-      this.form.code = row.code;
-      // 打开弹窗
-      this.openDataScope = true;
-      // 获得部门列表
-      listSimpleDepts().then(response => {
-        // 处理 deptOptions 参数
-        this.deptOptions = [];
-        this.deptOptions.push(...this.handleTree(response.data, "id"));
-        this.depts = response.data;
-        // this.deptIds = response.data.map(x => x.id);
-        // 获得角色拥有的数据权限
-        getRole(row.id).then(response => {
-          this.form.dataScope = response.data.dataScope;
-          this.$refs.dept.setCheckedKeys(response.data.dataScopeDeptIds, false);
-        });
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id !== undefined) {
-            updateRole(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addRole(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 提交按钮（数据权限） */
-    submitDataScope: function() {
-      if (this.form.id !== undefined) {
-        assignRoleDataScope({
-          roleId: this.form.id,
-          dataScope: this.form.dataScope,
-          dataScopeDeptIds: this.form.dataScope !== SystemDataScopeEnum.DEPT_CUSTOM ? [] :
-              this.$refs.dept.getCheckedKeys()
-        }).then(response => {
-          this.$modal.msgSuccess("修改成功");
-          this.openDataScope = false;
-          this.getList();
+    buttonClick(val) {
+      console.log(val);
+      if (val.btnName === "search") {
+        this.queryParams.pageNo = 1;
+        this.getList();
+      } else {
+        this.addOrEditTitle = "新增";
+        this.centervisible = true;
+        this.$nextTick(() => {
+          this.$refs.roleAdd.init();
         });
       }
     },
-    /** 提交按钮（菜单权限） */
-    submitMenu: function() {
-      if (this.form.id !== undefined) {
-        assignRoleMenu({
-          roleId: this.form.id,
-          menuIds: [...this.$refs.menu.getCheckedKeys(), ...this.$refs.menu.getHalfCheckedKeys()]
-        }).then(response => {
-          this.$modal.msgSuccess("修改成功");
-          this.openMenu = false;
-          this.getList();
-        });
+    handleClick(val) {
+      switch (val.type) {
+        case "edit":
+          this.addOrEditTitle = "编辑";
+          this.centervisible = true;
+          this.$nextTick(() => {
+            this.$refs.roleAdd.init(val.data.id);
+          });
+          break;
+        case "delete":
+          this.handleDelete(val.data);
+          break;
+        case "menuAuth":
+          this.menuVisible = true;
+          this.$nextTick(() => {
+            this.$refs.menuAuth.init(val.data.id);
+          });
+          break;
+        default:
+          this.dataVisible = true;
+          this.$nextTick(() => {
+            this.$refs.dataAuth.init(val.data.id);
+          });
       }
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除角色编号为"' + ids + '"的数据项?').then(function() {
-          return delRole(ids);
-        }).then(() => {
+      this.$modal
+        .confirm('是否确认删除角色名称为"' + row.name + '"的数据项?')
+        .then(function () {
+          return delRole(row.id);
+        })
+        .then(() => {
+          this.queryParams.pageNo = 1;
           this.getList();
           this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        })
+        .catch(() => {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有角色数据项?').then(function() {
-          this.exportLoading = true;
-          return exportRole(queryParams);
-        }).then(response => {
-          this.$download.excel(response, '角色数据.xls');
-          this.exportLoading = false;
-      }).catch(() => {});
-    }
-  }
+    // 新增取消
+    handleCancel() {
+      this.$refs.roleAdd.formClear();
+      this.centervisible = false;
+      this.addOrEditTitle = "";
+    },
+    handleConfirm() {
+      this.$refs.roleAdd.submitForm();
+    },
+    successSubmit() {
+      this.handleCancel();
+      this.getList();
+    },
+    // 菜单权限
+    handleCancelm() {
+      this.$refs.menuAuth.formClear();
+      this.menuVisible = false;
+    },
+    handleConfirmm() {
+      this.$refs.menuAuth.submitForm();
+    },
+    successSubmitm() {
+      this.handleCancelm();
+      this.getList();
+    },
+    // 数据权限
+    handleCanceld() {
+      this.$refs.dataAuth.formClear();
+      this.dataVisible = false;
+    },
+    handleConfirmd() {
+      this.$refs.dataAuth.submitForm();
+    },
+    successSubmitd() {
+      this.handleCanceld();
+      this.getList();
+    },
+  },
 };
 </script>
+<style lang="scss" scoped>
+.app-container {
+  width: 100%;
+  height: calc(100vh - 120px - 8px);
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 8px;
+}
+</style>

From aec811827dab4bb0e7767aa5e558acff7bf861c8 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Mon, 20 May 2024 14:54:18 +0800
Subject: [PATCH 2/3] 1

---
 .env.dev                                      |   2 +-
 .../copilot/components/FactoryDataHeader.vue  |  20 +-
 .../copilot/components/FactorySelect.vue      |  16 +-
 src/views/copilot/components/NotMsg.vue       |  27 +
 .../copilot/factoryData/components/Energy.vue | 111 +++-
 .../copilot/factoryData/components/Order.vue  | 107 ++--
 .../factoryData/components/ProdMonitor.vue    |  83 ++-
 .../copilot/factoryData/components/Store.vue  |  62 +-
 src/views/copilot/factoryData/index.vue       | 102 +---
 src/views/system/loginlog/index.vue           | 162 +++--
 src/views/system/menu/index.vue               | 373 ++++++++----
 src/views/system/operatelog/index.vue         | 354 +++++++++--
 src/views/system/post/index.vue               | 353 ++++++-----
 src/views/system/post/index1.vue              | 243 --------
 src/views/system/post/index2.vue              | 162 +++++
 src/views/system/user/index.vue               | 559 +++++++++++++-----
 16 files changed, 1826 insertions(+), 910 deletions(-)
 create mode 100644 src/views/copilot/components/NotMsg.vue
 delete mode 100644 src/views/system/post/index1.vue
 create mode 100644 src/views/system/post/index2.vue

diff --git a/.env.dev b/.env.dev
index 44e6fcd..2c8e3ad 100644
--- a/.env.dev
+++ b/.env.dev
@@ -12,7 +12,7 @@ ENV = 'development'
 VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.1.61:48080'
+# VUE_APP_BASE_API = 'http://192.168.1.70:30307'
 VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
 
 # 路由懒加载
diff --git a/src/views/copilot/components/FactoryDataHeader.vue b/src/views/copilot/components/FactoryDataHeader.vue
index cafa9bb..bab2967 100644
--- a/src/views/copilot/components/FactoryDataHeader.vue
+++ b/src/views/copilot/components/FactoryDataHeader.vue
@@ -9,11 +9,11 @@
     </section>
     <section class="menu2">
       <CopilotButton
-        v-for="i in ['日', '周', '月', '年']"
-        :key="i"
-        :label="i"
-        :active="i === period"
-        @click="() => $emit('update:period', i)"
+        v-for="i in dataList"
+        :key="i.id"
+        :label="i.name"
+        :active="i.id === period"
+        @click="() => $emit('update:period', i.id)"
       />
       <div class="btn-group">
         <button type="button" class="export-btn" />
@@ -42,15 +42,21 @@ export default {
       type: String,
     },
     companyId: {
-      type: String,
+      type: Number,
     },
     period: {
-      type: String,
+      type: Number,
     },
   },
   data() {
     return {
       isFullscreen: false,
+      dataList: [
+        { id: 1, name: "日" },
+        { id: 2, name: "周" },
+        { id: 3, name: "月" },
+        { id: 4, name: "年" },
+      ],
     };
   },
   computed: {},
diff --git a/src/views/copilot/components/FactorySelect.vue b/src/views/copilot/components/FactorySelect.vue
index b46fd14..af7b9e4 100644
--- a/src/views/copilot/components/FactorySelect.vue
+++ b/src/views/copilot/components/FactorySelect.vue
@@ -26,20 +26,20 @@ export default {
       type: String,
     },
     companyId: {
-      type: String,
+      type: Number,
     },
   },
   data() {
     return {
       isOpen: false,
       company: [
-        { id: "1", name: "瑞昌中建材光电材料有限公司" },
-        { id: "2", name: "邯郸中建材光电材料有限公司" },
-        { id: "3", name: "株洲中建材光电材料有限公司" },
-        { id: "4", name: "佳木斯中建材光电材料有限公司" },
-        { id: "5", name: "成都中建材光电材料有限公司" },
-        { id: "6", name: "凯盛中建材光电材料有限公司" },
-        { id: "7", name: "蚌埠中建材光电材料有限公司" },
+        { id: 0, name: "瑞昌中建材光电材料有限公司" },
+        { id: 1, name: "邯郸中建材光电材料有限公司" },
+        { id: 2, name: "株洲中建材光电材料有限公司" },
+        { id: 3, name: "佳木斯中建材光电材料有限公司" },
+        { id: 4, name: "成都中建材光电材料有限公司" },
+        { id: 5, name: "凯盛中建材光电材料有限公司" },
+        { id: 6, name: "蚌埠中建材光电材料有限公司" },
       ],
     };
   },
diff --git a/src/views/copilot/components/NotMsg.vue b/src/views/copilot/components/NotMsg.vue
new file mode 100644
index 0000000..79cd287
--- /dev/null
+++ b/src/views/copilot/components/NotMsg.vue
@@ -0,0 +1,27 @@
+<template>
+	<div class="notmsg">暂无数据</div>
+</template>
+
+<script>
+export default {
+	name: 'NotMsg',
+	components: {},
+	data() {
+		return {
+		};
+	},
+	computed: {
+	},
+	methods: {
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.notmsg {
+	padding-top: 72px;
+	color: rgba(255, 255, 255, 0.4);
+	text-align: center;
+	font-size: 24px;
+}
+</style>
diff --git a/src/views/copilot/factoryData/components/Energy.vue b/src/views/copilot/factoryData/components/Energy.vue
index 5339644..e390670 100644
--- a/src/views/copilot/factoryData/components/Energy.vue
+++ b/src/views/copilot/factoryData/components/Energy.vue
@@ -1,36 +1,37 @@
 <template>
-  <div class="left-chart-base">
-    <div class="legend">
-      <span
-        v-for="item in legend"
-        :key="item.label"
-        class="legend-item"
-        :style="{ fontSize: isFullscreen ? '0.85vw' : '0.73vw' }"
-        >{{ item.label }}</span
-      >
+  <div>
+    <div class="left-chart-base">
+      <NotMsg v-show="notMsg" />
+      <div class="legend" v-show="!notMsg">
+        <span
+          v-for="item in legend"
+          :key="item.label"
+          class="legend-item"
+          :style="{ fontSize: isFullscreen ? '0.85vw' : '0.73vw' }"
+          >{{ item.label }}</span
+        >
+      </div>
+      <div
+        id="factoryEnergyChart"
+        style="width: 100%; height: 100%"
+        v-show="!notMsg"
+      ></div>
     </div>
-    <div id="factoryEnergyChart" style="width: 100%; height: 100%"></div>
   </div>
 </template>
 <script>
 import { debounce } from "@/utils/debounce";
 import * as echarts from "echarts";
+import NotMsg from "./../../components/NotMsg";
 export default {
   name: "Energy",
+  components: { NotMsg },
   props: {
-    vHeight: {
-      type: Number,
-      default: 34,
-    },
     legend: {
       type: Array,
       required: true,
     },
-    xAxis: {
-      type: Array,
-      required: true,
-    },
-    series: {
+    energyCockpits: {
       type: Array,
       required: true,
     },
@@ -39,6 +40,7 @@ export default {
     return {
       isFullscreen: false,
       actualOptions: null,
+      notMsg: false,
       chart: "",
       options: {
         color: ["#FFD160", "#2760FF", "#12FFF5"],
@@ -65,7 +67,7 @@ export default {
             color: "rgba(255, 255, 255, 0.7)",
             fontSize: 12,
           },
-          data: this.xAxis,
+          data: [],
         },
         yAxis: [
           {
@@ -190,6 +192,11 @@ export default {
       },
     };
   },
+  computed: {
+    isOpen() {
+      return this.$store.getters.sidebar.opened;
+    },
+  },
   watch: {
     /** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */
     // isFullscreen(val) {
@@ -216,6 +223,12 @@ export default {
     //   this.actualOptions = actualOptions;
     //   this.initOptions(actualOptions);
     // },
+    energyCockpits() {
+      this.initChart();
+    },
+    isOpen(val) {
+      this.canvasReset();
+    },
   },
   mounted() {
     // if (screenfull.isEnabled) {
@@ -241,17 +254,63 @@ export default {
       }, 500)();
     },
     initChart() {
+      let energyxAxis = [];
+      let n = 0;
+      let seriesArr = [
+        {
+          name: "水",
+          energyType: 1,
+          data: [],
+        },
+        {
+          name: "电",
+          energyType: 2,
+          data: [],
+        },
+        {
+          name: "气",
+          energyType: 3,
+          data: [],
+        },
+      ];
+      if (this.energyCockpits.length > 0) {
+        this.notMsg = false;
+        let dataArr = this.energyCockpits.map((item) => {
+          return item.groupName;
+        });
+        energyxAxis = Array.from(new Set(dataArr));
+        n = energyxAxis.length;
+        seriesArr[0].data = Array.from({ length: n }, () => 0);
+        seriesArr[1].data = Array.from({ length: n }, () => 0);
+        seriesArr[2].data = Array.from({ length: n }, () => 0);
+        for (let i = 0; i < this.energyCockpits.length; i++) {
+          for (let j = 0; j < energyxAxis.length; j++) {
+            if (this.energyCockpits[i].groupName === energyxAxis[j]) {
+              if (this.energyCockpits[i].energyType === 1) {
+                seriesArr[0].data[j] = this.energyCockpits[i].totalEnergyValue;
+              } else if (this.energyCockpits[i].energyType === 2) {
+                seriesArr[1].data[j] = this.energyCockpits[i].totalEnergyValue;
+              } else if (this.energyCockpits[i].energyType === 3) {
+                seriesArr[2].data[j] = this.energyCockpits[i].totalEnergyValue;
+              }
+            }
+          }
+        }
+      } else {
+        this.notMsg = true;
+      }
       if (this.chart) {
         this.chart.dispose();
       }
       this.chart = echarts.init(document.getElementById("factoryEnergyChart"));
       const actualOptions = JSON.parse(JSON.stringify(this.options));
-      actualOptions.series[0].data = this.series[0].data;
-      actualOptions.series[0].name = this.series[0].name;
-      actualOptions.series[1].data = this.series[1].data;
-      actualOptions.series[1].name = this.series[1].name;
-      actualOptions.series[2].data = this.series[2].data;
-      actualOptions.series[2].name = this.series[2].name;
+      actualOptions.xAxis.data = energyxAxis;
+      actualOptions.series[0].data = seriesArr[0].data;
+      actualOptions.series[0].name = seriesArr[0].name;
+      actualOptions.series[1].data = seriesArr[1].data;
+      actualOptions.series[1].name = seriesArr[1].name;
+      actualOptions.series[2].data = seriesArr[2].data;
+      actualOptions.series[2].name = seriesArr[2].name;
       this.actualOptions = actualOptions;
       this.chart.setOption(actualOptions);
     },
diff --git a/src/views/copilot/factoryData/components/Order.vue b/src/views/copilot/factoryData/components/Order.vue
index 5515fe4..8cec3dc 100644
--- a/src/views/copilot/factoryData/components/Order.vue
+++ b/src/views/copilot/factoryData/components/Order.vue
@@ -1,8 +1,9 @@
 <template>
   <dv-scroll-board
-    v-if="aa"
+    v-if="showTable"
     :config="config"
     style="width: 100%; height: 100%"
+    ref="orderScrollBoard"
   />
 </template>
 <script>
@@ -11,7 +12,7 @@ export default {
   name: "Order",
   data() {
     return {
-      aa: true,
+      showTable: true,
       config: {
         header: ["序号", "客户名称", "产品名称", "计划加工数量", "加工进度"],
         headerBGC: "rgba(0, 106, 205, 0.22)",
@@ -26,51 +27,87 @@ export default {
       },
     };
   },
+  props: {
+    prodOrder: {
+      type: Array,
+      default: [],
+    },
+  },
+  computed: {
+    isOpen() {
+      return this.$store.getters.sidebar.opened;
+    },
+  },
+  watch: {
+    isOpen(val) {
+      this.tableReset();
+    },
+    prodOrder() {
+      this.getTableList();
+    },
+  },
   mounted() {
-    this.getTableList();
-    this.tableReset();
     window.addEventListener("resize", this.tableReset);
   },
   methods: {
     tableReset() {
-      this.aa = false;
+      this.showTable = false;
       debounce(() => {
         this.initTable();
       }, 500)();
     },
     initTable() {
-      this.aa = true;
+      this.showTable = true;
     },
     getTableList() {
-      let _this = this;
-      setTimeout(
-        (function name() {
-          _this.config.data = [
-            ["1", "行1列1", "行1列2", "行1列3", "50%"],
-            ["2", "行2列1", "行2列2", "行2列3", "50%"],
-            ["3", "行3列1", "行3列2", "行3列3", "50%"],
-            ["4", "行4列1", "行4列2", "行4列3", "50%"],
-            ["5", "行5列1", "行5列2", "行5列3", "50%"],
-            ["6", "行6列1", "行6列2", "行6列3", "50%"],
-            ["7", "行7列1", "行7列2", "行7列3", "50%"],
-            ["8", "行8列1", "行8列2", "行8列3", "50%"],
-            ["9", "行9列1", "行9列2", "行9列3", "50%"],
-            ["10", "行10列1", "行10列2", "行10列3", "50%"],
-            ["11", "行11列1", "行11列2", "行11列3", "50%"],
-            ["12", "行12列1", "行12列2", "行12列3", "50%"],
-            ["13", "行13列1", "行13列2", "行13列3", "50%"],
-            ["14", "行14列1", "行14列2", "行14列3", "50%"],
-            ["15", "行15列1", "行15列2", "行15列3", "50%"],
-            ["16", "行16列1", "行16列2", "行16列3", "50%"],
-            ["17", "行17列1", "行17列2", "行17列3", "50%"],
-            ["18", "行18列1", "行18列2", "行18列3", "50%"],
-            ["19", "行19列1", "行19列2", "行19列3", "50%"],
-            ["20", "行20列1", "行20列2", "行20列3", "50%"],
-          ];
-        })(),
-        2000
-      );
-      this.initTable();
+      let outArr = [];
+      if (this.prodOrder.length > 0) {
+        for (let i = 0; i < this.prodOrder.length; i++) {
+          let arr = [];
+          arr.push(i + 1);
+          arr.push(
+            `<span title=${this.prodOrder[i].customerName || ""}>${
+              this.prodOrder[i].customerName || ""
+            }</span>`
+          );
+          arr.push(
+            `<span title=${this.prodOrder[i].productName || ""}>${
+              this.prodOrder[i].productName || ""
+            }</span>`
+          );
+          arr.push(
+            `<span title=${this.prodOrder[i].plannedProductionQuantity || ""}>${
+              this.prodOrder[i].plannedProductionQuantity || ""
+            }</span>`
+          );
+          arr.push(`<span style="display:inline-block;width:45px;">${
+            this.prodOrder[i].productionProgress
+              ? this.prodOrder[i].productionProgress.toFixed(0) + "%"
+              : "0%"
+          }</span>
+            <div style="display:inline-block;height:20px;margin-top:-5px;vertical-align:middle;">
+            <svg xmlns="http://www.w3.org/200/svg" height="20" width="20">
+              <circle cx="10" cy="10" r="6" fill="none" stroke="#283851" stroke-width="4" stroke-linecap="round"/>
+              <circle style="transform-origin: center;transform: rotate(-90deg);" id="J_progress_bar" cx="10" cy="10" r="6" fill="none" stroke="#47FF27" stroke-width="4" stroke-dasharray="${
+                this.prodOrder[i].productionProgress
+                  ? this.prodOrder[i].productionProgress.toFixed(0) *
+                      37.68 *
+                      0.01 +
+                    "," +
+                    (1 -
+                      this.prodOrder[i].productionProgress.toFixed(0) * 0.01) *
+                      37.68
+                  : 0 + "," + 37.68
+              }"/>
+            </svg>
+          </div>`);
+          outArr.push(arr);
+        }
+        this.config.data = outArr;
+      } else {
+        this.config.data = [];
+      }
+      this.$refs["orderScrollBoard"].updateRows(outArr);
     },
   },
 };
diff --git a/src/views/copilot/factoryData/components/ProdMonitor.vue b/src/views/copilot/factoryData/components/ProdMonitor.vue
index 432648b..a0e7619 100644
--- a/src/views/copilot/factoryData/components/ProdMonitor.vue
+++ b/src/views/copilot/factoryData/components/ProdMonitor.vue
@@ -14,7 +14,7 @@
       </div>
       <div class="right-box">
         <span class="type">投入数量</span>
-        <span class="num">8391222</span>
+        <span class="num">{{ prodFto[0] ? prodFto[0].chipInput : 0 }}</span>
       </div>
     </div>
     <div class="std-box">
@@ -33,7 +33,9 @@
           </div>
           <div>
             <span class="type">良品数量</span>
-            <span class="type-name">740</span>
+            <span class="type-name">{{
+              msgObj.stand.goodNumber ? msgObj.stand.goodNumber : 0
+            }}</span>
           </div>
         </div>
       </div>
@@ -41,11 +43,15 @@
         <div class="separate">
           <div>
             <span class="type">生产数量</span>
-            <span class="num">783</span>
+            <span class="num">{{
+              msgObj.stand.outputNumber ? msgObj.stand.outputNumber : 0
+            }}</span>
           </div>
           <div>
             <span class="type1">良品率</span>
-            <span class="num">96%</span>
+            <span class="num"
+              >{{ msgObj.stand.yieldRate ? msgObj.stand.yieldRate : 0 }}%</span
+            >
           </div>
         </div>
       </div>
@@ -66,7 +72,9 @@
           </div>
           <div>
             <span class="type">良品数量</span>
-            <span class="type-name">740</span>
+            <span class="type-name">{{
+              msgObj.chip.goodNumber ? msgObj.chip.goodNumber : 0
+            }}</span>
           </div>
         </div>
       </div>
@@ -74,11 +82,15 @@
         <div class="separate">
           <div>
             <span class="type">生产数量</span>
-            <span class="num">783</span>
+            <span class="num">{{
+              msgObj.chip.outputNumber ? msgObj.chip.outputNumber : 0
+            }}</span>
           </div>
           <div>
             <span class="type1">良品率</span>
-            <span class="num">96%</span>
+            <span class="num"
+              >{{ msgObj.chip.yieldRate ? msgObj.chip.yieldRate : 0 }}%</span
+            >
           </div>
         </div>
       </div>
@@ -99,7 +111,9 @@
           </div>
           <div>
             <span class="type">良品数量</span>
-            <span class="type-name">740</span>
+            <span class="type-name">{{
+              msgObj.bipv.goodNumber ? msgObj.bipv.goodNumber : 0
+            }}</span>
           </div>
         </div>
       </div>
@@ -107,11 +121,15 @@
         <div class="separate">
           <div>
             <span class="type">生产数量</span>
-            <span class="num">783</span>
+            <span class="num">{{
+              msgObj.bipv.outputNumber ? msgObj.bipv.outputNumber : 0
+            }}</span>
           </div>
           <div>
             <span class="type1">良品率</span>
-            <span class="num">96%</span>
+            <span class="num"
+              >{{ msgObj.bipv.yieldRate ? msgObj.bipv.yieldRate : 0 }}%</span
+            >
           </div>
         </div>
       </div>
@@ -121,6 +139,51 @@
 <script>
 export default {
   name: "ProdMonitor",
+  data() {
+    return {
+      msgObj: {
+        stand: {},
+        chip: {},
+        bipv: {},
+      },
+    };
+  },
+  props: {
+    prodOutPut: {
+      type: Array,
+      default: [],
+    },
+    prodFto: {
+      type: Array,
+      default: [],
+    },
+  },
+  watch: {
+    prodOutPut() {
+      this.makeData();
+    },
+  },
+  mounted() {
+    this.makeData();
+  },
+  methods: {
+    makeData() {
+      this.msgObj.chip = {};
+      this.msgObj.stand = {};
+      this.msgObj.bipv = {};
+      if (this.prodOutPut.length > 0) {
+        this.prodOutPut.map((item) => {
+          if (item.glassType === 0) {
+            this.msgObj.chip = item;
+          } else if (item.glassType === 1) {
+            this.msgObj.stand = item;
+          } else if (item.glassType === 2) {
+            this.msgObj.bipv = item;
+          }
+        });
+      }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/copilot/factoryData/components/Store.vue b/src/views/copilot/factoryData/components/Store.vue
index 5b169ff..b95086e 100644
--- a/src/views/copilot/factoryData/components/Store.vue
+++ b/src/views/copilot/factoryData/components/Store.vue
@@ -1,36 +1,43 @@
 <template>
-  <div id="factoryStoreChart" style="width: 100%; height: 100%"></div>
+  <div>
+    <NotMsg v-show="notMsg" />
+    <div
+      id="factoryStoreChart"
+      style="width: 100%; height: 100%"
+      v-show="!notMsg"
+    ></div>
+  </div>
 </template>
 <script>
 import { debounce } from "@/utils/debounce";
 import * as echarts from "echarts";
+import NotMsg from "./../../components/NotMsg";
 export default {
   name: "Store",
+  components: { NotMsg },
   props: {
-    vHeight: {
-      type: Number,
-      default: 34,
-    },
-    xAxis: {
-      type: Array,
+    stock: {
+      type: Object,
       required: true,
     },
-    series: {
-      type: Array,
-      required: true,
+  },
+  computed: {
+    isOpen() {
+      return this.$store.getters.sidebar.opened;
     },
   },
   data() {
     return {
       isFullscreen: false,
       actualOptions: null,
+      notMsg: false,
       chart: "",
       options: {
         grid: {
           left: "3%",
           right: "1%",
           bottom: "0",
-          top: "10%",
+          top: "15%",
           containLabel: true,
         },
         tooltip: {},
@@ -47,7 +54,7 @@ export default {
             color: "rgba(255, 255, 255, 0.7)",
             fontSize: 12,
           },
-          data: this.xAxis,
+          data: [],
         },
         yAxis: {
           name: "单位/片",
@@ -116,18 +123,11 @@ export default {
     };
   },
   watch: {
-    series(val) {
-      if (!val) {
-        this.initOptions(this.options);
-        return;
-      }
-      const actualOptions = JSON.parse(JSON.stringify(this.options));
-      actualOptions.series[0].data = val[0].data;
-      actualOptions.series[0].name = val[0].name;
-      actualOptions.series[1].data = val[1].data;
-      actualOptions.series[1].name = val[1].name;
-      this.actualOptions = actualOptions;
-      this.initOptions(actualOptions);
+    stock(val) {
+      this.initChart();
+    },
+    isOpen(val) {
+      this.canvasReset();
     },
   },
   mounted() {
@@ -154,13 +154,23 @@ export default {
       }, 500)();
     },
     initChart() {
+      let xAxis = Object.keys(this.stock) || [];
+      let data = [];
+      if (xAxis.length > 0) {
+        this.notMsg = false;
+        data = xAxis.map((item) => {
+          return this.stock[item].total;
+        });
+      } else {
+        this.notMsg = true;
+      }
       if (this.chart) {
         this.chart.dispose();
       }
       this.chart = echarts.init(document.getElementById("factoryStoreChart"));
       const actualOptions = JSON.parse(JSON.stringify(this.options));
-      actualOptions.series[0].data = this.series[0].data;
-      actualOptions.series[0].name = this.series[0].name;
+      actualOptions.xAxis.data = xAxis;
+      actualOptions.series[0].data = data;
       this.actualOptions = actualOptions;
       this.chart.setOption(actualOptions);
     },
diff --git a/src/views/copilot/factoryData/index.vue b/src/views/copilot/factoryData/index.vue
index a757306..190e464 100644
--- a/src/views/copilot/factoryData/index.vue
+++ b/src/views/copilot/factoryData/index.vue
@@ -5,27 +5,23 @@
       :companyId="companyId"
       :period="period"
       @updateCompany="updateCompany"
-      @update:period="period = $event"
+      @update:period="updatePeriod"
     />
     <div class="factory-section">
       <section class="top flex">
         <db-container title="生产监控" icon="prod">
-          <prod-monitor />
+          <prod-monitor :prodOutPut="prodOutPut" :prodFto="prodFto" />
         </db-container>
         <db-container title="仓库监控.当前" icon="store">
-          <store :series="series" :xAxis="xAxis" />
+          <store :stock="stock" />
         </db-container>
       </section>
       <section class="bottom flex">
         <db-container title="能源监控" icon="energy">
-          <energy
-            :legend="energyLegend"
-            :series="energySeries"
-            :xAxis="energyxAxis"
-          />
+          <energy :legend="energyLegend" :energyCockpits="energyCockpits" />
         </db-container>
         <db-container title="订单监控" icon="order">
-          <order />
+          <order :prodOrder="prodOrder" />
         </db-container>
       </section>
     </div>
@@ -41,7 +37,7 @@ import Energy from "./components/Energy.vue";
 import Order from "./components/Order.vue";
 import { cockpitDataMonitor } from "@/api/produceData";
 export default {
-  name: "FactoryData",
+  name: "factoryData",
   components: {
     FactoryDataHeader,
     DbContainer: Container,
@@ -51,89 +47,47 @@ export default {
     Order,
   },
   data() {
-    const year = new Date().getFullYear();
-    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
     return {
-      companyId: "1",
+      companyId: 0,
       companyName: "瑞昌中建材光电材料有限公司",
-      period: "日",
-
+      period: 1,
+      // 接口获取的数据
+      prodOutPut: [], //生产
+      prodFto: [], //生产
+      stock: {}, //仓库
+      energyCockpits: [], //能源
+      prodOrder: [], //订单
       energyLegend: [
         { label: "电", color: "#FFD160" },
         { label: "水", color: "#2760FF" },
         { label: "气", color: "#12FFF5" },
       ],
-      energyxAxis: [3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7],
-
-      legend: [
-        { label: `${year - 1}年`, color: "#12f7f1" },
-        // { label: `${year}年`, color: "#58adfa" },
-      ],
-      xAxis: cities,
     };
   },
-  computed: {
-    energySeries() {
-      return [
-        {
-          name: "电",
-          data: Array.from({ length: 7 }, () =>
-            Math.floor(Math.random() * 1000)
-          ),
-        },
-        {
-          name: "水",
-          data: Array.from({ length: 7 }, () =>
-            Math.floor(Math.random() * 1000)
-          ),
-        },
-        {
-          name: "气",
-          data: Array.from({ length: 7 }, () =>
-            Math.floor(Math.random() * 1000)
-          ),
-        },
-      ];
-    },
-    series() {
-      // const ftoInvest = this.$store.getters.home.ftoInvest;
-      // if (!ftoInvest || !ftoInvest.current || !ftoInvest.previous) {
-      return [
-        {
-          name: "2023年",
-          data: Array.from({ length: 7 }, () =>
-            Math.floor(Math.random() * 1000)
-          ),
-        },
-      ];
-      // }
-
-      // return [
-      //   {
-      //     name: `${new Date().getFullYear() - 1}年`,
-      //     data: ftoInvest.previous,
-      //   },
-      //   {
-      //     name: `${new Date().getFullYear()}年`,
-      //     data: ftoInvest.current,
-      //   },
-      // ];
-    },
-  },
   mounted() {
-    this.getMes1();
+    this.getMes();
   },
   methods: {
     updateCompany(obj) {
       this.companyId = obj.companyId;
       this.companyName = obj.companyName;
+      this.getMes();
     },
-    getMes1() {
+    updatePeriod(val) {
+      this.period = val;
+      this.getMes();
+    },
+    getMes() {
       cockpitDataMonitor({
-        factorys: [1],
-        date: 4,
+        factorys: [this.companyId],
+        date: this.period,
       }).then((res) => {
         console.log(res);
+        this.prodOutPut = res.data.prodOutputMonitorShDO || [];
+        this.prodFto = res.data.prodOutputFtoDO || [];
+        this.stock = res.data.stockDO || {};
+        this.energyCockpits = res.data.energyCockpitsDO || [];
+        this.prodOrder = res.data.prodOrderMonitorDO || [];
       });
     },
   },
diff --git a/src/views/system/loginlog/index.vue b/src/views/system/loginlog/index.vue
index 53b7d71..e98e8e4 100644
--- a/src/views/system/loginlog/index.vue
+++ b/src/views/system/loginlog/index.vue
@@ -2,63 +2,138 @@
   <div class="app-container">
     <doc-alert title="系统日志" url="https://doc.iocoder.cn/system-log/" />
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="登录地址" prop="userIp">
-        <el-input v-model="queryParams.userIp" placeholder="请输入登录地址" clearable style="width: 240px;"
-                  @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.userIp"
+          placeholder="请输入登录地址"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="用户名称" prop="username">
-        <el-input v-model="queryParams.username" placeholder="请输入用户名称" clearable style="width: 240px;"
-                  @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.username"
+          placeholder="请输入用户名称"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="结果" clearable style="width: 240px">
-          <el-option :key="true" label="成功" :value="true"/>
-          <el-option :key="false" label="失败" :value="false"/>
+        <el-select
+          v-model="queryParams.status"
+          placeholder="结果"
+          clearable
+          style="width: 240px"
+        >
+          <el-option :key="true" label="成功" :value="true" />
+          <el-option :key="false" label="失败" :value="false" />
         </el-select>
       </el-form-item>
       <el-form-item label="登录时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+        <el-date-picker
+          v-model="queryParams.createTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
+        />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button icon="el-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="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['system:login-log:export']">导出</el-button>
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['system:login-log:export']"
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="list">
       <el-table-column label="访问编号" align="center" prop="id" />
-      <el-table-column label="日志类型" align="center" prop="logType" width="120">
+      <el-table-column
+        label="日志类型"
+        align="center"
+        prop="logType"
+        width="120"
+      >
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.SYSTEM_LOGIN_TYPE" :value="scope.row.logType" />
+          <dict-tag
+            :type="DICT_TYPE.SYSTEM_LOGIN_TYPE"
+            :value="scope.row.logType"
+          />
         </template>
       </el-table-column>
       <el-table-column label="用户名称" align="center" prop="username" />
-      <el-table-column label="登录地址" align="center" prop="userIp" width="130" :show-overflow-tooltip="true" />
-      <el-table-column label="userAgent" align="center" prop="userAgent" width="400" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="登录地址"
+        align="center"
+        prop="userIp"
+        width="130"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="userAgent"
+        align="center"
+        prop="userAgent"
+        width="400"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column label="结果" align="center" prop="status">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.SYSTEM_LOGIN_RESULT" :value="scope.row.result" />
+          <dict-tag
+            :type="DICT_TYPE.SYSTEM_LOGIN_RESULT"
+            :value="scope.row.result"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="登录日期" align="center" prop="loginTime" width="180">
+      <el-table-column
+        label="登录日期"
+        align="center"
+        prop="loginTime"
+        width="180"
+      >
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
   </div>
 </template>
 
@@ -86,8 +161,8 @@ export default {
         userIp: undefined,
         username: undefined,
         status: undefined,
-        createTime: []
-      }
+        createTime: [],
+      },
     };
   },
   created() {
@@ -97,12 +172,11 @@ export default {
     /** 查询登录日志列表 */
     getList() {
       this.loading = true;
-      list(this.queryParams).then(response => {
-          this.list = response.data.list;
-          this.total = response.data.total;
-          this.loading = false;
-        }
-      );
+      list(this.queryParams).then((response) => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -116,19 +190,31 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.$modal.confirm('是否确认导出所有操作日志数据项?').then(() => {
+      this.$modal
+        .confirm("是否确认导出所有操作日志数据项?")
+        .then(() => {
           // 处理查询参数
-          let params = {...this.queryParams};
+          let params = { ...this.queryParams };
           params.pageNo = undefined;
           params.pageSize = undefined;
           this.exportLoading = true;
           return exportLoginLog(params);
-        }).then(response => {
-          this.$download.excel(response, '登录日志.xls');
+        })
+        .then((response) => {
+          this.$download.excel(response, "登录日志.xls");
           this.exportLoading = false;
-      }).catch(() => {});
-    }
-  }
+        })
+        .catch(() => {});
+    },
+  },
 };
 </script>
-
+<style lang="scss" scoped>
+.app-container {
+  width: 100%;
+  height: calc(100vh - 120px - 8px);
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 8px;
+}
+</style>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index a8be162..ba43566 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -1,59 +1,146 @@
 <template>
   <div class="app-container">
-    <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" />
+    <doc-alert
+      title="功能权限"
+      url="https://doc.iocoder.cn/resource-permission"
+    />
     <doc-alert title="菜单路由" url="https://doc.iocoder.cn/vue2/route/" />
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+    >
       <el-form-item label="菜单名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入菜单名称" clearable @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入菜单名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="菜单状态" clearable>
-          <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+        <el-select
+          v-model="queryParams.status"
+          placeholder="菜单状态"
+          clearable
+        >
+          <el-option
+            v-for="dict in statusDictDatas"
+            :key="parseInt(dict.value)"
+            :label="dict.label"
+            :value="parseInt(dict.value)"
+          />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button icon="el-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="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['system:menu:create']">新增</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:menu:create']"
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-sort"
+          size="mini"
+          @click="toggleExpandAll"
+          >展开/折叠</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-if="refreshTable" v-loading="loading" :data="menuList" row-key="id" :default-expand-all="isExpandAll"
-              :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-      <el-table-column prop="name" label="菜单名称" :show-overflow-tooltip="true" width="250"></el-table-column>
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="menuList"
+      row-key="id"
+      :default-expand-all="isExpandAll"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+    >
+      <el-table-column
+        prop="name"
+        label="菜单名称"
+        :show-overflow-tooltip="true"
+        width="250"
+      ></el-table-column>
       <el-table-column prop="icon" label="图标" align="center" width="100">
         <template v-slot="scope">
           <svg-icon :icon-class="scope.row.icon" />
         </template>
       </el-table-column>
       <el-table-column prop="sort" label="排序" width="60"></el-table-column>
-      <el-table-column prop="permission" label="权限标识" :show-overflow-tooltip="true" />
-      <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true" />
-      <el-table-column prop="componentName" label="组件名称" :show-overflow-tooltip="true" />
+      <el-table-column
+        prop="permission"
+        label="权限标识"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        prop="component"
+        label="组件路径"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        prop="componentName"
+        label="组件名称"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column prop="status" label="状态" width="80">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['system:menu:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)"
-                     v-hasPermi="['system:menu:create']">新增</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['system:menu:delete']">删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:menu:update']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['system:menu:create']"
+            >新增</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:menu:delete']"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -64,26 +151,55 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="上级菜单">
-              <treeselect v-model="form.parentId" :options="menuOptions" :normalizer="normalizer" :show-count="true"
-                          placeholder="选择上级菜单"/>
+              <treeselect
+                v-model="form.parentId"
+                :options="menuOptions"
+                :normalizer="normalizer"
+                :show-count="true"
+                placeholder="选择上级菜单"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="菜单类型" prop="type">
               <el-radio-group v-model="form.type">
-                <el-radio v-for="dict in menuTypeDictDatas" :key="parseInt(dict.value)" :label="parseInt(dict.value)">
-                  {{dict.label}}</el-radio>
+                <el-radio
+                  v-for="dict in menuTypeDictDatas"
+                  :key="parseInt(dict.value)"
+                  :label="parseInt(dict.value)"
+                >
+                  {{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item v-if="form.type !== 3" label="菜单图标">
-              <el-popover placement="bottom-start" width="460" trigger="click" @show="$refs['iconSelect'].reset()">
+              <el-popover
+                placement="bottom-start"
+                width="460"
+                trigger="click"
+                @show="$refs['iconSelect'].reset()"
+              >
                 <IconSelect ref="iconSelect" @selected="selected" />
-                <el-input slot="reference" v-model="form.icon" placeholder="点击选择图标" readonly>
-                  <svg-icon v-if="form.icon" slot="prefix" :icon-class="form.icon" class="el-input__icon"
-                            style="height: 32px;width: 16px;"/>
-                  <i v-else slot="prefix" class="el-icon-search el-input__icon" />
+                <el-input
+                  slot="reference"
+                  v-model="form.icon"
+                  placeholder="点击选择图标"
+                  readonly
+                >
+                  <svg-icon
+                    v-if="form.icon"
+                    slot="prefix"
+                    :icon-class="form.icon"
+                    class="el-input__icon"
+                    style="height: 32px; width: 16px"
+                  />
+                  <i
+                    v-else
+                    slot="prefix"
+                    class="el-icon-search el-input__icon"
+                  />
                 </el-input>
               </el-popover>
             </el-form-item>
@@ -95,59 +211,89 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="显示排序" prop="sort">
-              <el-input-number v-model="form.sort" controls-position="right" :min="0" />
+              <el-input-number
+                v-model="form.sort"
+                controls-position="right"
+                :min="0"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.type !== 3" label="路由地址" prop="path">
               <span slot="label">
-                <el-tooltip content="访问的路由地址，如：`user`。如需外网地址时，则以 `http(s)://` 开头" placement="top">
-                <i class="el-icon-question" />
+                <el-tooltip
+                  content="访问的路由地址，如：`user`。如需外网地址时，则以 `http(s)://` 开头"
+                  placement="top"
+                >
+                  <i class="el-icon-question" />
                 </el-tooltip>
                 路由地址
               </span>
               <el-input v-model="form.path" placeholder="请输入路由地址" />
             </el-form-item>
           </el-col>
-					<el-col :span="12">
-						<el-form-item v-if="form.type !== 1" label="权限标识">
+          <el-col :span="12">
+            <el-form-item v-if="form.type !== 1" label="权限标识">
               <span slot="label">
-                <el-tooltip content="Controller 方法上的权限字符，如：@PreAuthorize(`@ss.hasPermission('system:user:list')`)" placement="top">
+                <el-tooltip
+                  content="Controller 方法上的权限字符，如：@PreAuthorize(`@ss.hasPermission('system:user:list')`)"
+                  placement="top"
+                >
                   <i class="el-icon-question" />
                 </el-tooltip>
                 权限字符
               </span>
-							<el-input v-model="form.permission" placeholder="请权限标识" maxlength="50" />
-						</el-form-item>
-					</el-col>
-          <el-col :span="12" v-if="form.type === 2">
-            <el-form-item label="组件路径" prop="component">
-              <el-input v-model="form.component" placeholder="例如说：system/user/index" />
+              <el-input
+                v-model="form.permission"
+                placeholder="请权限标识"
+                maxlength="50"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="form.type === 2">
+            <el-form-item label="组件路径" prop="component">
+              <el-input
+                v-model="form.component"
+                placeholder="例如说：system/user/index"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="form.type === 2">
+            <el-form-item label="组件名称" prop="componentName">
+              <el-input
+                v-model="form.componentName"
+                placeholder="例如说：SystemUser"
+              />
             </el-form-item>
           </el-col>
-					<el-col :span="12" v-if="form.type === 2">
-						<el-form-item label="组件名称" prop="componentName">
-							<el-input v-model="form.componentName" placeholder="例如说：SystemUser" />
-						</el-form-item>
-					</el-col>
           <el-col :span="12">
             <el-form-item label="菜单状态" prop="status">
               <span slot="label">
-                <el-tooltip content="选择停用时，路由将不会出现在侧边栏，也不能被访问" placement="top">
+                <el-tooltip
+                  content="选择停用时，路由将不会出现在侧边栏，也不能被访问"
+                  placement="top"
+                >
                   <i class="el-icon-question" />
                 </el-tooltip>
                 菜单状态
               </span>
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                          :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
+                <el-radio
+                  v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
+                  :key="dict.value"
+                  :label="parseInt(dict.value)"
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.type !== 3" label="显示状态">
               <span slot="label">
-                <el-tooltip content="选择隐藏时，路由将不会出现在侧边栏，但仍然可以访问" placement="top">
+                <el-tooltip
+                  content="选择隐藏时，路由将不会出现在侧边栏，但仍然可以访问"
+                  placement="top"
+                >
                   <i class="el-icon-question" />
                 </el-tooltip>
                 是否显示
@@ -161,10 +307,13 @@
           <el-col :span="12">
             <el-form-item v-if="form.type !== 3" label="总是显示">
               <span slot="label">
-                <el-tooltip content="选择不是时，当该菜单只有一个子菜单时，不展示自己，直接展示子菜单" placement="top">
+                <el-tooltip
+                  content="选择不是时，当该菜单只有一个子菜单时，不展示自己，直接展示子菜单"
+                  placement="top"
+                >
                   <i class="el-icon-question" />
                 </el-tooltip>
-                 总是显示
+                总是显示
               </span>
               <el-radio-group v-model="form.alwaysShow">
                 <el-radio :key="true" :label="true">总是</el-radio>
@@ -172,20 +321,23 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-					<el-col :span="12">
-						<el-form-item v-if="form.type === 2" label="是否缓存">
+          <el-col :span="12">
+            <el-form-item v-if="form.type === 2" label="是否缓存">
               <span slot="label">
-                <el-tooltip content="选择缓存时，则会被 `keep-alive` 缓存，必须填写「组件名称」字段" placement="top">
+                <el-tooltip
+                  content="选择缓存时，则会被 `keep-alive` 缓存，必须填写「组件名称」字段"
+                  placement="top"
+                >
                   <i class="el-icon-question" />
                 </el-tooltip>
-                 是否缓存
+                是否缓存
               </span>
-							<el-radio-group v-model="form.keepAlive">
-								<el-radio :key="true" :label="true">缓存</el-radio>
-								<el-radio :key="false" :label="false">不缓存</el-radio>
-							</el-radio-group>
-						</el-form-item>
-					</el-col>
+              <el-radio-group v-model="form.keepAlive">
+                <el-radio :key="true" :label="true">缓存</el-radio>
+                <el-radio :key="false" :label="false">不缓存</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -197,14 +349,20 @@
 </template>
 
 <script>
-import { listMenu, getMenu, delMenu, addMenu, updateMenu } from "@/api/system/menu";
+import {
+  listMenu,
+  getMenu,
+  delMenu,
+  addMenu,
+  updateMenu,
+} from "@/api/system/menu";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import IconSelect from "@/components/IconSelect";
 
-import { SystemMenuTypeEnum, CommonStatusEnum } from '@/utils/constants'
-import { getDictDatas, DICT_TYPE } from '@/utils/dict'
-import {isExternal} from "@/utils/validate";
+import { SystemMenuTypeEnum, CommonStatusEnum } from "@/utils/constants";
+import { getDictDatas, DICT_TYPE } from "@/utils/dict";
+import { isExternal } from "@/utils/validate";
 
 export default {
   name: "SystemMenu",
@@ -230,24 +388,22 @@ export default {
       // 查询参数
       queryParams: {
         name: undefined,
-        visible: undefined
+        visible: undefined,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         name: [
-          { required: true, message: "菜单名称不能为空", trigger: "blur" }
+          { required: true, message: "菜单名称不能为空", trigger: "blur" },
         ],
         sort: [
-          { required: true, message: "菜单顺序不能为空", trigger: "blur" }
+          { required: true, message: "菜单顺序不能为空", trigger: "blur" },
         ],
         path: [
-          { required: true, message: "路由地址不能为空", trigger: "blur" }
+          { required: true, message: "路由地址不能为空", trigger: "blur" },
         ],
-        status: [
-          { required: true, message: "状态不能为空", trigger: "blur" }
-        ]
+        status: [{ required: true, message: "状态不能为空", trigger: "blur" }],
       },
 
       // 枚举
@@ -255,7 +411,7 @@ export default {
       CommonStatusEnum: CommonStatusEnum,
       // 数据字典
       menuTypeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_MENU_TYPE),
-      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
     };
   },
   created() {
@@ -269,7 +425,7 @@ export default {
     /** 查询菜单列表 */
     getList() {
       this.loading = true;
-      listMenu(this.queryParams).then(response => {
+      listMenu(this.queryParams).then((response) => {
         this.menuList = this.handleTree(response.data, "id");
         this.loading = false;
       });
@@ -282,14 +438,14 @@ export default {
       return {
         id: node.id,
         label: node.name,
-        children: node.children
+        children: node.children,
       };
     },
     /** 查询菜单下拉树结构 */
     getTreeselect() {
-      listMenu().then(response => {
+      listMenu().then((response) => {
         this.menuOptions = [];
-        const menu = { id: 0, name: '主类目', children: [] };
+        const menu = { id: 0, name: "主类目", children: [] };
         menu.children = this.handleTree(response.data, "id");
         this.menuOptions.push(menu);
       });
@@ -348,42 +504,44 @@ export default {
     handleUpdate(row) {
       this.reset();
       this.getTreeselect();
-      getMenu(row.id).then(response => {
+      getMenu(row.id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改菜单";
       });
     },
     /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           // 若权限类型为目录或者菜单时，进行 path 的校验，避免后续拼接出来的路由无法跳转
-          if (this.form.type === SystemMenuTypeEnum.DIR
-            || this.form.type === SystemMenuTypeEnum.MENU) {
+          if (
+            this.form.type === SystemMenuTypeEnum.DIR ||
+            this.form.type === SystemMenuTypeEnum.MENU
+          ) {
             // 如果是外链，则不进行校验
-            const path = this.form.path
+            const path = this.form.path;
             if (!isExternal(path)) {
               // 父权限为根节点，path 必须以 / 开头
-              if (this.form.parentId === 0 && path.charAt(0) !== '/') {
-                this.$modal.msgSuccess('前端必须以 / 开头')
-                return
-              } else if (this.form.parentId !== 0 && path.charAt(0) === '/') {
-                this.$modal.msgSuccess('前端不能以 / 开头')
-                return
+              if (this.form.parentId === 0 && path.charAt(0) !== "/") {
+                this.$modal.msgSuccess("前端必须以 / 开头");
+                return;
+              } else if (this.form.parentId !== 0 && path.charAt(0) === "/") {
+                this.$modal.msgSuccess("前端不能以 / 开头");
+                return;
               }
             }
           }
 
           // 提交
           if (this.form.id !== undefined) {
-            updateMenu(this.form).then(response => {
+            updateMenu(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addMenu(this.form).then(response => {
+            addMenu(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -394,13 +552,26 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除名称为"' + row.name + '"的数据项?').then(function() {
+      this.$modal
+        .confirm('是否确认删除名称为"' + row.name + '"的数据项?')
+        .then(function () {
           return delMenu(row.id);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
+        })
+        .catch(() => {});
+    },
+  },
 };
 </script>
+<style lang="scss" scoped>
+.app-container {
+  width: 100%;
+  height: calc(100vh - 120px - 8px);
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 8px;
+}
+</style>
diff --git a/src/views/system/operatelog/index.vue b/src/views/system/operatelog/index.vue
index a692000..42ac5b4 100644
--- a/src/views/system/operatelog/index.vue
+++ b/src/views/system/operatelog/index.vue
@@ -1,84 +1,184 @@
 <template>
   <div class="app-container">
-    <doc-alert title="系统日志" url="https://doc.iocoder.cn/system-log/" />
+    <!-- <doc-alert title="系统日志" url="https://doc.iocoder.cn/system-log/" /> -->
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <search-bar
+      :formConfigs="formConfig"
+      ref="searchBarForm"
+      @headBtnClick="buttonClick"
+    />
+    <!-- <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="系统模块" prop="module">
-        <el-input v-model="queryParams.module" placeholder="请输入系统模块" clearable style="width: 240px;"
-                  @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.module"
+          placeholder="请输入系统模块"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="操作人员" prop="userNickname">
-        <el-input v-model="queryParams.userNickname" placeholder="请输入操作人员" clearable style="width: 240px;"
-                  @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.userNickname"
+          placeholder="请输入操作人员"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="操作类型" clearable style="width: 240px">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_OPERATE_TYPE)" :key="parseInt(dict.value)"
-                     :label="dict.label" :value="parseInt(dict.value)"/>
+        <el-select
+          v-model="queryParams.type"
+          placeholder="操作类型"
+          clearable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_OPERATE_TYPE)"
+            :key="parseInt(dict.value)"
+            :label="dict.label"
+            :value="parseInt(dict.value)"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.success" placeholder="操作状态" clearable style="width: 240px">
-          <el-option :key="true" label="成功" :value="true"/>
-          <el-option :key="false" label="失败" :value="false"/>
+        <el-select
+          v-model="queryParams.success"
+          placeholder="操作状态"
+          clearable
+          style="width: 240px"
+        >
+          <el-option :key="true" label="成功" :value="true" />
+          <el-option :key="false" label="失败" :value="false" />
         </el-select>
       </el-form-item>
       <el-form-item label="操作时间" prop="startTime">
-        <el-date-picker v-model="queryParams.startTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+        <el-date-picker
+          v-model="queryParams.startTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
+        />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
-    </el-form>
+    </el-form> -->
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['system:operate-log:export']">导出</el-button>
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['system:operate-log:export']"
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row> -->
 
-    <el-table v-loading="loading" :data="list">
+    <!-- 列表 -->
+    <base-table
+      :page="queryParams.pageNo"
+      :limit="queryParams.pageSize"
+      :table-props="tableProps"
+      :table-data="list"
+      :max-height="tableH"
+    >
+      <method-btn
+        v-if="tableBtn.length"
+        slot="handleBtn"
+        :width="230"
+        label="操作"
+        :method-list="tableBtn"
+        @clickBtn="handleClick"
+      />
+    </base-table>
+    <!-- <el-table v-loading="loading" :data="list">
       <el-table-column label="日志编号" align="center" prop="id" />
       <el-table-column label="操作模块" align="center" prop="module" />
       <el-table-column label="操作名" align="center" prop="name" width="180" />
       <el-table-column label="操作类型" align="center" prop="type">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.SYSTEM_OPERATE_TYPE" :value="scope.row.type"/>
+          <dict-tag
+            :type="DICT_TYPE.SYSTEM_OPERATE_TYPE"
+            :value="scope.row.type"
+          />
         </template>
       </el-table-column>
       <el-table-column label="操作人" align="center" prop="userNickname" />
       <el-table-column label="操作结果" align="center" prop="status">
         <template v-slot="scope">
-          <span>{{ scope.row.resultCode === 0 ? '成功' : '失败' }}</span>
+          <span>{{ scope.row.resultCode === 0 ? "成功" : "失败" }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作日期" align="center" prop="startTime" width="180">
+      <el-table-column
+        label="操作日期"
+        align="center"
+        prop="startTime"
+        width="180"
+      >
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.startTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="执行时长" align="center" prop="startTime">
         <template v-slot="scope">
-          <span>{{ scope.row.duration }}  ms</span>
+          <span>{{ scope.row.duration }} ms</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row,scope.index)"
-                     v-hasPermi="['system:operate-log:query']">详细</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleView(scope.row, scope.index)"
+            v-hasPermi="['system:operate-log:query']"
+            >详细</el-button
+          >
         </template>
       </el-table-column>
-    </el-table>
+    </el-table> -->
 
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList" />
+    <pagination
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      :total="total"
+      @pagination="getList"
+    />
 
     <!-- 操作日志详细 -->
-    <el-dialog title="访问日志详细" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog
+      title="访问日志详细"
+      :visible.sync="open"
+      width="700px"
+      append-to-body
+    >
       <el-form ref="form" :model="form" label-width="100px" size="mini">
         <el-row>
           <el-col :span="24">
@@ -88,24 +188,35 @@
             <el-form-item label="链路追踪：">{{ form.traceId }}</el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="用户信息：">{{ form.userId }} | {{ form.userNickname }} | {{ form.userIp }} | {{ form.userAgent}} </el-form-item>
+            <el-form-item label="用户信息："
+              >{{ form.userId }} | {{ form.userNickname }} | {{ form.userIp }} |
+              {{ form.userAgent }}
+            </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="操作信息：">
               {{ form.module }} | {{ form.name }}
-              <dict-tag :type="DICT_TYPE.SYSTEM_OPERATE_TYPE" :value="form.type"/>
-              <br /> {{ form.content }}
-              <br /> {{ form.exts }}
+              <dict-tag
+                :type="DICT_TYPE.SYSTEM_OPERATE_TYPE"
+                :value="form.type"
+              />
+              <br />
+              {{ form.content }} <br />
+              {{ form.exts }}
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="请求信息：">{{ form.requestMethod }} | {{ form.requestUrl }} </el-form-item>
+            <el-form-item label="请求信息："
+              >{{ form.requestMethod }} | {{ form.requestUrl }}
+            </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="方法名：">{{ form.javaMethod }}</el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="方法参数：">{{ form.javaMethodArgs }}</el-form-item>
+            <el-form-item label="方法参数：">{{
+              form.javaMethodArgs
+            }}</el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="开始时间：">
@@ -114,8 +225,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="操作结果：">
-              <div v-if="form.resultCode === 0">正常 | {{ form.resultData}} </div>
-              <div v-else-if="form.resultCode > 0">失败 | {{ form.resultCode }} || {{ form.resultMsg}}</div>
+              <div v-if="form.resultCode === 0">
+                正常 | {{ form.resultData }}
+              </div>
+              <div v-else-if="form.resultCode > 0">
+                失败 | {{ form.resultCode }} || {{ form.resultMsg }}
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
@@ -129,11 +244,100 @@
 
 <script>
 import { listOperateLog, exportOperateLog } from "@/api/system/operatelog";
-
+import tableHeightMixin from "@/mixins/tableHeightMixin";
+const tableProps = [
+  {
+    prop: "code",
+    label: "角色编码",
+    minWidth: 140,
+    showOverflowtooltip: true,
+  },
+  {
+    prop: "name",
+    label: "角色名称",
+    minWidth: 140,
+    showOverflowtooltip: true,
+  },
+  // {
+  //   prop: "status",
+  //   label: "状态",
+  //   minWidth: 100,
+  //   subcomponent: statusBtn,
+  // },
+  {
+    prop: "remark",
+    label: "角色描述",
+    minWidth: 140,
+    showOverflowtooltip: true,
+  },
+];
 export default {
   name: "SystemOperateLog",
+  mixins: [tableHeightMixin],
   data() {
     return {
+      formConfig: [
+        {
+          type: "input",
+          label: "系统模块",
+          placeholder: "系统模块",
+          param: "module",
+        },
+        {
+          type: "input",
+          label: "操作人员",
+          placeholder: "操作人员",
+          param: "userNickname",
+        },
+        {
+          type: "select",
+          label: "类型",
+          selectOptions: this.getDictDatas(this.DICT_TYPE.SYSTEM_OPERATE_TYPE),
+          labelField: "label",
+          valueField: "value",
+          param: "type",
+        },
+        {
+          type: "select",
+          label: "状态",
+          selectOptions: [
+            { id: true, name: "成功" },
+            { id: false, name: "失败" },
+          ],
+          param: "success",
+        },
+        {
+          type: "datePicker",
+          label: "操作时间",
+          dateType: "daterange",
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          rangeSeparator: "-",
+          startPlaceholder: "开始日期",
+          endPlaceholder: "结束日期",
+          param: "startTime",
+          defaultSelect: [],
+          defaultTime: ["00:00:00", "23:59:59"],
+          width: 250,
+        },
+        {
+          type: "button",
+          btnName: "查询",
+          name: "search",
+          color: "primary",
+        },
+        {
+          type: "separate",
+        },
+        {
+          type: "button",
+          btnName: "导出",
+          name: "export",
+          color: "primary",
+          plain: true,
+        },
+      ],
+      tableProps,
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -144,6 +348,12 @@ export default {
       total: 0,
       // 表格数据
       list: [],
+      tableBtn: [
+        {
+          type: "detail",
+          btnName: "详情",
+        },
+      ],
       // 是否显示弹出层
       open: false,
       // 类型数据字典
@@ -153,12 +363,12 @@ export default {
       // 查询参数
       queryParams: {
         pageNo: 1,
-        pageSize: 10,
+        pageSize: 20,
         module: undefined,
         userNickname: undefined,
         businessType: undefined,
-        status: undefined,
-        startTime: []
+        success: undefined,
+        startTime: [],
       },
     };
   },
@@ -169,12 +379,11 @@ export default {
     /** 查询登录日志 */
     getList() {
       this.loading = true;
-      listOperateLog(this.queryParams).then( response => {
-          this.list = response.data.list;
-          this.total = response.data.total;
-          this.loading = false;
-        }
-      );
+      listOperateLog(this.queryParams).then((response) => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -193,19 +402,46 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.$modal.confirm('是否确认导出所有操作日志数据项?').then(() => {
+      this.$modal
+        .confirm("是否确认导出所有操作日志数据项?")
+        .then(() => {
           // 处理查询参数
-          let params = {...this.queryParams};
+          let params = { ...this.queryParams };
           params.pageNo = undefined;
           params.pageSize = undefined;
           this.exportLoading = true;
           return exportOperateLog(params);
-        }).then(response => {
-          this.$download.excel(response, '操作日志.xls');
+        })
+        .then((response) => {
+          this.$download.excel(response, "操作日志.xls");
           this.exportLoading = false;
-      }).catch(() => {});
-    }
-  }
+        })
+        .catch(() => {});
+    },
+    buttonClick(val) {
+      if (val.btnName === "search") {
+        this.queryParams.module = val.module;
+        this.queryParams.userNickname = val.userNickname;
+        this.queryParams.type = val.type;
+        this.queryParams.success = val.success;
+        this.queryParams.startTime = val.startTime;
+        this.getList();
+      } else {
+        this.handleExport();
+      }
+    },
+    handleClick(val) {
+      this.handleView(val.data);
+    },
+  },
 };
 </script>
-
+<style lang="scss" scoped>
+.app-container {
+  width: 100%;
+  height: calc(100vh - 120px - 8px);
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 8px;
+}
+</style>
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index fc6f5df..628cee7 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -1,162 +1,243 @@
 <template>
-  <div class="user-manager">
-    <InPageLeftNav />
-    <div
-      class="table-area"
-      :class="{
-        'table-area-w': sidebar.opened,
-        'table-area-ws': !sidebar.opened,
-      }"
-    >
-      <SearchBarTop @emitFun="emitFun" />
-      <!-- 列表 -->
-      <base-table
-        :page="queryParams.pageNo"
-        :limit="queryParams.pageSize"
-        :table-props="tableProps"
-        :table-data="list"
-        :max-height="tableH"
-      >
-        <method-btn
-          v-if="tableBtn.length"
-          slot="handleBtn"
-          :width="120"
-          label="操作"
-          :method-list="tableBtn"
-          @clickBtn="handleClick"
-        />
-      </base-table>
-      <pagination
-        :page.sync="queryParams.pageNo"
-        :limit.sync="queryParams.pageSize"
-        :total="total"
-        @pagination="getList"
-      />
-    </div>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="岗位编码" prop="code">
+        <el-input v-model="queryParams.code" placeholder="请输入岗位编码" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="岗位名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入岗位名称" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="岗位状态" clearable>
+          <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-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="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['system:post:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['system:post:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="postList">
+      <el-table-column label="岗位编号" align="center" prop="id" />
+      <el-table-column label="岗位编码" align="center" prop="code" />
+      <el-table-column label="岗位名称" align="center" prop="name" />
+      <el-table-column label="岗位排序" align="center" prop="sort" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['system:post:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['system:post:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 添加或修改岗位对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="岗位名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入岗位名称" />
+        </el-form-item>
+        <el-form-item label="岗位编码" prop="code">
+          <el-input v-model="form.code" placeholder="请输入编码名称" />
+        </el-form-item>
+        <el-form-item label="岗位顺序" prop="sort">
+          <el-input-number v-model="form.sort" 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 statusDictDatas" :key="parseInt(dict.value)" :label="parseInt(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>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { mapGetters } from "vuex";
-import InPageLeftNav from "./components/InPageLeftNav";
-import SearchBarTop from "./components/SearchBarTop";
-import tableHeightMixin from "@/mixins/tableHeightMixin";
-import { listUser } from "@/api/system/user";
-const tableProps = [
-  {
-    prop: "username",
-    label: "用户名",
-    minWidth: 120,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "email",
-    label: "邮箱",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "mobile",
-    label: "手机号",
-    minWidth: 120,
-  },
-  {
-    prop: "deptName",
-    label: "组织",
-    minWidth: 120,
-  },
-  {
-    prop: "role",
-    label: "角色名称",
-  },
-  {
-    prop: "workno",
-    label: "工号",
-  },
-  {
-    prop: "status",
-    label: "状态",
-  },
-  {
-    prop: "remark",
-    label: "备注",
-    showOverflowtooltip: true,
-  },
-];
+import { listPost, getPost, delPost, addPost, updatePost, exportPost } from "@/api/system/post";
+
+import {CommonStatusEnum} from '@/utils/constants'
+import { getDictDatas, DICT_TYPE } from '@/utils/dict'
+
 export default {
   name: "SystemPost",
-  components: { InPageLeftNav, SearchBarTop },
-  mixins: [tableHeightMixin],
-  computed: {
-    ...mapGetters(["sidebar"]),
-  },
   data() {
     return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 岗位表格数据
+      postList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
       // 查询参数
       queryParams: {
         pageNo: 1,
-        pageSize: 20,
-        name: null,
-        status: null,
-        planFinishTime: [],
+        pageSize: 10,
+        code: undefined,
+        name: undefined,
+        status: undefined
       },
-      total: 0,
-      tableProps,
-      list: [{ username: "111" }],
-      tableBtn: [
-        {
-          type: "authorization",
-          btnName: "授权",
-        },
-        {
-          type: "edit",
-          btnName: "编辑",
-        },
-        {
-          type: "delete",
-          btnName: "删除",
-        },
-      ],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "岗位名称不能为空", trigger: "blur" }
+        ],
+        code: [
+          { required: true, message: "岗位编码不能为空", trigger: "blur" }
+        ],
+        sort: [
+          { required: true, message: "岗位顺序不能为空", trigger: "blur" }
+        ]
+      },
+
+      // 枚举
+      CommonStatusEnum: CommonStatusEnum,
+      // 数据字典
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
     };
   },
   created() {
     this.getList();
   },
   methods: {
-    /** 查询用户列表 */
+    /** 查询岗位列表 */
     getList() {
-      listUser(this.queryParams).then((response) => {
-        this.list = response.data.list;
+      this.loading = true;
+      listPost(this.queryParams).then(response => {
+        this.postList = response.data.list;
         this.total = response.data.total;
+        this.loading = false;
       });
     },
-    emitFun(val) {
-      if (val.btn === "onSearch") {
-        this.queryParams.pageNo = 1;
-        this.getList();
-      } else {
-      }
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
     },
-    handleClick() {},
-  },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        code: undefined,
+        name: undefined,
+        sort: 0,
+        status: CommonStatusEnum.ENABLE,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加岗位";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id
+      getPost(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改岗位";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id !== undefined) {
+            updatePost(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPost(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id;
+      this.$modal.confirm('是否确认删除岗位编号为"' + ids + '"的数据项?').then(function() {
+          return delPost(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有岗位数据项?').then(() => {
+          this.exportLoading = true;
+          return exportPost(queryParams);
+        }).then(response => {
+          this.$download.excel(response, '岗位数据.xls');
+          this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
 };
 </script>
-<style lang="scss" scoped>
-.user-manager {
-  display: flex;
-  .table-area {
-    display: inline-block;
-    height: calc(100vh - 120px - 8px);
-    background-color: #fff;
-    margin-left: 8px;
-    border-radius: 8px;
-    padding: 8px;
-  }
-  .table-area-w {
-    width: calc(100vw - 542px);
-  }
-  .table-area-ws {
-    width: calc(100vw - 348px);
-  }
-}
-</style>
diff --git a/src/views/system/post/index1.vue b/src/views/system/post/index1.vue
deleted file mode 100644
index 628cee7..0000000
--- a/src/views/system/post/index1.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="岗位编码" prop="code">
-        <el-input v-model="queryParams.code" placeholder="请输入岗位编码" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="岗位名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入岗位名称" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="岗位状态" clearable>
-          <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-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="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['system:post:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['system:post:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="postList">
-      <el-table-column label="岗位编号" align="center" prop="id" />
-      <el-table-column label="岗位编码" align="center" prop="code" />
-      <el-table-column label="岗位名称" align="center" prop="name" />
-      <el-table-column label="岗位排序" align="center" prop="sort" />
-      <el-table-column label="状态" align="center" prop="status">
-        <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['system:post:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['system:post:delete']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 添加或修改岗位对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="岗位名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入岗位名称" />
-        </el-form-item>
-        <el-form-item label="岗位编码" prop="code">
-          <el-input v-model="form.code" placeholder="请输入编码名称" />
-        </el-form-item>
-        <el-form-item label="岗位顺序" prop="sort">
-          <el-input-number v-model="form.sort" 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 statusDictDatas" :key="parseInt(dict.value)" :label="parseInt(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>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listPost, getPost, delPost, addPost, updatePost, exportPost } from "@/api/system/post";
-
-import {CommonStatusEnum} from '@/utils/constants'
-import { getDictDatas, DICT_TYPE } from '@/utils/dict'
-
-export default {
-  name: "SystemPost",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 岗位表格数据
-      postList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        code: undefined,
-        name: undefined,
-        status: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "岗位名称不能为空", trigger: "blur" }
-        ],
-        code: [
-          { required: true, message: "岗位编码不能为空", trigger: "blur" }
-        ],
-        sort: [
-          { required: true, message: "岗位顺序不能为空", trigger: "blur" }
-        ]
-      },
-
-      // 枚举
-      CommonStatusEnum: CommonStatusEnum,
-      // 数据字典
-      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询岗位列表 */
-    getList() {
-      this.loading = true;
-      listPost(this.queryParams).then(response => {
-        this.postList = response.data.list;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        code: undefined,
-        name: undefined,
-        sort: 0,
-        status: CommonStatusEnum.ENABLE,
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加岗位";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id
-      getPost(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改岗位";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id !== undefined) {
-            updatePost(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addPost(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id;
-      this.$modal.confirm('是否确认删除岗位编号为"' + ids + '"的数据项?').then(function() {
-          return delPost(ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有岗位数据项?').then(() => {
-          this.exportLoading = true;
-          return exportPost(queryParams);
-        }).then(response => {
-          this.$download.excel(response, '岗位数据.xls');
-          this.exportLoading = false;
-      }).catch(() => {});
-    }
-  }
-};
-</script>
diff --git a/src/views/system/post/index2.vue b/src/views/system/post/index2.vue
new file mode 100644
index 0000000..fc6f5df
--- /dev/null
+++ b/src/views/system/post/index2.vue
@@ -0,0 +1,162 @@
+<template>
+  <div class="user-manager">
+    <InPageLeftNav />
+    <div
+      class="table-area"
+      :class="{
+        'table-area-w': sidebar.opened,
+        'table-area-ws': !sidebar.opened,
+      }"
+    >
+      <SearchBarTop @emitFun="emitFun" />
+      <!-- 列表 -->
+      <base-table
+        :page="queryParams.pageNo"
+        :limit="queryParams.pageSize"
+        :table-props="tableProps"
+        :table-data="list"
+        :max-height="tableH"
+      >
+        <method-btn
+          v-if="tableBtn.length"
+          slot="handleBtn"
+          :width="120"
+          label="操作"
+          :method-list="tableBtn"
+          @clickBtn="handleClick"
+        />
+      </base-table>
+      <pagination
+        :page.sync="queryParams.pageNo"
+        :limit.sync="queryParams.pageSize"
+        :total="total"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from "vuex";
+import InPageLeftNav from "./components/InPageLeftNav";
+import SearchBarTop from "./components/SearchBarTop";
+import tableHeightMixin from "@/mixins/tableHeightMixin";
+import { listUser } from "@/api/system/user";
+const tableProps = [
+  {
+    prop: "username",
+    label: "用户名",
+    minWidth: 120,
+    showOverflowtooltip: true,
+  },
+  {
+    prop: "email",
+    label: "邮箱",
+    minWidth: 150,
+    showOverflowtooltip: true,
+  },
+  {
+    prop: "mobile",
+    label: "手机号",
+    minWidth: 120,
+  },
+  {
+    prop: "deptName",
+    label: "组织",
+    minWidth: 120,
+  },
+  {
+    prop: "role",
+    label: "角色名称",
+  },
+  {
+    prop: "workno",
+    label: "工号",
+  },
+  {
+    prop: "status",
+    label: "状态",
+  },
+  {
+    prop: "remark",
+    label: "备注",
+    showOverflowtooltip: true,
+  },
+];
+export default {
+  name: "SystemPost",
+  components: { InPageLeftNav, SearchBarTop },
+  mixins: [tableHeightMixin],
+  computed: {
+    ...mapGetters(["sidebar"]),
+  },
+  data() {
+    return {
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        name: null,
+        status: null,
+        planFinishTime: [],
+      },
+      total: 0,
+      tableProps,
+      list: [{ username: "111" }],
+      tableBtn: [
+        {
+          type: "authorization",
+          btnName: "授权",
+        },
+        {
+          type: "edit",
+          btnName: "编辑",
+        },
+        {
+          type: "delete",
+          btnName: "删除",
+        },
+      ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      listUser(this.queryParams).then((response) => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+      });
+    },
+    emitFun(val) {
+      if (val.btn === "onSearch") {
+        this.queryParams.pageNo = 1;
+        this.getList();
+      } else {
+      }
+    },
+    handleClick() {},
+  },
+};
+</script>
+<style lang="scss" scoped>
+.user-manager {
+  display: flex;
+  .table-area {
+    display: inline-block;
+    height: calc(100vh - 120px - 8px);
+    background-color: #fff;
+    margin-left: 8px;
+    border-radius: 8px;
+    padding: 8px;
+  }
+  .table-area-w {
+    width: calc(100vw - 542px);
+  }
+  .table-area-ws {
+    width: calc(100vw - 348px);
+  }
+}
+</style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index d51a781..f34f3b2 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -2,99 +2,275 @@
   <div class="app-container">
     <doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" />
     <doc-alert title="三方登陆" url="https://doc.iocoder.cn/social-user/" />
-    <doc-alert title="Excel 导入导出" url="https://doc.iocoder.cn/excel-import-and-export/" />
+    <doc-alert
+      title="Excel 导入导出"
+      url="https://doc.iocoder.cn/excel-import-and-export/"
+    />
     <!-- 搜索工作栏 -->
     <el-row :gutter="20">
       <!--部门数据-->
       <el-col :span="4" :xs="24">
         <div class="head-container">
-          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px"/>
+          <el-input
+            v-model="deptName"
+            placeholder="请输入部门名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
         </div>
         <div class="head-container">
-          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode"
-                   ref="tree" default-expand-all highlight-current @node-click="handleNodeClick"/>
+          <el-tree
+            :data="deptOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            default-expand-all
+            highlight-current
+            @node-click="handleNodeClick"
+          />
         </div>
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :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.native="handleQuery"/>
+            <el-input
+              v-model="queryParams.username"
+              placeholder="请输入用户名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
           </el-form-item>
           <el-form-item label="手机号码" prop="mobile">
-            <el-input v-model="queryParams.mobile" placeholder="请输入手机号码" clearable style="width: 240px"
-                      @keyup.enter.native="handleQuery"/>
+            <el-input
+              v-model="queryParams.mobile"
+              placeholder="请输入手机号码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="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 statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+            <el-select
+              v-model="queryParams.status"
+              placeholder="用户状态"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in statusDictDatas"
+                :key="parseInt(dict.value)"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+              />
             </el-select>
           </el-form-item>
           <el-form-item label="创建时间" prop="createTime">
-            <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+            <el-date-picker
+              v-model="queryParams.createTime"
+              style="width: 240px"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+            />
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="el-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="el-icon-plus" size="mini" @click="handleAdd"
-                       v-hasPermi="['system:user:create']">新增</el-button>
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['system:user:create']"
+              >新增</el-button
+            >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport"
-                       v-hasPermi="['system:user:import']">导入</el-button>
+            <el-button
+              type="info"
+              icon="el-icon-upload2"
+              size="mini"
+              @click="handleImport"
+              v-hasPermi="['system:user:import']"
+              >导入</el-button
+            >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                       v-hasPermi="['system:user:export']">导出</el-button>
+            <el-button
+              type="warning"
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              :loading="exportLoading"
+              v-hasPermi="['system:user:export']"
+              >导出</el-button
+            >
           </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+            :columns="columns"
+          ></right-toolbar>
         </el-row>
 
         <el-table v-loading="loading" :data="userList">
-          <el-table-column label="用户编号" align="center" key="id" prop="id" 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.name" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" />
-          <el-table-column label="状态" key="status" v-if="columns[5].visible" align="center">
+          <el-table-column
+            label="用户编号"
+            align="center"
+            key="id"
+            prop="id"
+            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.name"
+            v-if="columns[3].visible"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="手机号码"
+            align="center"
+            key="mobile"
+            prop="mobile"
+            v-if="columns[4].visible"
+            width="120"
+          />
+          <el-table-column
+            label="状态"
+            key="status"
+            v-if="columns[5].visible"
+            align="center"
+          >
             <template v-slot="scope">
-              <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" />
+              <el-switch
+                v-model="scope.row.status"
+                :active-value="0"
+                :inactive-value="1"
+                @change="handleStatusChange(scope.row)"
+              />
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+          <el-table-column
+            label="创建时间"
+            align="center"
+            prop="createTime"
+            v-if="columns[6].visible"
+            width="160"
+          >
             <template v-slot="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
             <template v-slot="scope">
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                         v-hasPermi="['system:user:update']">修改</el-button>
-              <el-dropdown  @command="(command) => handleCommand(command, scope.$index, scope.row)"
-                            v-hasPermi="['system:user:delete', 'system:user:update-password', 'system:permission:assign-user-role']">
-                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:user:update']"
+                >修改</el-button
+              >
+              <el-dropdown
+                @command="
+                  (command) => handleCommand(command, scope.$index, scope.row)
+                "
+                v-hasPermi="[
+                  'system:user:delete',
+                  'system:user:update-password',
+                  'system:permission:assign-user-role',
+                ]"
+              >
+                <el-button size="mini" type="text" icon="el-icon-d-arrow-right"
+                  >更多</el-button
+                >
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="handleDelete" v-if="scope.row.id !== 1" size="mini" type="text" icon="el-icon-delete"
-                                    v-hasPermi="['system:user:delete']">删除</el-dropdown-item>
-                  <el-dropdown-item command="handleResetPwd" size="mini" type="text" icon="el-icon-key"
-                                    v-hasPermi="['system:user:update-password']">重置密码</el-dropdown-item>
-                  <el-dropdown-item command="handleRole" size="mini" type="text" icon="el-icon-circle-check"
-                                    v-hasPermi="['system:permission:assign-user-role']">分配角色</el-dropdown-item>
+                  <el-dropdown-item
+                    command="handleDelete"
+                    v-if="scope.row.id !== 1"
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    v-hasPermi="['system:user:delete']"
+                    >删除</el-dropdown-item
+                  >
+                  <el-dropdown-item
+                    command="handleResetPwd"
+                    size="mini"
+                    type="text"
+                    icon="el-icon-key"
+                    v-hasPermi="['system:user:update-password']"
+                    >重置密码</el-dropdown-item
+                  >
+                  <el-dropdown-item
+                    command="handleRole"
+                    size="mini"
+                    type="text"
+                    icon="el-icon-circle-check"
+                    v-hasPermi="['system:permission:assign-user-role']"
+                    >分配角色</el-dropdown-item
+                  >
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
           </el-table-column>
         </el-table>
 
-        <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                    @pagination="getList"/>
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNo"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
 
@@ -109,32 +285,59 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :clearable="false"
-                          placeholder="请选择归属部门" :normalizer="normalizer"/>
+              <treeselect
+                v-model="form.deptId"
+                :options="deptOptions"
+                :show-count="true"
+                :clearable="false"
+                placeholder="请选择归属部门"
+                :normalizer="normalizer"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="手机号码" prop="mobile">
-              <el-input v-model="form.mobile" placeholder="请输入手机号码" maxlength="11" />
+              <el-input
+                v-model="form.mobile"
+                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-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.id === undefined" label="用户名称" prop="username">
+            <el-form-item
+              v-if="form.id === undefined"
+              label="用户名称"
+              prop="username"
+            >
               <el-input v-model="form.username" placeholder="请输入用户名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.id === undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" show-password />
+            <el-form-item
+              v-if="form.id === undefined"
+              label="用户密码"
+              prop="password"
+            >
+              <el-input
+                v-model="form.password"
+                placeholder="请输入用户密码"
+                type="password"
+                show-password
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -142,7 +345,12 @@
           <el-col :span="12">
             <el-form-item label="用户性别">
               <el-select v-model="form.sex" placeholder="请选择">
-                <el-option v-for="dict in sexDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+                <el-option
+                  v-for="dict in sexDictDatas"
+                  :key="parseInt(dict.value)"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -150,10 +358,10 @@
             <el-form-item label="岗位">
               <el-select v-model="form.postIds" multiple placeholder="请选择">
                 <el-option
-                    v-for="item in postOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
+                  v-for="item in postOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -162,7 +370,11 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -174,18 +386,39 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload ref="upload" :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-dialog
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
+      <el-upload
+        ref="upload"
+        :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
+      >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
           <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+            <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>
+          <el-link
+            type="primary"
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate"
+            >下载模板</el-link
+          >
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -195,7 +428,12 @@
     </el-dialog>
 
     <!-- 分配角色 -->
-    <el-dialog title="分配角色" :visible.sync="openRole" width="500px" append-to-body>
+    <el-dialog
+      title="分配角色"
+      :visible.sync="openRole"
+      width="500px"
+      append-to-body
+    >
       <el-form :model="form" label-width="80px">
         <el-form-item label="用户名称">
           <el-input v-model="form.username" :disabled="true" />
@@ -206,10 +444,10 @@
         <el-form-item label="角色">
           <el-select v-model="form.roleIds" multiple placeholder="请选择">
             <el-option
-                v-for="item in roleOptions"
-                :key="parseInt(item.id)"
-                :label="item.name"
-                :value="parseInt(item.id)"
+              v-for="item in roleOptions"
+              :key="parseInt(item.id)"
+              :label="item.name"
+              :value="parseInt(item.id)"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -219,7 +457,6 @@
         <el-button @click="cancelRole">取 消</el-button>
       </div>
     </el-dialog>
-
   </div>
 </template>
 
@@ -233,19 +470,19 @@ import {
   importTemplate,
   listUser,
   resetUserPwd,
-  updateUser
+  updateUser,
 } from "@/api/system/user";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
-import {listSimpleDepts} from "@/api/system/dept";
-import {listSimplePosts} from "@/api/system/post";
+import { listSimpleDepts } from "@/api/system/dept";
+import { listSimplePosts } from "@/api/system/post";
 
-import {CommonStatusEnum} from "@/utils/constants";
-import {DICT_TYPE, getDictDatas} from "@/utils/dict";
-import {assignUserRole, listUserRoles} from "@/api/system/permission";
-import {listSimpleRoles} from "@/api/system/role";
-import {getBaseHeader} from "@/utils/request";
+import { CommonStatusEnum } from "@/utils/constants";
+import { DICT_TYPE, getDictDatas } from "@/utils/dict";
+import { assignUserRole, listUserRoles } from "@/api/system/permission";
+import { listSimpleRoles } from "@/api/system/role";
+import { getBaseHeader } from "@/utils/request";
 
 export default {
   name: "SystemUser",
@@ -282,7 +519,7 @@ export default {
       form: {},
       defaultProps: {
         children: "children",
-        label: "name"
+        label: "name",
       },
       // 用户导入参数
       upload: {
@@ -297,7 +534,7 @@ export default {
         // 设置上传的请求头部
         headers: getBaseHeader(),
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + '/admin-api/system/user/import'
+        url: process.env.VUE_APP_BASE_API + "/admin-api/system/user/import",
       },
       // 查询参数
       queryParams: {
@@ -307,7 +544,7 @@ export default {
         mobile: undefined,
         status: undefined,
         deptId: undefined,
-        createTime: []
+        createTime: [],
       },
       // 列信息
       columns: [
@@ -317,33 +554,34 @@ export default {
         { key: 3, label: `部门`, visible: true },
         { key: 4, label: `手机号码`, visible: true },
         { key: 5, label: `状态`, visible: true },
-        { key: 6, label: `创建时间`, visible: true }
+        { key: 6, label: `创建时间`, visible: true },
       ],
       // 表单校验
       rules: {
         username: [
-          { required: true, message: "用户名称不能为空", trigger: "blur" }
+          { required: true, message: "用户名称不能为空", trigger: "blur" },
         ],
         nickname: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+          { required: true, message: "用户昵称不能为空", trigger: "blur" },
         ],
         password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" }
+          { required: true, message: "用户密码不能为空", trigger: "blur" },
         ],
         email: [
           {
             type: "email",
             message: "'请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
+            trigger: ["blur", "change"],
+          },
         ],
         mobile: [
           {
-            pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
+            pattern:
+              /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
             message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
+            trigger: "blur",
+          },
+        ],
       },
       // 是否显示弹出层（角色权限）
       openRole: false,
@@ -359,7 +597,7 @@ export default {
     // 根据名称筛选部门树
     deptName(val) {
       this.$refs.tree.filter(val);
-    }
+    },
   },
   created() {
     this.getList();
@@ -372,16 +610,16 @@ export default {
     // 更多操作
     handleCommand(command, index, row) {
       switch (command) {
-        case 'handleUpdate':
-          this.handleUpdate(row);//修改客户信息
+        case "handleUpdate":
+          this.handleUpdate(row); //修改客户信息
           break;
-        case 'handleDelete':
-          this.handleDelete(row);//红号变更
+        case "handleDelete":
+          this.handleDelete(row); //红号变更
           break;
-        case 'handleResetPwd':
+        case "handleResetPwd":
           this.handleResetPwd(row);
           break;
-        case 'handleRole':
+        case "handleRole":
           this.handleRole(row);
           break;
         default:
@@ -391,21 +629,20 @@ export default {
     /** 查询用户列表 */
     getList() {
       this.loading = true;
-      listUser(this.queryParams).then(response => {
-          this.userList = response.data.list;
-          this.total = response.data.total;
-          this.loading = false;
-        }
-      );
+      listUser(this.queryParams).then((response) => {
+        this.userList = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
     },
     /** 查询部门下拉树结构 + 岗位下拉 */
     getTreeselect() {
-      listSimpleDepts().then(response => {
+      listSimpleDepts().then((response) => {
         // 处理 deptOptions 参数
         this.deptOptions = [];
         this.deptOptions.push(...this.handleTree(response.data, "id"));
       });
-      listSimplePosts().then(response => {
+      listSimplePosts().then((response) => {
         // 处理 postOptions 参数
         this.postOptions = [];
         this.postOptions.push(...response.data);
@@ -424,12 +661,18 @@ export default {
     // 用户状态修改
     handleStatusChange(row) {
       let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.username + '"用户吗?').then(function() {
+      this.$modal
+        .confirm('确认要"' + text + '""' + row.username + '"用户吗?')
+        .then(function () {
           return changeUserStatus(row.id, row.status);
-        }).then(() => {
+        })
+        .then(() => {
           this.$modal.msgSuccess(text + "成功");
-        }).catch(function() {
-          row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE
+        })
+        .catch(function () {
+          row.status =
+            row.status === CommonStatusEnum.ENABLE
+              ? CommonStatusEnum.DISABLE
               : CommonStatusEnum.ENABLE;
         });
     },
@@ -457,7 +700,7 @@ export default {
         status: "0",
         remark: undefined,
         postIds: [],
-        roleIds: []
+        roleIds: [],
       };
       this.resetForm("form");
     },
@@ -486,7 +729,7 @@ export default {
       this.reset();
       this.getTreeselect();
       const id = row.id;
-      getUser(id).then(response => {
+      getUser(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改用户";
@@ -496,17 +739,19 @@ export default {
     handleResetPwd(row) {
       this.$prompt('请输入"' + row.username + '"的新密码', "提示", {
         confirmButtonText: "确定",
-        cancelButtonText: "取消"
-      }).then(({ value }) => {
-          resetUserPwd(row.id, value).then(response => {
+        cancelButtonText: "取消",
+      })
+        .then(({ value }) => {
+          resetUserPwd(row.id, value).then((response) => {
             this.$modal.msgSuccess("修改成功，新密码是：" + value);
           });
-        }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 分配用户角色操作 */
     handleRole(row) {
       this.reset();
-      const id = row.id
+      const id = row.id;
       // 处理了 form 的用户 username 和 nickname 的展示
       this.form.id = id;
       this.form.username = row.username;
@@ -514,29 +759,29 @@ export default {
       // 打开弹窗
       this.openRole = true;
       // 获得角色列表
-      listSimpleRoles().then(response => {
+      listSimpleRoles().then((response) => {
         // 处理 roleOptions 参数
         this.roleOptions = [];
         this.roleOptions.push(...response.data);
       });
       // 获得角色拥有的菜单集合
-      listUserRoles(id).then(response => {
+      listUserRoles(id).then((response) => {
         // 设置选中
         this.form.roleIds = response.data;
-      })
+      });
     },
     /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id !== undefined) {
-            updateUser(this.form).then(response => {
+            updateUser(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addUser(this.form).then(response => {
+            addUser(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -546,12 +791,12 @@ export default {
       });
     },
     /** 提交按钮（角色权限） */
-    submitRole: function() {
+    submitRole: function () {
       if (this.form.id !== undefined) {
         assignUserRole({
           userId: this.form.id,
           roleIds: this.form.roleIds,
-        }).then(response => {
+        }).then((response) => {
           this.$modal.msgSuccess("分配角色成功");
           this.openRole = false;
           this.getList();
@@ -561,26 +806,34 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项?').then(function() {
+      this.$modal
+        .confirm('是否确认删除用户编号为"' + ids + '"的数据项?')
+        .then(function () {
           return delUser(ids);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.$modal.confirm('是否确认导出所有用户数据项?').then(() => {
+      this.$modal
+        .confirm("是否确认导出所有用户数据项?")
+        .then(() => {
           // 处理查询参数
-          let params = {...this.queryParams};
+          let params = { ...this.queryParams };
           params.pageNo = undefined;
           params.pageSize = undefined;
           this.exportLoading = true;
           return exportUser(params);
-        }).then(response => {
-          this.$download.excel(response, '用户数据.xls');
+        })
+        .then((response) => {
+          this.$download.excel(response, "用户数据.xls");
           this.exportLoading = false;
-      }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 导入按钮操作 */
     handleImport() {
@@ -589,8 +842,8 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      importTemplate().then(response => {
-        this.$download.excel(response, '用户导入模板.xls');
+      importTemplate().then((response) => {
+        this.$download.excel(response, "用户导入模板.xls");
       });
     },
     // 文件上传中处理
@@ -600,7 +853,7 @@ export default {
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
       if (response.code !== 0) {
-        this.$modal.msgError(response.msg)
+        this.$modal.msgError(response.msg);
         return;
       }
       this.upload.open = false;
@@ -608,17 +861,22 @@ export default {
       this.$refs.upload.clearFiles();
       // 拼接提示语
       let data = response.data;
-      let text = '创建成功数量：' + data.createUsernames.length;
+      let text = "创建成功数量：" + data.createUsernames.length;
       for (const username of data.createUsernames) {
-        text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username;
+        text += "<br />&nbsp;&nbsp;&nbsp;&nbsp;" + username;
       }
-      text += '<br />更新成功数量：' + data.updateUsernames.length;
+      text += "<br />更新成功数量：" + data.updateUsernames.length;
       for (const username of data.updateUsernames) {
-        text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username;
+        text += "<br />&nbsp;&nbsp;&nbsp;&nbsp;" + username;
       }
-      text += '<br />更新失败数量：' + Object.keys(data.failureUsernames).length;
+      text +=
+        "<br />更新失败数量：" + Object.keys(data.failureUsernames).length;
       for (const username in data.failureUsernames) {
-        text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username + '：' + data.failureUsernames[username];
+        text +=
+          "<br />&nbsp;&nbsp;&nbsp;&nbsp;" +
+          username +
+          "：" +
+          data.failureUsernames[username];
       }
       this.$alert(text, "导入结果", { dangerouslyUseHTMLString: true });
       this.getList();
@@ -632,9 +890,18 @@ export default {
       return {
         id: node.id,
         label: node.name,
-        children: node.children
-      }
-    }
-  }
+        children: node.children,
+      };
+    },
+  },
 };
 </script>
+<style lang="scss" scoped>
+.app-container {
+  width: 100%;
+  height: calc(100vh - 120px - 8px);
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 8px;
+}
+</style>

From 3228987c400b5874300e39b5dbe071e6971e3cf1 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Tue, 21 May 2024 08:34:03 +0800
Subject: [PATCH 3/3] 1

---
 .../copilot/factoryData/components/Energy.vue | 40 ++++++-------------
 .../copilot/factoryData/components/Store.vue  | 20 ++--------
 2 files changed, 16 insertions(+), 44 deletions(-)

diff --git a/src/views/copilot/factoryData/components/Energy.vue b/src/views/copilot/factoryData/components/Energy.vue
index e390670..fd6841c 100644
--- a/src/views/copilot/factoryData/components/Energy.vue
+++ b/src/views/copilot/factoryData/components/Energy.vue
@@ -1,31 +1,22 @@
 <template>
-  <div>
-    <div class="left-chart-base">
-      <NotMsg v-show="notMsg" />
-      <div class="legend" v-show="!notMsg">
-        <span
-          v-for="item in legend"
-          :key="item.label"
-          class="legend-item"
-          :style="{ fontSize: isFullscreen ? '0.85vw' : '0.73vw' }"
-          >{{ item.label }}</span
-        >
-      </div>
-      <div
-        id="factoryEnergyChart"
-        style="width: 100%; height: 100%"
-        v-show="!notMsg"
-      ></div>
+  <div class="left-chart-base">
+    <div class="legend">
+      <span
+        v-for="item in legend"
+        :key="item.label"
+        class="legend-item"
+        :style="{ fontSize: isFullscreen ? '0.85vw' : '0.73vw' }"
+        >{{ item.label }}</span
+      >
     </div>
+    <div id="factoryEnergyChart" style="width: 100%; height: 100%"></div>
   </div>
 </template>
 <script>
 import { debounce } from "@/utils/debounce";
 import * as echarts from "echarts";
-import NotMsg from "./../../components/NotMsg";
 export default {
   name: "Energy",
-  components: { NotMsg },
   props: {
     legend: {
       type: Array,
@@ -40,16 +31,14 @@ export default {
     return {
       isFullscreen: false,
       actualOptions: null,
-      notMsg: false,
       chart: "",
       options: {
         color: ["#FFD160", "#2760FF", "#12FFF5"],
         grid: {
-          left: "3%",
-          right: "4%",
-          bottom: "0",
+          left: "7%",
+          right: "7%",
+          bottom: "8%",
           top: "15%",
-          containLabel: true,
         },
         tooltip: {
           trigger: "axis",
@@ -274,7 +263,6 @@ export default {
         },
       ];
       if (this.energyCockpits.length > 0) {
-        this.notMsg = false;
         let dataArr = this.energyCockpits.map((item) => {
           return item.groupName;
         });
@@ -296,8 +284,6 @@ export default {
             }
           }
         }
-      } else {
-        this.notMsg = true;
       }
       if (this.chart) {
         this.chart.dispose();
diff --git a/src/views/copilot/factoryData/components/Store.vue b/src/views/copilot/factoryData/components/Store.vue
index b95086e..f12ec1c 100644
--- a/src/views/copilot/factoryData/components/Store.vue
+++ b/src/views/copilot/factoryData/components/Store.vue
@@ -1,20 +1,11 @@
 <template>
-  <div>
-    <NotMsg v-show="notMsg" />
-    <div
-      id="factoryStoreChart"
-      style="width: 100%; height: 100%"
-      v-show="!notMsg"
-    ></div>
-  </div>
+  <div id="factoryStoreChart" style="width: 100%; height: 100%"></div>
 </template>
 <script>
 import { debounce } from "@/utils/debounce";
 import * as echarts from "echarts";
-import NotMsg from "./../../components/NotMsg";
 export default {
   name: "Store",
-  components: { NotMsg },
   props: {
     stock: {
       type: Object,
@@ -30,15 +21,13 @@ export default {
     return {
       isFullscreen: false,
       actualOptions: null,
-      notMsg: false,
       chart: "",
       options: {
         grid: {
-          left: "3%",
+          left: "8%",
           right: "1%",
-          bottom: "0",
+          bottom: "8%",
           top: "15%",
-          containLabel: true,
         },
         tooltip: {},
         xAxis: {
@@ -157,12 +146,9 @@ export default {
       let xAxis = Object.keys(this.stock) || [];
       let data = [];
       if (xAxis.length > 0) {
-        this.notMsg = false;
         data = xAxis.map((item) => {
           return this.stock[item].total;
         });
-      } else {
-        this.notMsg = true;
       }
       if (this.chart) {
         this.chart.dispose();