From 602054580a8b8e18546318ac24d01ca331d2fba9 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Mon, 13 May 2024 09:27:11 +0800
Subject: [PATCH 1/5] test

---
 .../src/main/resources/mapper/largeScreen/LargeScreenMapper.xml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
index 90a0c80a..9dbfbe72 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
@@ -647,6 +647,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN ma_type mt ON sad.type_id = mt.type_id
                 AND mt.`level` = '4'
                 LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
+                LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
                 LEFT JOIN tm_task tt ON tt.task_id = sad.task_id
         WHERE
             sad.create_time BETWEEN CONCAT(#{startDate}, ' 00:00:00' ) AND CONCAT(#{endDate}, ' 23:59:59' )

From ada8e96ccd9a8c2165736368c6071808305270c8 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Mon, 13 May 2024 10:11:43 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=81=E5=A4=8F=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-screen/config/index.js                    |  2 +-
 sgzb-screen/src/App.vue                        |  4 +---
 sgzb-screen/src/components/home/centerFold.vue | 12 ++++++------
 sgzb-screen/src/components/home/leftOne.vue    |  4 ++--
 sgzb-screen/src/components/home/leftTwo.vue    |  4 ++--
 sgzb-screen/src/views/Home/index.vue           | 12 ++++++------
 sgzb-ui/vue.config.js                          |  2 +-
 7 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/sgzb-screen/config/index.js b/sgzb-screen/config/index.js
index 18e3fd83..f8cc8ab6 100644
--- a/sgzb-screen/config/index.js
+++ b/sgzb-screen/config/index.js
@@ -22,7 +22,7 @@ module.exports = {
         '/screen': {
           // target: 'http://112.29.103.165:21626',//重庆
           // target: 'http://192.168.0.14:21624',//测试
-          target: 'http://10.40.92.140:28080',
+          target: 'http://10.40.92.138:28080',
           changeOrigin: true,
           // secure: true, //如果是https接口，需要配置这个参数
           pathRewrite: {
diff --git a/sgzb-screen/src/App.vue b/sgzb-screen/src/App.vue
index 1118af46..a9f58121 100644
--- a/sgzb-screen/src/App.vue
+++ b/sgzb-screen/src/App.vue
@@ -21,9 +21,7 @@ export default {
 <style lang="less">
 .el-dialog {
   // 背景色透明
-  background-color: rgba(0, 0, 0, 0.5);
-  // background-color: transparent; 
-  // background-color: #000;
+  background: rgba(0, 0, 0, 0.5);
   background-image: url('./assets/img/dialog/window.png');
   background-size: 100% 100%;
   background-repeat: no-repeat;
diff --git a/sgzb-screen/src/components/home/centerFold.vue b/sgzb-screen/src/components/home/centerFold.vue
index ae8a9340..ef23de5a 100644
--- a/sgzb-screen/src/components/home/centerFold.vue
+++ b/sgzb-screen/src/components/home/centerFold.vue
@@ -87,7 +87,7 @@ export default {
       getTotalOwnershipApi().then(res => {
         this.newArrOne.push(
           { name: '施工机具总保有量', value: res.data[0].totalOwnershipNum },
-          // { url: GROUP, name: '工器具总保有量', value: res.data[1].totalOwnershipNum },
+          { url: GROUP, name: '工器具总保有量', value: res.data[1].totalOwnershipNum },
         )
         this.newArr.push(
           { url: GROUP, name: '在库机具', value: res.data[0].stockNum },
@@ -95,11 +95,11 @@ export default {
           { url: GROUP, name: '在用机具', value: res.data[0].useNum },
           { url: GROUP, name: '在修机具', value: res.data[0].repairNum },
           { url: GROUP, name: '报废机具', value: res.data[0].scrapNum },
-          // { url: GROUP, name: '在库工器具', value: res.data[1].stockNum },
-          // { url: GROUP, name: '待入库工器具', value: res.data[1].storedNum },
-          // { url: GROUP, name: '在用工器具', value: res.data[1].useNum },
-          // { url: GROUP, name: '在修工器具', value: res.data[1].repairNum },
-          // { url: GROUP, name: '报废工器具', value: res.data[1].scrapNum },
+          { url: GROUP, name: '在库工器具', value: res.data[1].stockNum },
+          { url: GROUP, name: '待入库工器具', value: res.data[1].storedNum },
+          { url: GROUP, name: '在用工器具', value: res.data[1].useNum },
+          { url: GROUP, name: '在修工器具', value: res.data[1].repairNum },
+          { url: GROUP, name: '报废工器具', value: res.data[1].scrapNum },
         )
       })
     },
diff --git a/sgzb-screen/src/components/home/leftOne.vue b/sgzb-screen/src/components/home/leftOne.vue
index 7d1cb7b4..79b85bbe 100644
--- a/sgzb-screen/src/components/home/leftOne.vue
+++ b/sgzb-screen/src/components/home/leftOne.vue
@@ -5,9 +5,9 @@
         <h5 class="access-rate-box-title">领料数据</h5>
       </div>
       <CountFlopOne :val="num" sonTitle="施工机具今日出库"></CountFlopOne>
-      <!-- <div class="access-rate-box-top">
+      <div class="access-rate-box-top">
         <CountFlopOne :val="num2" sonTitle="工器具今日出库"></CountFlopOne>
-      </div> -->
+      </div>
     </div>
   </div>
 </template>
diff --git a/sgzb-screen/src/components/home/leftTwo.vue b/sgzb-screen/src/components/home/leftTwo.vue
index a60fbf44..80f5e7d1 100644
--- a/sgzb-screen/src/components/home/leftTwo.vue
+++ b/sgzb-screen/src/components/home/leftTwo.vue
@@ -5,9 +5,9 @@
         <h5 class="access-rate-box-title">退料数据</h5>
       </div>
       <CountFlopTwo :val="num" sonTitle="施工机具今日入库"></CountFlopTwo>
-      <!-- <div class="access-rate-box-top">
+      <div class="access-rate-box-top">
         <CountFlopTwo :val="num2" sonTitle="工器具今日退料"></CountFlopTwo>
-      </div> -->
+      </div>
     </div>
   </div>
 </template>
diff --git a/sgzb-screen/src/views/Home/index.vue b/sgzb-screen/src/views/Home/index.vue
index 14c8c0f8..8224a02a 100644
--- a/sgzb-screen/src/views/Home/index.vue
+++ b/sgzb-screen/src/views/Home/index.vue
@@ -8,8 +8,8 @@
       <div class="leftModuleBox">
         <LeftOne></LeftOne>
         <LeftTwo></LeftTwo>
-        <!-- <LeftThree></LeftThree> -->
-        <LeftFour></LeftFour>
+        <LeftThree></LeftThree>
+        <!-- <LeftFour></LeftFour> -->
         
       </div>
 
@@ -20,9 +20,9 @@
         </div>
         <div class="center-top">
           <!-- 宁夏地图 -->
-          <!-- <CountryMap></CountryMap>  -->
+          <CountryMap></CountryMap> 
           <!-- 重庆地图 -->
-          <Center3DMap></Center3DMap>
+          <!-- <Center3DMap></Center3DMap> -->
         </div>
         <div class="center-bottom">
           <CenterBottom></CenterBottom>
@@ -51,8 +51,8 @@
         <RightOne></RightOne>
         <rightTwo></rightTwo>
         <rightThree></rightThree>
-        <LeftThree></LeftThree>
-        <!-- <RightFour></RightFour> -->
+        <!-- <LeftThree></LeftThree> -->
+        <RightFour></RightFour>
       </div>
     </div>
     <!-- 获取天气 -->
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index 08809725..0595d5fe 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -45,7 +45,7 @@ module.exports = {
         // target: `http://10.40.92.8:8080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
-        target: `http://10.40.92.140:28080`, //帅
+        target: `http://10.40.92.138:28080`, //帅
         // target: `http://10.40.92.14:28080`, //福
 
         //******** 注意事项  ********* */

From e64b972cb65553d61dd8276c22d3e47c9f9b4df3 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Mon, 13 May 2024 12:06:42 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-screen/src/App.vue | 84 ++++++++++++++++++++---------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/sgzb-screen/src/App.vue b/sgzb-screen/src/App.vue
index a9f58121..cedb325d 100644
--- a/sgzb-screen/src/App.vue
+++ b/sgzb-screen/src/App.vue
@@ -21,14 +21,14 @@ export default {
 <style lang="less">
 .el-dialog {
   // 背景色透明
-  background: rgba(0, 0, 0, 0.5);
-  background-image: url('./assets/img/dialog/window.png');
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
+  background: rgba(0, 0, 0, 0.5) !important;
+  background-image: url('./assets/img/dialog/window.png') !important;
+  background-size: 100% 100% !important;
+  background-repeat: no-repeat !important;
   .el-dialog__headerbtn {
     width: 83px;
     height: 44px;
-    background-image: url('./assets/img/dialog/icon_close.png');
+    background-image: url('./assets/img/dialog/icon_close.png') !important;
     background-size: cover;
     // 去除原来的 x 按钮
     .el-dialog__close {
@@ -36,81 +36,81 @@ export default {
     }
   }
   .el-form-item__label {
-    color: #fff;
+    color: #fff !important;
   }
 
   .el-table th {
     // #253855  #30619B 背景色从上到下渐变
-    background: linear-gradient(to bottom, #2B313D, #3267A7);
-    color: #fff;
+    background: linear-gradient(to bottom, #2B313D, #3267A7) !important;
+    color: #fff !important;
     border-bottom:  1px solid #84FCFD !important;
   }
   .el-table tr {
-    background-color: #335684;
-    color: #fff;
+    background-color: #335684 !important;
+    color: #fff !important;
   }
   .el-table--striped .el-table__body tr.el-table__row--striped td {
-    background-color: #25447D;
-    color: #fff;
+    background-color: #25447D !important;
+    color: #fff !important;
   }
   .el-table td,.building-top .el-table th.is-leaf {
-    border-bottom:  1px solid #6983A5;
+    border-bottom:  1px solid #6983A5 !important;
   }
   .el-table::before{
-    border-bottom:  1px solid #6983A5;
-    background-color: #6983A5;
-    height: 1px;
+    border-bottom:  1px solid #6983A5 !important;
+    background-color: #6983A5 !important;
+    height: 1px !important;
   }
   .el-table--enable-row-hover .el-table__body tr:hover>td {
-    background-color: #6983A5;
+    background-color: #6983A5 !important;
   }
   .el-pagination__total {
-    color: #E1E3E6;
+    color: #E1E3E6 !important;
   }
   .el-pagination__jump {
-    color: #E1E3E6;
+    color: #E1E3E6 !important;
   }
   .el-input__inner {
-    background-color: transparent;
-    border: 1px solid #77E2E7;
-    color: #E1E3E6;
+    background-color: transparent !important;
+    border: 1px solid #77E2E7 !important;
+    color: #E1E3E6 !important;
   }
   .el-pagination__sizes .el-input .el-input__inner {
-    color: #E3E4E7;
-    border: 1px solid #E3E4E7;
+    color: #E3E4E7 !important;
+    border: 1px solid #E3E4E7 !important;
   }
   .el-pagination__editor.el-input .el-input__inner {
-    color: #E3E4E7;
-    border: 1px solid #E3E4E7;
+    color: #E3E4E7 !important;
+    border: 1px solid #E3E4E7 !important;
   }
   .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li {
-    color: #E3E4E7;
-    border: 1px solid #E3E4E7;
-    background-color: transparent;
+    color: #E3E4E7 !important;
+    border: 1px solid #E3E4E7 !important;
+    background-color: transparent !important;
   }
   .el-pagination.is-background .btn-next {
-    color: #E3E4E7;
-    border: 1px solid #E3E4E7;
-    background-color: transparent;
+    color: #E3E4E7 !important;
+    border: 1px solid #E3E4E7 !important;
+    background-color: transparent !important;
   }
   .el-pagination.is-background .el-pager li:not(.disabled).active {
-    background-color: #98F4FB;
-    color: #000;
+    background-color: #98F4FB !important;
+    color: #000 !important;
   }
   .el-button--primary {
-    background-color: #84FCFD;
-    border: #84FCFD;
-    color: #285050;
+    background-color: #84FCFD !important;
+    border: #84FCFD !important;
+    color: #285050 !important;
   }
   .el-button--default {
-    background-color: transparent;
-    border: 1px solid #84FCFD;
-    color: #D5D6DA;
+    background-color: transparent !important;
+    border: 1px solid #84FCFD !important;
+    color: #D5D6DA !important;
   }
   .el-table__empty-block {
-    background-color: #335684;
+    background-color: #335684 !important;
     .el-table__empty-text {
-      color: #D5D6DA;
+      color: #D5D6DA !important;
     }
   }
 }

From 4e397af9595aa2d3a8e5c718a1680a27edb1fa8a Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Mon, 13 May 2024 13:48:05 +0800
Subject: [PATCH 4/5] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-screen/src/components/home/countFlopOne.vue    | 13 ++++++++++---
 sgzb-screen/src/components/home/countFlopTwo.vue    | 13 ++++++++++---
 .../src/components/home/getMaterialsDialog.vue      |  1 +
 sgzb-screen/src/views/Home/index.vue                |  4 ++--
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/sgzb-screen/src/components/home/countFlopOne.vue b/sgzb-screen/src/components/home/countFlopOne.vue
index f4d4a10d..0b0b5dd0 100644
--- a/sgzb-screen/src/components/home/countFlopOne.vue
+++ b/sgzb-screen/src/components/home/countFlopOne.vue
@@ -40,7 +40,8 @@ export default {
     return {
       value: [],
       numberList: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
-      compKey: 0
+      compKey: 0,
+      maType: ''
     };
   },
   props: ["val", "suffix", 'sonTitle'],
@@ -52,12 +53,18 @@ export default {
   },
   mounted() {
     this.value = this.val.toString().split("");
+    this.$eventBus.$on('maType', (maType) => {
+      this.maType = maType
+    });
+  },
+  destroyed() {
+    this.$eventBus.$off('maType');
   },
   methods: {
-    handleClick(val) {
+    handleClick() {
       const params = {
         open: true,
-        maType: val
+        maType: this.maType
       }
       this.$refs.materialsDialog.setOpen(params);
     }
diff --git a/sgzb-screen/src/components/home/countFlopTwo.vue b/sgzb-screen/src/components/home/countFlopTwo.vue
index 3d2d46df..17a69e69 100644
--- a/sgzb-screen/src/components/home/countFlopTwo.vue
+++ b/sgzb-screen/src/components/home/countFlopTwo.vue
@@ -41,7 +41,8 @@ export default {
     return {
       value: [],
       numberList: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
-      compKey: 0
+      compKey: 0,
+      maType: ''
     };
   },
   props: ["val", "suffix", 'sonTitle'],
@@ -53,12 +54,18 @@ export default {
   },
   mounted() {
     this.value = this.val.toString().split("");
+    this.$eventBus.$on('maType', (maType) => {
+      this.maType = maType
+    });
+  },
+  destroyed() {
+    this.$eventBus.$off('maType');
   },
   methods: {
-    handleClick(val) {
+    handleClick() {
       const params = {
         open: true,
-        maType: val
+        maType: this.maType
       }
       this.$refs.returnMaterialsDialog.setOpen(params);
     }
diff --git a/sgzb-screen/src/components/home/getMaterialsDialog.vue b/sgzb-screen/src/components/home/getMaterialsDialog.vue
index 972868d8..21c5e4a4 100644
--- a/sgzb-screen/src/components/home/getMaterialsDialog.vue
+++ b/sgzb-screen/src/components/home/getMaterialsDialog.vue
@@ -166,6 +166,7 @@ export default {
     setOpen(params) {
       this.open = params.open
       this.maType = params.maType
+      console.log('🚀 ~ setOpen ~ this.maType:', this.maType);
       this.tableData = []
       this.total = 0
       setTimeout(() => {
diff --git a/sgzb-screen/src/views/Home/index.vue b/sgzb-screen/src/views/Home/index.vue
index 8224a02a..e45761cd 100644
--- a/sgzb-screen/src/views/Home/index.vue
+++ b/sgzb-screen/src/views/Home/index.vue
@@ -27,7 +27,7 @@
         <div class="center-bottom">
           <CenterBottom></CenterBottom>
         </div>
-        <!-- <div class="buttom-box">
+        <div class="buttom-box">
           <div class="buttonTop">
             <div
               :class="maType == 1 ? 'on' : ''"
@@ -44,7 +44,7 @@
               工器具
             </div>
           </div>
-        </div> -->
+        </div>
       </div>
       <!-- 右侧数据模块列表 -->
       <div class="rightModuleBox">

From 0ce4cc37bebaacfa4a9031e965ba98ee7e1122b4 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Mon, 13 May 2024 14:13:07 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=81=E5=A4=8F=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-screen/config/index.js     | 1 +
 sgzb-ui/src/views/dashboard.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sgzb-screen/config/index.js b/sgzb-screen/config/index.js
index f8cc8ab6..374c9d64 100644
--- a/sgzb-screen/config/index.js
+++ b/sgzb-screen/config/index.js
@@ -22,6 +22,7 @@ module.exports = {
         '/screen': {
           // target: 'http://112.29.103.165:21626',//重庆
           // target: 'http://192.168.0.14:21624',//测试
+          // target: 'http://112.29.103.165:21624/', //宁夏
           target: 'http://10.40.92.138:28080',
           changeOrigin: true,
           // secure: true, //如果是https接口，需要配置这个参数
diff --git a/sgzb-ui/src/views/dashboard.vue b/sgzb-ui/src/views/dashboard.vue
index 2248c53d..ce54639b 100644
--- a/sgzb-ui/src/views/dashboard.vue
+++ b/sgzb-ui/src/views/dashboard.vue
@@ -17,6 +17,7 @@
     methods: {
         openNewWindow() {
             window.open('http://192.168.0.14:21624/index01.html?token='+localStorage.getItem('token'), '_blank');
+            // window.open('http://112.29.103.165:21624/index01.html?token='+localStorage.getItem('token'), '_blank'); // 产线
         }
     }
   };