Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/workman/personnel.vue

@@ -566,7 +566,7 @@ export default {
       const blob = new Blob([res.data], {
         type: "application/octet-stream",
       });
-      let fileName = "批量导入工作人员模块";
+      let fileName = "批量导入工作人员模板";
 
       const link = document.createElement("a");
       link.href = URL.createObjectURL(blob);

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/callRecord.vue

@@ -66,6 +66,15 @@
         <template slot="calltime" slot-scope="text">
           {{ text.calltime ? text.calltime : "--" }}
         </template>
+        <template slot="all_time" slot-scope="text">
+          {{ text.all_time ? text.all_time : "--" }}
+        </template>
+        <template slot="run_time" slot-scope="text">
+          {{ text.run_time ? text.run_time : "--" }}
+        </template>
+        <template slot="wait_time" slot-scope="text">
+          {{ text.wait_time ? text.wait_time : "--" }}
+        </template>
         <!-- 办理窗口 -->
         <template slot="window_name" slot-scope="text">
           {{
@@ -207,6 +216,30 @@ export default {
             customRender: "endtime",
           },
         },
+        {
+          title: "当前排号总时长",
+          width: "8%",
+          align: "center",
+          scopedSlots: {
+            customRender: "all_time",
+          },
+        },
+        {
+          title: "业务平均办理时长",
+          width: "8%",
+          align: "center",
+          scopedSlots: {
+            customRender: "run_time",
+          },
+        },
+        {
+          title: "业务平均等待时长",
+          width: "8%",
+          align: "center",
+          scopedSlots: {
+            customRender: "wait_time",
+          },
+        },
 
         {
           title: "状态",
@@ -276,6 +309,9 @@ export default {
         "window_name",
         "workman_name",
         "endtime",
+        "all_time",
+        "run_time",
+        "wait_time",
         "style",
       ],
       btnLoading: false,

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/queueRecord.vue

@@ -97,6 +97,15 @@
         <template slot="endtime" slot-scope="text">
           {{ text.endtime ? text.endtime : "--" }}
         </template>
+        <template slot="all_time" slot-scope="text">
+          {{ text.all_time ? text.all_time : "--" }}
+        </template>
+        <template slot="run_time" slot-scope="text">
+          {{ text.run_time ? text.run_time : "--" }}
+        </template>
+        <template slot="wait_time" slot-scope="text">
+          {{ text.wait_time ? text.wait_time : "--" }}
+        </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text">
           <a @click="openHandlingDetails(text.id)">详细信息</a>
@@ -224,6 +233,30 @@ export default {
             customRender: "endtime",
           },
         },
+        {
+          title: "当前排号总时长",
+          width: "8%",
+          align: "center",
+          scopedSlots: {
+            customRender: "all_time",
+          },
+        },
+        {
+          title: "业务平均办理时长",
+          width: "8%",
+          align: "center",
+          scopedSlots: {
+            customRender: "run_time",
+          },
+        },
+        {
+          title: "业务平均等待时长",
+          width: "8%",
+          align: "center",
+          scopedSlots: {
+            customRender: "wait_time",
+          },
+        },
 
         {
           title: "状态",
@@ -268,6 +301,9 @@ export default {
         "window_name",
         "workman_name",
         "endtime",
+        "all_time",
+        "run_time",
+        "wait_time",
         "style",
       ],
       //设备数据