Merge remote-tracking branch 'origin/240806_pro_release' into 240806_pro_release

src/module/databoard/assets/index.css

@@ -65,6 +65,12 @@
   display: flex;
   padding: 1rem;
 }
+.full_page {
+  height: 100%;
+  justify-content: space-around;
+  display: flex;
+  padding: 1rem;
+}
 
 .content {
   float: left;

src/module/databoard/databoard/safe-quality.vue

+<template>
+  <div class="main">
+    <div class="full_page">
+      <!-- 左-->
+      <div class="trade_left">
+      <div style="height: 37%;" >
+        <display-board  style="display: flex; justify-content: space-between; height: 98%;"  title="安全">
+          <winners-list style="height: 96%;overflow: auto;" :mouseHand="true" @click.native="goArBar" id="safe_list" :rows="arSafeList"/>
+        </display-board>
+      </div>
+      <div style="height: 37%;" >
+        <display-board  style="display: flex; justify-content: space-between; height: 98%;"  title="质量">
+          <winners-list style="height: 96%;overflow: auto;" :mouseHand="true" @click.native="goArBar" id="quality_list" :rows="arQualityList"/>
+        </display-board>
+      </div>
+        <div style="height: 26%;" >
+          <display-board  style="display: flex; justify-content: space-between; height: 98%;"  title="人员情况表">
+            <div class="bar">
+              <div ref="bar"></div>
+            </div>
+          </display-board>
+        </div>
+      </div>
+      <!--中-->
+      <display-board class="trade_middle" >
+        <div class="trade_middle" style="border: none;box-shadow: none;">
+          <div style="display: flex; justify-content: space-between; height: 80%;">
+
+          </div>
+          <div style="display: flex; justify-content: space-between; height: 20%;">
+          </div>
+        </div>
+      </display-board>
+      <!-- 右-->
+      <div class="trade_right">
+        <div style="height: 33%;" >
+          <display-board  style="display: flex; justify-content: space-between; height: 98%;"  title="汽运">
+
+          </display-board>
+        </div>
+        <div style="height: 33%;" >
+          <display-board  style="display: flex; justify-content: space-between; height: 98%;"  title="水运">
+
+          </display-board>
+        </div>
+        <div style="height: 34%;" >
+          <display-board  style="display: flex; justify-content: space-between; height: 98%;"  title="铁运">
+
+          </display-board>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import DisplayBoard from "../components/container/display-board.vue";
+import WinnersList from "../components/card/winners-list.vue";
+import TitleContentMark from "../components/layout/title-content-mark.vue";
+export default {
+  name: "SafeQuality",
+  components: {
+    TitleContentMark,
+    DisplayBoard,
+    WinnersList
+  },
+  data() {
+      return {}
+  },
+  methods: {
+
+    refreshData() {
+        this.getPeopleInfos();
+    },
+    getPeopleInfos(){
+
+      // var seriesBar = [];
+      // seriesBar.push(adapterSeriesDataBar(null, "在编", [10,20]));
+      // seriesBar.push(adapterSeriesDataBar(null, "出勤", [15]));
+      // seriesBar.push(adapterSeriesDataBar(null, "请假", [8]));
+      //
+      // this.peopleInfoOption.series = seriesBar;
+      // let barDom = this.$refs.bar;
+      // let chart=echarts.init(barDom);
+      // chart.setOption(this.peopleInfoOption);
+
+    }
+  },
+  mounted() {
+    this.refreshData();
+  },
+  beforeDestroy() {
+
+  },
+  watch:{
+    countDown(n,o){
+      if (n === 1){
+        this.refreshData();
+      }
+    },
+  },
+  props:{
+    countDown:{
+      type: Number
+    }
+  }
+};
+</script>
+
+<style scoped>
+#ar_company_list:hover {
+  background-color: #19EBFF10;
+  transform: scale(101%);
+}
+</style>

src/module/index/router/index_router.js

@@ -13,6 +13,7 @@ import TargetAchievement from "../../databoard/databoard/target-achievement.vue"
 import DepartmentShipment from "../../databoard/databoard/department-shipment.vue";
 import ElementUI from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';
+import SafeQuality from "../../databoard/databoard/safe-quality";
 
 
 Vue.use(Router)
@@ -84,6 +85,11 @@ export default new Router({
       path: '/department-shipment',
       name: 'DepartmentShipment',
       component: DepartmentShipment
+    },
+    {
+      path: '/safe-quality',
+      name: 'safeQuality',
+      component: SafeQuality
     }
   ]
 })