xiao547607 5 rokov pred
rodič
commit
9f4687f565
3 zmenil súbory, kde vykonal 79 pridanie a 58 odobranie
  1. 2 1
      .env.development
  2. 11 1
      src/api/business/workAttendance.js
  3. 66 56
      src/views/Home.vue

+ 2 - 1
.env.development

@@ -1,4 +1,5 @@
 #VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
-VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-community-server
+#VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-community-server
+VUE_APP_BACKEND_URL=http://192.168.33.26:8080/smart-community-server
 #VUE_APP_BACKEND_URL=http://zldb.xiaoxinda.com:8088/smart-community-server
 #VUE_APP_BACKEND_URL=http://kr6zr7.natappfree.cc/smart-community-server/

+ 11 - 1
src/api/business/workAttendance.js

@@ -9,6 +9,16 @@ function exportXls(formData){
   return request.post(constant.serverUrl + "/business/workAttendance/exportXls", formData);
 }
 
+function getFirstData(){
+  return request.get(constant.serverUrl + "/home/getFirstData");
+}
+
+function getFirstExcelData(){
+  return request.get(constant.serverUrl + "/home/getFirstExcelData");
+}
+
+
+
 export default {
-  statList,exportXls
+  statList,exportXls,getFirstData,getFirstExcelData
 }

+ 66 - 56
src/views/Home.vue

@@ -12,7 +12,7 @@
         <div class="xtsyqk_fyy_60">
           <i class="el-icon-s-shop"></i>
           <span style="color:#01447D">
-            <b v-html="4"></b>
+            <b v-text="companyNum"></b>
           </span>
           <span>总公司数量</span>
         </div>
@@ -23,7 +23,7 @@
         <div class="xtsyqk_fyy_60">
           <i class="el-icon-s-custom"></i>
           <span style="color:#01447D">
-            <b v-html="861"></b>
+            <b v-text="personNum"></b>
           </span>
           <span>总人数量</span>
         </div>
@@ -34,7 +34,7 @@
         <div class="xtsyqk_fyy_60">
           <i class="el-icon-sunny"></i>
           <span style="color:#01447D">
-            <b v-html="3"></b>
+            <b v-text="normalDays"></b>
           </span>
           <span>累积无异常天数</span>
         </div>
@@ -45,7 +45,8 @@
         <div class="xtsyqk_fyy_60">
           <i class="el-icon-search"></i>
           <span style="color:#01447D">
-            <b v-html="'4678 / 5000'"></b>
+            <b v-text="dayCheckNum"></b>/
+            <b v-text="totalCheckNum"></b>
           </span>
           <span>当日检测人次 / 累计检测人次</span>
         </div>
@@ -56,7 +57,8 @@
         <div class="xtsyqk_fyy_60">
           <i class="el-icon-warning-outline"></i>
           <span style="color:#01447D">
-            <b v-html="'5 / 25'"></b>
+            <b v-text="dayAbnormalNum"></b>/
+            <b v-text="totalAbnormalNum"></b>
           </span>
           <span>当日异常人数 / 累计异常人数</span>
         </div>
@@ -69,14 +71,23 @@
 </template>
 <script>
 import Constant from "@/constant";
+import workAttendanceApi from "@/api/business/workAttendance";
 // @ is an alias to /src
 export default {
   name: "home",
   data() {
-    return { yAxisMaxNum: "5000" };
-  },
-  mounted: function() {
-    this.everyDayMeasuringView();
+    return {
+      companyNum: "0",
+      totalAbnormalNum: "0",
+      dayAbnormalNum: "0",
+      personNum: "0",
+      totalCheckNum: "0",
+      dayCheckNum: "0",
+      normalDays: "0",
+      abnormalNum: [],
+      normalNum: [],
+      day: []
+    };
   },
   methods: {
     everyDayMeasuringView() {
@@ -85,6 +96,7 @@ export default {
       let myChart = this.$echarts.init(
         document.getElementById("everyDayMeasuringDiv")
       );
+
       // 绘制图表
       myChart.setOption({
         title: {
@@ -110,44 +122,16 @@ export default {
         xAxis: {
           type: "category",
           boundaryGap: false,
-          data: [
-            "1",
-            "2",
-            "3",
-            "4",
-            "5",
-            "6",
-            "7",
-            "8",
-            "9",
-            "10",
-            "11",
-            "12",
-            "13",
-            "14",
-            "15",
-            "16",
-            "17",
-            "18",
-            "19",
-            "20",
-            "21",
-            "22",
-            "23",
-            "24",
-            "25",
-            "26",
-            "27",
-            "28",
-            "29",
-            "30",
-            "31"
-          ]
+          axisLabel: {
+            interval: 0,
+            rotate: 40
+          },
+          data: this.day
         },
         yAxis: {
           type: "value",
-          min: 0
-          //name:"人数"
+          min: 0,
+          name:"人数"
           //max: this.yAxisMaxNum
         },
         color: ["green", "red"],
@@ -174,26 +158,52 @@ export default {
             name: "体温正常",
             type: "line",
             //stack: "总量",
-            data: [
-              45,66,45,66,45,66,45,66,45,66,
-              45,66,45,66,45,66,45,66,45,66,
-              45,66,45,66,45,66,45,66,45,66,
-              45
-            ]
+            data: this.normalNum
           },
           {
             name: "体温异常",
             type: "line",
-            data: [
-              0,0,0,0,0,0,0,0,0,0,
-              0,0,0,0,0,0,0,0,0,0,
-              0,0,0,0,0,0,0,0,0,0,
-              0
-            ]
+            data: this.abnormalNum
           }
         ]
       });
     }
+  },
+  async mounted() {
+    var self = this;
+    workAttendanceApi.getFirstData().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyNum = jsonData.data.companyNum;
+        self.totalAbnormalNum = jsonData.data.totalAbnormalNum;
+        self.dayAbnormalNum = jsonData.data.dayAbnormalNum;
+        self.personNum = jsonData.data.personNum;
+        self.totalCheckNum = jsonData.data.totalCheckNum;
+        self.dayCheckNum = jsonData.data.dayCheckNum;
+        self.normalDays = jsonData.data.normalDays;
+      }
+      // companyNum: 27  总公司数量
+      // totalAbnormalNum: 1  总异常数
+      // dayAbnormalNum: 0  单日异常数
+      // personNum: 1364 总人数
+      // totalCheckNum: 2141 累计检测人次
+      // dayCheckNum: 10当日检测人次
+      // normalDays: 4 累积无异常天数
+    });
+
+    await workAttendanceApi.getFirstExcelData().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        console.log(jsonData);
+        self.abnormalNum = jsonData.data.abnormalNum;
+        self.normalNum = jsonData.data.normalNum;
+        self.day = jsonData.data.day;
+      }
+      //abnormalNum
+      //normalNum
+      //day
+    });
+    this.everyDayMeasuringView();
   }
 };
 </script>