From c39af50010d60d3192e76c31a6c2bddab2312c57 Mon Sep 17 00:00:00 2001
From: Jack <1638169491@qq.com>
Date: Sat, 13 Aug 2022 11:01:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86)=EF=BC=9A=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E5=8D=B3=E6=97=B6=E6=95=B4=E6=94=B9=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectAdmin/jlw/qualityManage/rightTop.vue | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/views/projectAdmin/jlw/qualityManage/rightTop.vue b/src/views/projectAdmin/jlw/qualityManage/rightTop.vue
index 3812abde..48b8d528 100644
--- a/src/views/projectAdmin/jlw/qualityManage/rightTop.vue
+++ b/src/views/projectAdmin/jlw/qualityManage/rightTop.vue
@@ -14,7 +14,7 @@
       </div>
       <div class="chart">
         <JRingChart
-          :title="{ text: total.ratioNum, subTitle: '即时整改问题率' }"
+          :title="{ text: total.ratioNum, subTitle: '即时整改率' }"
           :color="['#557DEE', '#43D7B5']"
           :data="[
             { value: 1, name: '' },
@@ -43,24 +43,23 @@ export default {
         totalNum: 0,
         notCloseNum: 0,
         closeNum: 0,
-        rectificationNum:0,
-        ratioNum:0,
-      },
-      
+        rectificationNum: 0,
+        ratioNum: 0
+      }
     }
   },
-  created(){
+  created() {
     this.getData()
   },
-  methods:{
-   //获取数据
+  methods: {
+    //获取数据
     getData() {
       let data = {
         projectSn: this.projectSn
       }
       selectQualityStatisticsApi(data).then(res => {
         this.total = res.result.total
-        let ratio = this.total.totalNum ? ((this.total.closeNum / this.total.totalNum) * 100).toFixed(2) : 0 
+        let ratio = this.total.totalNum ? ((this.total.closeNum / this.total.totalNum) * 100).toFixed(2) : 0
         this.total.ratioNum = ratio + '%'
       })
     }

From 343ecebd3db69eae6b15bc345fbcb1691939ff4e Mon Sep 17 00:00:00 2001
From: Jack <1638169491@qq.com>
Date: Sat, 13 Aug 2022 11:53:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=B7=A5=E5=9C=B0)=EF=BC=9A=E5=A1=94?=
 =?UTF-8?q?=E5=90=8A=E8=AE=BE=E5=A4=87=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectAdmin/jlw/components/CountList.vue | 26 ++++---
 .../projectAdmin/jlw/digitalSite/leftTop.vue  | 71 +++++++------------
 2 files changed, 44 insertions(+), 53 deletions(-)

diff --git a/src/views/projectAdmin/jlw/components/CountList.vue b/src/views/projectAdmin/jlw/components/CountList.vue
index b19fce4c..598f9115 100644
--- a/src/views/projectAdmin/jlw/components/CountList.vue
+++ b/src/views/projectAdmin/jlw/components/CountList.vue
@@ -17,15 +17,17 @@
       </div>
     </div>
     <div class="list">
-      <div class="list-item" :class="i === 2 ? 'offline' : 'online'" v-for="i in 3" :key="i">
-        <div class="status">在线</div>
-        <div class="label">1号塔吊</div>
-        <div class="num" v-if="type === 'waring'">今日报警：2</div>
-        <div class="persons" v-if="type === 'persons'">
-          <div class="person">进场人数：67</div>
-          <div class="person">出场人数：67</div>
+      <vue-scroll>
+        <div class="list-item" :class="item.devonline == '0' ? 'online' : 'offline'" v-for="(item, i) in list" :key="i">
+          <div class="status">{{ item.devonline == '0' ? '在线' : '离线' }}</div>
+          <div class="label">{{ item.devName }}</div>
+          <div class="num" v-if="type === 'waring'">今日报警：{{ item.alarmNum }}</div>
+          <div class="persons" v-if="type === 'persons'">
+            <div class="person">进场人数：67</div>
+            <div class="person">出场人数：67</div>
+          </div>
         </div>
-      </div>
+      </vue-scroll>
     </div>
   </div>
 </template>
@@ -69,6 +71,7 @@ export default {
 
 <style lang="less" scoped>
 .h-count-list {
+  height: 100%;
   .counts {
     padding: 10px 26px 20px;
     display: flex;
@@ -85,9 +88,15 @@ export default {
         &.towercrane {
           background-image: url('~@/views/projectAdmin/dataBoard/projectHuScreen/assets/images/icons/i-tower-crane.png');
         }
+        &.towercrane2 {
+          background-image: url('~@/views/projectAdmin/dataBoard/projectHuScreen/assets/images/icons/i-tower-crane2.png');
+        }
         &.warring {
           background-image: url('~@/views/projectAdmin/dataBoard/projectHuScreen/assets/images/icons/i-warring.png');
         }
+        &.warring2 {
+          background-image: url('~@/views/projectAdmin/dataBoard/projectHuScreen/assets/images/icons/i-warring2.png');
+        }
         &.facegate {
           background-image: url('~@/views/projectAdmin/dataBoard/projectHuScreen/assets/images/icons/i-face-gate.png');
         }
@@ -109,6 +118,7 @@ export default {
   }
 
   .list {
+    height: calc(100% - 90px);
     padding: 0 10px;
     .list-item {
       margin-bottom: 6px;
diff --git a/src/views/projectAdmin/jlw/digitalSite/leftTop.vue b/src/views/projectAdmin/jlw/digitalSite/leftTop.vue
index 5e55589f..7130fdce 100644
--- a/src/views/projectAdmin/jlw/digitalSite/leftTop.vue
+++ b/src/views/projectAdmin/jlw/digitalSite/leftTop.vue
@@ -1,6 +1,7 @@
 <template>
   <Card :title="title">
-    <DeviceCard
+    <!-- 无用功 -->
+    <!-- <DeviceCard
       :leftCount="{ value: totalTowerDev, label: '塔吊设备数', img: 'towercrane2' }"
       :rightCount="{ value: totalDangerTowerDev, label: '今日报警数', img: 'warring2' }"
     >
@@ -9,20 +10,28 @@
         <div class="item">离线</div>
       </div>
       <JBarChart :tooltip="{}" :xData="xData" :yData="yData" />
-    </DeviceCard>
+    </DeviceCard> -->
+
+    <CountList
+      :allCount="{ value: totalTowerDev, label: '塔吊总数', img: 'towercrane2' }"
+      :todayCount="{ value: totalDangerTowerDev, label: '今日报警总数', img: 'warring2' }"
+      :list="towerList"
+    />
   </Card>
 </template>
 
 <script>
-import Card from "../components/Card.vue";
-import DeviceCard from "./components/DeviceCard.vue";
-import JBarChart from "../jChart/bar/JBarChart.vue";
+import Card from '../components/Card.vue'
+// import DeviceCard from './components/DeviceCard.vue'
+// import JBarChart from '../jChart/bar/JBarChart.vue'
+import CountList from '../components/CountList.vue'
 export default {
-  components: { Card, DeviceCard, JBarChart },
+  // components: { Card, DeviceCard, JBarChart },
+  components: { Card, CountList },
   props: {
     title: {
       type: String,
-      default: ""
+      default: ''
     },
     towerList: {
       type: Array,
@@ -30,48 +39,20 @@ export default {
     },
     totalTowerDev: {
       type: Number,
-      default: ""
+      default: ''
     },
     totalDangerTowerDev: {
       type: Number,
-      default: ""
+      default: ''
     }
-  },
-  data() {
-    const yData = [23, 44, 63, 12, 45, 78, 34, 67].map((value, i) => {
-      if (i > 4 && i < 7) {
-        return {
-          name: "离线",
-          value,
-          itemStyle: { color: "#FF6C7F" }
-        };
-      } else {
-        return {
-          name: "报警数",
-          value,
-          itemStyle: { color: "#3CABFD" }
-        };
-      }
-    });
-    return {
-      xData: ["1号", "2号", "3号", "4号", "5号", "6号", "7号", "8号"],
-      yData
-    };
-  },
-  mounted() {
-    // console.log("------", this.towerList, this.totalTowerDev);
-    // 备注：此处xy轴数据没有处理 报警数很多为0 无法渲染
-    //var datax = [],datay =[]
-    //this.towerList.forEach((item)=>{
-    // datax.push(item.devName)
-    // datay.push(item.alarmNum)
-    // if(item.deviceState == 1){
-    // }
-    //})
-    // this.xData = datax
-    // console.log('塔吊设备--------', this.xData)
   }
-};
+  // data() {
+  //   return {
+  //     xData: [],
+  //     yData: []
+  //   }
+  // }
+}
 </script>
 
 <style lang="less" scoped>
@@ -87,7 +68,7 @@ export default {
     align-items: center;
     &::before {
       margin-right: 8px;
-      content: "";
+      content: '';
       width: 16px;
       height: 6px;
       border-radius: 2px;