feat: 评价系统数据接口调试

admin_2/src/pages/engine/EvaluateSystem.vue

@@ -3,7 +3,7 @@
     <div class="table-item">
       <div>
         <DoubleTable
-          title="大厅取号量统计"
+          title="大厅评价量统计"
           border
           :column="hallColumn"
           :data="hallTableData"
@@ -11,7 +11,7 @@
           :current="hallSearch.page"
           :loading="hallLoading"
           type="hall"
-          @export="exportHallQueue"
+          @export="exportHallEva"
         ></DoubleTable>
       </div>
       <Pagination
@@ -19,13 +19,13 @@
         :current.sync="hallSearch.page"
         :size.sync="hallSearch.size"
         layout="total,prev,pager,next,jumper"
-        @get="getHallQueue"
+        @get="getHallEva"
       ></Pagination>
     </div>
     <div class="table-item">
       <div>
         <DoubleTable
-          title="业务取号量统计"
+          title="业务评价量统计"
           border
           :column="businessColumn"
           :data="businessTableData"
@@ -33,7 +33,7 @@
           :current="businessSearch.page"
           :loading="businessLoading"
           type="business"
-          @export="exportbusinessQueue"
+          @export="exportbusinessEva"
           @search="handleSearch"
         ></DoubleTable>
       </div>
@@ -42,13 +42,13 @@
         :current.sync="businessSearch.page"
         :size.sync="businessSearch.size"
         layout="total,prev,pager,next,jumper"
-        @get="getBusinessQueue"
+        @get="getBusinessEva"
       ></Pagination>
     </div>
     <div class="table-item">
       <div>
         <DoubleTable
-          title="部门取号量统计"
+          title="部门评价量统计"
           border
           :column="deptColumn"
           :data="deptTableData"
@@ -56,7 +56,7 @@
           :current="deptSearch.page"
           :loading="deptLoading"
           type="dept"
-          @export="exportDeptQueue"
+          @export="exportDeptEva"
           @search="handleSearch"
         ></DoubleTable>
       </div>
@@ -65,13 +65,13 @@
         :current.sync="deptSearch.page"
         :size.sync="deptSearch.size"
         layout="total,prev,pager,next,jumper"
-        @get="getDeptQueue"
+        @get="getDeptEva"
       ></Pagination>
     </div>
     <div class="table-item">
       <div>
         <DoubleTable
-          title="窗口取号量统计"
+          title="窗口评价量统计"
           border
           :column="windowColumn"
           :data="windowTableData"
@@ -79,7 +79,7 @@
           :current="windowSearch.page"
           :loading="windowLoading"
           type="window"
-          @export="exportWindowQueue"
+          @export="exportWindowEva"
           @search="handleSearch"
         ></DoubleTable>
       </div>
@@ -88,7 +88,7 @@
         :current.sync="windowSearch.page"
         :size.sync="windowSearch.size"
         layout="total,prev,pager,next,jumper"
-        @get="getWindowQueue"
+        @get="getWindowEva"
       ></Pagination>
     </div>
   </div>
@@ -96,7 +96,7 @@
 
 <script>
 import DoubleTable from "./components/DoubleTable.vue";
-import { getQueueSystemList } from "@/api/engine";
+import { getEvaSystemList } from "@/api/engine";
 import { export2Excel } from "@/utils/exportExcel";
 import { dataSection } from "@/utils";
 import storage from "@/utils/storage";
@@ -150,8 +150,8 @@ export default {
           showOverflowTooltip: true,
         },
         {
-          label: "排队数量",
-          prop: "phCount",
+          label: "评价数量",
+          prop: "pjCount",
           align: "center",
           formatter: (row, column, cellValue) => {
             if (cellValue) {
@@ -173,8 +173,8 @@ export default {
           },
         },
         {
-          label: "排队数量",
-          prop: "phCount",
+          label: "评价数量",
+          prop: "pjCount",
           align: "center",
           formatter: (row, column, cellValue) => {
             if (cellValue) {
@@ -191,8 +191,8 @@ export default {
           align: "center",
         },
         {
-          label: "排队数量",
-          prop: "phCount",
+          label: "评价数量",
+          prop: "pjCount",
           align: "center",
           formatter: (row, column, cellValue) => {
             if (cellValue) {
@@ -209,8 +209,8 @@ export default {
           align: "center",
         },
         {
-          label: "排队数量",
-          prop: "phCount",
+          label: "评价数量",
+          prop: "pjCount",
           align: "center",
           formatter: (row, column, cellValue) => {
             if (cellValue) {
@@ -226,12 +226,7 @@ export default {
       windowTableData: [],
     };
   },
-  created() {
-    // this.getHallQueue();
-    // this.getBusinessQueue();
-    // this.getDeptQueue();
-    // this.getWindowQueue();
-  },
+  created() {},
   methods: {
     // 获取日期
     getDate(dateArr) {
@@ -241,13 +236,13 @@ export default {
       this.businessSearch.page = 1;
       this.deptSearch.page = 1;
       this.windowSearch.page = 1;
-      this.getHallQueue();
-      this.getBusinessQueue();
-      this.getDeptQueue();
-      this.getWindowQueue();
+      this.getHallEva();
+      this.getBusinessEva();
+      this.getDeptEva();
+      this.getWindowEva();
     },
-    async hallQueueFn(form) {
-      const res = await getQueueSystemList({
+    async hallEvaFn(form) {
+      const res = await getEvaSystemList({
         siteId: this.siteId,
         ...this.hallSearch,
         ...this.dateForm,
@@ -267,17 +262,17 @@ export default {
         };
       }
     },
-    // 获取大厅取号数据
-    async getHallQueue() {
+    // 获取大厅评价数据
+    async getHallEva() {
       this.hallLoading = true;
-      let { data, total } = await this.hallQueueFn();
+      let { data, total } = await this.hallEvaFn();
       this.hallTableData = data;
       this.hallSearch.total = total;
       this.hallLoading = false;
     },
 
-    async businessQueue(form = {}) {
-      const res = await getQueueSystemList({
+    async businessEva(form = {}) {
+      const res = await getEvaSystemList({
         siteId: this.siteId,
         ...this.businessSearch,
         ...this.dateForm,
@@ -297,17 +292,17 @@ export default {
         };
       }
     },
-    // 获取业务取号数据
-    async getBusinessQueue() {
+    // 获取业务评价数据
+    async getBusinessEva() {
       this.businessLoading = true;
-      let { data, total } = await this.businessQueue();
+      let { data, total } = await this.businessEva();
       this.businessTableData = data;
       this.businessSearch.total = total;
       this.businessLoading = false;
     },
 
-    async deptQueue(form = {}) {
-      const res = await getQueueSystemList({
+    async deptEva(form = {}) {
+      const res = await getEvaSystemList({
         siteId: this.siteId,
         ...this.deptSearch,
         ...this.dateForm,
@@ -327,17 +322,17 @@ export default {
       }
     },
 
-    // 获取部门取号数据
-    async getDeptQueue() {
+    // 获取部门评价数据
+    async getDeptEva() {
       this.deptLoading = true;
-      let { data, total } = await this.deptQueue();
+      let { data, total } = await this.deptEva();
       this.deptTableData = data;
       this.deptSearch.total = total;
       this.deptLoading = false;
     },
 
-    async windowQueue(form) {
-      const res = await getQueueSystemList({
+    async windowEva(form) {
+      const res = await getEvaSystemList({
         siteId: this.siteId,
         ...this.windowSearch,
         ...this.dateForm,
@@ -356,20 +351,20 @@ export default {
         };
       }
     },
-    // 获取窗口取号数据
-    async getWindowQueue() {
+    // 获取窗口评价数据
+    async getWindowEva() {
       this.windowLoading = true;
-      let { data, total } = await this.windowQueue();
+      let { data, total } = await this.windowEva();
       this.windowTableData = data;
       this.windowSearch.total = total;
       this.windowLoading = false;
     },
 
-    // 导出大厅取号量
-    exportHallQueue() {
+    // 导出大厅评价量
+    exportHallEva() {
       let tHeader = this.hallColumn.map((v) => v.label);
       let filterVal = this.hallColumn.map((v) => v.prop);
-      dataSection(this.hallQueueFn, {}, (data) => {
+      dataSection(this.hallEvaFn, {}, (data) => {
         if (!data.length) {
           this.$message.warning("暂无数据");
           return;
@@ -378,12 +373,12 @@ export default {
           tHeader,
           filterVal,
           data,
-          "大厅取号量统计报表" + this.$moment().format("YYYYMMDDHHmmss")
+          "大厅评价量统计报表" + this.$moment().format("YYYYMMDDHHmmss")
         );
       });
     },
-    // 导出业务取号
-    exportbusinessQueue(type, form) {
+    // 导出业务评价
+    exportbusinessEva(type, form) {
       let tHeader = this.businessColumn.map((v) => v.label);
       let filterVal = this.businessColumn.map((v) => v.prop);
       let { businessName } = form;
@@ -391,7 +386,7 @@ export default {
       if (businessName) {
         searchForm.businessList = [businessName];
       }
-      dataSection(this.businessQueue, searchForm, (data) => {
+      dataSection(this.businessEva, searchForm, (data) => {
         if (!data.length) {
           this.$message.warning("暂无数据");
           return;
@@ -400,12 +395,12 @@ export default {
           tHeader,
           filterVal,
           data,
-          "业务取号量统计报表" + this.$moment().format("YYYYMMDDHHmmss")
+          "业务评价量统计报表" + this.$moment().format("YYYYMMDDHHmmss")
         );
       });
     },
-    // 导出部门取号
-    exportDeptQueue(type, form) {
+    // 导出部门评价
+    exportDeptEva(type, form) {
       let tHeader = this.deptColumn.map((v) => v.label);
       let filterVal = this.deptColumn.map((v) => v.prop);
       let { deptName } = form;
@@ -413,7 +408,7 @@ export default {
       if (deptName) {
         searchForm.sectionNameList = [deptName];
       }
-      dataSection(this.deptQueue, searchForm, (data) => {
+      dataSection(this.deptEva, searchForm, (data) => {
         if (!data.length) {
           this.$message.warning("暂无数据");
           return;
@@ -422,12 +417,12 @@ export default {
           tHeader,
           filterVal,
           data,
-          "部门取号量统计报表" + this.$moment().format("YYYYMMDDHHmmss")
+          "部门评价量统计报表" + this.$moment().format("YYYYMMDDHHmmss")
         );
       });
     },
-    // 导出窗口取号
-    exportWindowQueue(type, form) {
+    // 导出窗口评价
+    exportWindowEva(type, form) {
       let tHeader = this.windowColumn.map((v) => v.label);
       let filterVal = this.windowColumn.map((v) => v.prop);
       let { windowNum } = form;
@@ -435,7 +430,7 @@ export default {
       if (windowNum) {
         searchForm.windowFromnumList = [windowNum];
       }
-      dataSection(this.windowQueue, searchForm, (data) => {
+      dataSection(this.windowEva, searchForm, (data) => {
         if (!data.length) {
           this.$message.warning("暂无数据");
           return;
@@ -444,7 +439,7 @@ export default {
           tHeader,
           filterVal,
           data,
-          "窗口取号量统计报表" + this.$moment().format("YYYYMMDDHHmmss")
+          "窗口评价量统计报表" + this.$moment().format("YYYYMMDDHHmmss")
         );
       });
     },
@@ -459,7 +454,7 @@ export default {
         } else {
           this.businessSearch.businessList = [];
         }
-        this.getBusinessQueue();
+        this.getBusinessEva();
       } else if (type == "dept") {
         let { deptName } = form;
         if (deptName) {
@@ -468,7 +463,7 @@ export default {
         } else {
           this.deptSearch.sectionNameList = [];
         }
-        this.getDeptQueue();
+        this.getDeptEva();
       } else if (type == "window") {
         let { windowNum } = form;
         if (windowNum) {
@@ -477,7 +472,7 @@ export default {
         } else {
           this.windowSearch.windowFromnumList = [];
         }
-        this.getWindowQueue();
+        this.getWindowEva();
       }
     },
   },

admin_2/src/pages/engine/components/DoubleTable.vue

@@ -151,7 +151,7 @@ export default {
       let index = {
         label: "排序",
         type: "index",
-        lign: "center",
+        align: "center",
         index: (index) => {
           return (this.current - 1) * this.size + index + 1;
         },
@@ -162,7 +162,7 @@ export default {
       let index = {
         label: "排序",
         type: "index",
-        lign: "center",
+        align: "center",
         index: (index) => {
           return (this.current - 1) * this.size + index + 6;
         },

admin_2/src/pages/home/Home.vue

@@ -191,24 +191,30 @@ export default {
         let { data } = res.data;
         let { thirtyPhStatList, thirtyPjStatList, thirtyStatList } = data;
         this.homeData = data;
-        this.totalDataset.source = thirtyStatList.map((item) => {
-          return {
-            name: `${item.month}-${item.day}`,
-            value: item.count,
-          };
-        });
-        this.phDataset.source = thirtyPhStatList.map((item) => {
-          return {
-            name: `${item.month}-${item.day}`,
-            value: item.phCount,
-          };
-        });
-        this.pjDataset.source = thirtyPjStatList.map((item) => {
-          return {
-            name: `${item.month}-${item.day}`,
-            value: item.pjCount,
-          };
-        });
+        this.totalDataset.source = thirtyStatList
+          .map((item) => {
+            return {
+              name: `${item.month}-${item.day}`,
+              value: item.count,
+            };
+          })
+          .reverse();
+        this.phDataset.source = thirtyPhStatList
+          .map((item) => {
+            return {
+              name: `${item.month}-${item.day}`,
+              value: item.phCount,
+            };
+          })
+          .reverse();
+        this.pjDataset.source = thirtyPjStatList
+          .map((item) => {
+            return {
+              name: `${item.month}-${item.day}`,
+              value: item.pjCount,
+            };
+          })
+          .reverse();
       }
     },
   },

admin_2/src/pages/home/components/LineEchart.vue

@@ -29,6 +29,9 @@ export default {
       handler(newVal) {
         this.$nextTick(() => {
           this.initChart(newVal);
+          this.myChart.on("click", () => {
+            console.log(111);
+          });
         });
       },
       deep: true,