tianyabing %!s(int64=2) %!d(string=hai) anos
pai
achega
a88f572d82

+ 5 - 0
src/api/work/apiWorkMeeting.js

@@ -14,8 +14,13 @@ const getMeetingRecords = (timeRange) => {
     return Request.post('/meeting/getConferenceRoomInfo', timeRange)
 }
 
+const getMeetingHours = (param) => {
+    return Request.post('/meeting/getMeetingHours', param)
+}
+
 export default {
     getCoreData,
     getMeetingCostTrend,
     getMeetingRecords,
+    getMeetingHours,
 }

+ 0 - 1
src/components/common/dialog/selectUserDialog.vue

@@ -119,7 +119,6 @@ export default {
       }
     },
     addUser(val) {
-      //console.log(val)
     },
     onSelectChange(keys) {
       this.selectedRowKeys = keys

+ 0 - 1
src/components/common/timeRange.vue

@@ -30,7 +30,6 @@ export default {
     this.$nextTick(() => {
       if (this.timeRange) {
         if (this.timeRange.startDate) {
-          console.log("this.timeRange.startDate", this.timeRange.startDate);
           this.defaultStartTime = this.$moment(
             this.timeRange.startDate,
             this.timeFormat

+ 0 - 2
src/components/life/restaurant/components/lifeRestConsumeChart.vue

@@ -193,7 +193,6 @@ export default {
           "晚餐单价":false,
         }
       } else if (currentTime.isBetween(noonStart, noonEnd)) {
-        console.log("现在是中午");
         this.option.legend.selected = {
           "早餐人数":false,
           "晚餐人数":false,
@@ -201,7 +200,6 @@ export default {
           "晚餐单价":false,
         }
       } else if (currentTime.isBetween(eveningStart, eveningEnd)) {
-        console.log("现在是晚上");
         this.option.legend.selected = {
           "早餐人数":false,
           "午餐人数":false,

+ 0 - 1
src/components/report/table/reportTableSecurity.vue

@@ -466,7 +466,6 @@ export default {
       });
     },
     exportFunc1() {
-      console.log("打印报表");
       const data = [
         ["姓名", "年龄", "性别", "毕业院校"],
         ["张三", 18, "男", "清华大学"],

+ 0 - 1
src/components/report/table/reportTableWork.vue

@@ -508,7 +508,6 @@ export default {
       });
     },
     exportFunc1() {
-      console.log("打印报表");
       const data = [
         ["姓名", "年龄", "性别", "毕业院校"],
         ["张三", 18, "男", "清华大学"],

+ 0 - 1
src/components/scene/access/sceneAccessAction.vue

@@ -451,7 +451,6 @@ export default {
       this.$message.success(msg)
     },
     del(item) {
-      console.log(item)
       let index = this.tableData.indexOf(item);
       if (index>-1) {
         this.tableData.splice(index, 1)

+ 0 - 2
src/components/scene/energy/sceneEnergyAircondition/airconditioningCard.vue

@@ -820,7 +820,6 @@ export default {
         app.floors.forEach(item => {
           if (item.devices) {
             item.devices.forEach(i => {
-              console.log(that.activeList.indexOf(i.id));
               if (!that.activeList || that.activeList.length == 0 || that.activeList.indexOf(i.id) != -1) {
                 i.online = false;
               }
@@ -839,7 +838,6 @@ export default {
         app.floors.forEach(item => {
           if (item.devices) {
             item.devices.forEach(i => {
-              console.log(that.activeList.indexOf(i.id));
               if (!that.activeList || that.activeList.length == 0 || that.activeList.indexOf(i.id) != -1) {
                 i.online = true;
               }

+ 0 - 2
src/components/scene/meeting/chart/meetingTimeCharts.vue

@@ -119,12 +119,10 @@ export default {
     },
     getData() {
       this.loading = true;
-      console.log(this.queryData.timeRange, "会议开始和结束时间");
       return apiSceneMeeting
         .getMeetingMinutes(this.queryData.timeRange)
         .then((res) => {
           let data = this.$util.dataUtil.covertDataToEcharts(res, ["minutes"]);
-          // console.log(data, "会议时间");
           this.$util.dataUtil.refreshEchartsData(this.chart, this.option, data);
           this.loading = false;
         })

+ 112 - 122
src/components/scene/meeting/chart/meetingTimeFloorCharts.vue

@@ -1,138 +1,128 @@
 <template>
-  <div class="myChart" ref="myChart" :style="{ height: height + 'px' }"></div>
+    <div class="myChart" ref="myChart" :style="{ height: height + 'px' }"></div>
 </template>
 
 <script>
 /**
  * 楼层选择具体楼层时展示的图表
  */
-import apiSceneMeeting from "@/api/scene/meeting/apiSceneMeeting";
+import apiWorkMeeting from "@/api/work/apiWorkMeeting";
 
 export default {
-  data() {
-    return {
-      option: {
-        color: ["#80B2FF", "#FFDF80"],
-        grid: {
-          left: "2%", //默认10%
-          right: "2%", //默认10%
-          bottom: "0%", //默认60
-          top: "15%",
-          containLabel: true,
-          //grid区域是否包含坐标轴的刻度标签
-        },
-        legend: {
-          align: "left",
-          top: "5%",
-          //itemWidth: 30,
-          //itemHeight: 10,
-          formatter: (name) => {
-            return `{a|${name}} `;
-          },
-        },
-        xAxis: {
-          type: "category",
-          data: [
-            "4月1日",
-            "4月2日",
-            "4月3日",
-            "4月4日",
-            "4月5日",
-            "4月6日",
-            "4月7日",
-            "4月8日",
-            "4月9日",
-            "4月10日",
-            "4月11日",
-            "4月12日",
-          ],
-        },
-        yAxis: [
-          {
-            name: "使用时长(h)",
-            type: "value",
-            nameTextStyle: {
-              padding: [0, 20, 0, 0],
-            },
-            splitLine: {
-              show: true,
-              lineStyle: {
-                color: "#e8e8e8",
-              },
-            },
-            axisLine: {
-              show: true,
-              lineStyle: {
-                color: "#233653",
-              },
-            },
-          },
-        ],
-        tooltip: {
-          trigger: "axis",
-          axisPointer: {
-            type: "shadow",
-          },
-          textStyle: {
-            color: "#fff",
-            align: "left",
-            fontSize: 14,
-          },
-          axisLine: {
-            //x坐标轴轴线
-            show: true,
-            lineStyle: {
-              //x坐标轴轴线样式
-              color: "#000", //'#ccc' | 'rgb(128, 128, 128)' | 'rgba(128, 128, 128, 0.5)',设置标签颜色
+    data() {
+        return {
+            seriesObj: {
+                data: [],
+                type: "bar",
+                stack: "A",
+                barWidth: "30px",
+                backgroundStyle: {
+                    color: "rgba(180, 180, 180, 0.2)",
+                },
             },
-          },
-          backgroundColor: "rgba(0,0,0,0.8)",
-        },
-        series: [
-          {
-            data: [32, 39, 54, 55, 101, 76, 60, 42, 36, 57, 40, 85],
-            type: "bar",
-            stack: "A",
-            barWidth: "30px",
-            backgroundStyle: {
-              color: "rgba(180, 180, 180, 0.2)",
+            option: {
+                color: ["#80B2FF", "#FFDF80"],
+                grid: {
+                    left: '2%', //默认10%
+                    right: '3%', //默认10%
+                    bottom: '20px', //默认60
+                    top: '60px',
+                    containLabel: true
+                    //grid区域是否包含坐标轴的刻度标签
+                },
+                legend: {
+
+                },
+                xAxis: {
+                    type: "category",
+                    data: [],
+                },
+                yAxis: [
+                    {
+                        name: "使用时长(h)",
+                        type: "value",
+                        nameTextStyle: {
+                            padding: [0, 20, 0, 0],
+                        },
+                        splitLine: {
+                            show: true,
+                            lineStyle: {
+                                color: "#e8e8e8",
+                            },
+                        },
+                        axisLine: {
+                            show: true,
+                            lineStyle: {
+                                color: "#233653",
+                            },
+                        },
+                    },
+                ],
+                dataZoom: this.$constant.ECHARTS_OPTION_DATAZOOM,
+                tooltip: {
+                    trigger: "axis",
+                    axisPointer: {
+                        type: "shadow",
+                    },
+                    textStyle: {
+                        color: "#fff",
+                        align: "left",
+                        fontSize: 14,
+                    },
+                    axisLine: {
+                        //x坐标轴轴线
+                        show: true,
+                        lineStyle: {
+                            //x坐标轴轴线样式
+                            color: "#000", //'#ccc' | 'rgb(128, 128, 128)' | 'rgba(128, 128, 128, 0.5)',设置标签颜色
+                        },
+                    },
+                    backgroundColor: "rgba(0,0,0,0.8)",
+                },
+                series: [],
             },
-          },
-        ],
-      },
-    };
-  },
-  props: {
-    height: Number,
-    queryData: Object,
-  },
-  mounted() {
-    this.init();
-  },
-  methods: {
-    init() {
-      let chart = this.$echarts.init(this.$refs.myChart);
-      this.chart = chart;
-      this.$util.chartsResize(this.chart);
-      chart.setOption(this.option);
-      this.$store.loadingStore().loadingWithApi(this.getData());
+        };
+    },
+    props: {
+        height: Number,
+        queryData: Object,
     },
-    getData() {
-      this.loading = true;
-      console.log(this.queryData.timeRange, "会议开始和结束时间");
-      return apiSceneMeeting
-        .getMeetingMinutes(this.queryData.timeRange)
-        .then((res) => {
-          let data = this.$util.dataUtil.covertDataToEcharts(res, ["minutes"]);
-          console.log(data, "会议时间");
-          this.$util.dataUtil.refreshEchartsData(this.chart, this.option, data);
-          this.loading = false;
-        })
-        .catch((err) => {
-          this.loading = false;
-        });
+    mounted() {
+        this.init();
+    },
+    methods: {
+        init() {
+            let chart = this.$echarts.init(this.$refs.myChart);
+            this.chart = chart;
+            this.$util.chartsResize(this.chart);
+            chart.setOption(this.option);
+            this.$store.loadingStore().loadingWithApi(this.getData());
+        },
+        getData() {
+            this.loading = true;
+            return apiWorkMeeting
+                .getMeetingHours(this.queryData)
+                .then((res) => {
+                    let arr = [];
+                    if (res.length > 0) {
+                        this.option.series = []
+                        let o = res[0].jsonObject
+                        for (const oKey in o) {
+                            arr.push(oKey);
+                            let seriesObj = JSON.parse(JSON.stringify(this.seriesObj));
+                            seriesObj['name'] = oKey;
+                            this.option.series.push(seriesObj)
+                        }
+                    }
+                    let data = this.$util.dataUtil.covertDataToEcharts(res, arr);
+                    this.$util.dataUtil.refreshEchartsData(this.chart, this.option, data);
+                    this.loading = false;
+                })
+                .catch((err) => {
+                    this.loading = false;
+                });
+        },
     },
-  },
 };
 </script>
 

+ 7 - 14
src/components/work/meeting/workMeeting.vue

@@ -19,7 +19,7 @@
       <a-row>
         <a-col :span="24">
           <div class="workMeeting-left ioc-card-content">
-            <card title="会议分析" v-if="chartShow.timeline">
+            <card title="会议分析" v-show="chartShow.timeline" style="padding-bottom: 15px">
               <a-row>
                 <a-col :span="2">
                   <a-menu
@@ -199,15 +199,15 @@
                   </a-descriptions-item>
                 </a-descriptions>
               </div>
-            </card>
-            <card title="会议分析" v-if="chartShow.usageAllPanel">
+            </card >
+            <card title="会议分析" v-if="chartShow.usageAllPanel" style="padding-bottom: 15px">
               <MeetingTimeCharts
                 :height="300"
                 :queryData="queryData"
                 ref="meetingTimeRef"
               ></MeetingTimeCharts>
             </card>
-            <card title="会议分析" v-if="chartShow.usageFloorPanel">
+            <card title="会议分析" v-if="chartShow.usageFloorPanel" style="padding-bottom: 15px">
               <MeetingTimeFloorCharts
                 :height="300"
                 :queryData="queryData"
@@ -489,12 +489,12 @@ export default {
     },
     reset() {},
     search() {
+        this.chartShow.timeLine = false;
+        this.chartShow.usageAllPanel = false;
+        this.chartShow.usageFloorPanel = false;
       // 楼层选全部时展示使用时长面板
       if (this.queryData.floorId === "0") {
-        this.chartShow.timeLine = false;
         this.chartShow.usageAllPanel = true;
-        this.chartShow.usageFloorPanel = false;
-        console.log("楼层选全部");
         this.$nextTick(() => {
           this.$util.asyncPromise(
             this.getCoreData(),
@@ -508,10 +508,7 @@ export default {
         let end = this.$moment(this.queryData.timeRange.endDate);
         let diff = end.diff(start, "days");
         if (diff > 1) {
-          this.chartShow.timeLine = false;
           this.chartShow.usageFloorPanel = true;
-          this.chartShow.usageAllPanel = false;
-          console.log("楼层选具体楼层 --时间差大于一天 ");
           this.$nextTick(() => {
             this.$util.asyncPromise(
               this.getCoreData(),
@@ -522,9 +519,6 @@ export default {
           });
         } else {
           this.chartShow.timeLine = true;
-          this.chartShow.usageAllPanel = false;
-          this.chartShow.usageFloorPanel = false;
-          console.log("楼层选具体楼层 -- 时间差小于或等于一天");
           this.$util.asyncPromise(
             this.getCoreData(),
             this.$refs.WorkMeetingCostTrend.getData(),
@@ -537,7 +531,6 @@ export default {
     },
     // 会议记录
     getMeetingRecordData() {
-      debugger
       this.showMeetingLine = false;
       let params = {};
       Object.assign(params, this.queryData);