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/4] =?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 @@ + + + 菜单 + + + + + + + + + + + \ 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 @@ + + + + + + + + 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 @@ 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;$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@` zPu{GS@4r8O`gF6O$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#@*NeHZ29v*ZqkpBY>^KPHyha%2Rm6bs7yYUWy{wlt9C(C#_iyScbj zwA}(-879gKIdrU_m+Cl$Q){crIAm7FbSV!pL*xzhOO!<$35e;&(eO0t~Z{yuv5 zzS|K>4Np1_2(fsX8>TF@OIf&F)#%zUU1O>fnNNJM(e^PDJgfljCHWyCg zwHKG{f8D{Lv|!7#t^*U^N;_3B&%LGe_J8(;;Pjeykem<-_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{vwmhh2eIGkCiCxvXPx%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#{-~ 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-Nqh0VioWM4K?Cs+Qi~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 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 +
+
+ +
{{ currentFactory.label }}
+
+
    +
  • + + {{ fc.label }} + + +
  • +
+
+ - 无 - +
+
+
+ + +
+ + + + + + + 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 @@ + + + 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 @@ + 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 @@ + + + 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 @@ + + 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 @@ + + 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 @@ + + 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 @@ + 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/4] 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 @@