Merge branch 'reg' of http://gitlab.scsmile.cn/zxf/smart_gov_platform into reg

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/components/StepoutDetails.vue

@@ -13,16 +13,14 @@
           <p class="elapsed-time-title">
             <span>累计次数</span>
           </p>
-            <p class="time">
-                {{detailsInfo.total}}次
-            </p>
+          <p class="time">{{ detailsInfo.total }}次</p>
         </div>
         <div class="elapsed-time">
           <p class="elapsed-time-title">
             <span>累计时长</span>
           </p>
           <p class="time">
-              <span>{{allTime}}</span>
+            <span>{{ allTime }}</span>
           </p>
         </div>
         <div class="elapsed-time">
@@ -30,13 +28,17 @@
             <span>最近暂离时间</span>
           </p>
           <p class="time">
-                {{createTime}}
+            {{ createTime }}
           </p>
         </div>
       </div>
       <!-- 步骤条 -->
       <a-steps direction="vertical">
-          <a-step :title="(index+1)" v-for="(item,index) in detailsInfo.data" :key="item.stopid">
+        <a-step
+          :title="index + 1"
+          v-for="(item, index) in detailsInfo.data"
+          :key="item.stopid"
+        >
           <a-icon type="environment" slot="icon" />
           <div slot="description" class="transact-step">
             <a-row :gutter="[0, 8]">
@@ -49,18 +51,16 @@
             </a-row>
             <a-row :gutter="[0, 8]">
               <a-col :span="12">
-                  <span>暂离时间：</span
-                  >{{ item.workman_name || "--" }}
+                <span>暂离时间：</span>{{ item.create_time || "--" }}
               </a-col>
               <a-col :span="12">
-                  <span>回归时间：</span
-                  >{{ item.end_time || "--" }}
+                <span>回归时间：</span>{{ item.end_time || "--" }}
               </a-col>
             </a-row>
             <a-row :gutter="[0, 8]">
               <a-col :span="12">
                 <span>暂离时长：</span>
-                    {{item.zl_time || "--"}} 
+                {{ item.zl_time + " 分钟" || "--" }}
               </a-col>
               <a-col :span="12">
                 <span>暂离原因：</span>
@@ -70,7 +70,6 @@
           </div>
         </a-step>
       </a-steps>
-
     </a-drawer>
   </div>
 </template>

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/module.vue

 <template>
   <div class="h-full w-full flex flex-col">
     <div class="total-info">
-      <span class="mr-[30px]">111评价次数：{{ total ?? 0 }}次</span>
+      <span class="mr-[30px]">评价次数：{{ total ?? 0 }}次</span>
       <span>统计时间段：{{ time[0] }} - {{ time[1] }}</span>
     </div>
     <div class="reportforms-out-box">

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/staffLeft.vue

@@ -40,7 +40,9 @@
           <a-tag
             class="cursor-pointer"
             color="blue"
-            @click="checkInfo(record.workmanid,record.all_time,record.create_time)"
+            @click="
+              checkInfo(record.workmanid, record.all_time, record.create_time)
+            "
           >
             详情
           </a-tag>
@@ -64,18 +66,8 @@ import storage from "@/utils/js/Storage";
 import StepoutDetails from "./components/StepoutDetails.vue";
 import { export2Excel } from "@/utils/js/exportExcel";
 import { stopToWorkman, stopInfo } from "@/api/dataAdmin";
-const tHeader = [
-  "工作人员",
-  "暂离次数",
-  "累计计时",
-  "最近暂离时间",
-]; // 导出的表头名信息
-const filterVal = [
-  "workman_name",
-  "count",
-  "all_time",
-  "create_time",
-]; // 导出的表头字段名，需要导出表格字段名
+const tHeader = ["工作人员", "暂离次数", "累计计时(分钟)", "最近暂离时间"]; // 导出的表头名信息
+const filterVal = ["workman_name", "count", "all_time", "create_time"]; // 导出的表头字段名，需要导出表格字段名
 export default {
   components: {
     StepoutDetails,
@@ -107,7 +99,7 @@ export default {
         },
       },
       {
-        title: "累计计时",
+        title: "累计计时(分钟)",
         width: 100,
         dataIndex: "all_time",
         customRender: (text) => {
@@ -157,8 +149,8 @@ export default {
       selectedRowKeys: [], // 表格选中的key
       excelData: [], // 导出数据
       detailsInfo: {}, // 详情信息
-      allTime:"",
-      createTime:"",
+      allTime: "",
+      createTime: "",
       detailsVisible: false,
       title: "办理明细",
     };
@@ -312,24 +304,23 @@ export default {
       execute();
     },
     // 详情
-    async checkInfo(id,alltime,createtime) {
+    async checkInfo(id, alltime, createtime) {
       let res = await stopInfo({
-        page:1,
-        size:-1,
-        time:this.searchForm.time,
-        workmanid:id 
+        page: 1,
+        size: -1,
+        time: this.searchForm.time,
+        workmanid: id,
       });
       if (res.code == 1) {
         let { data } = res;
         this.detailsInfo = data;
         this.detailsVisible = true;
-        this.allTime = alltime
-        this.createTime = createtime
+        this.allTime = alltime;
+        this.createTime = createtime;
       }
     },
   },
 };
 </script>
 
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>
\ No newline at end of file

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/windowLeft.vue

@@ -40,7 +40,9 @@
           <a-tag
             class="cursor-pointer"
             color="blue"
-            @click="checkInfo(record.windowid,record.all_time,record.create_time)"
+            @click="
+              checkInfo(record.windowid, record.all_time, record.create_time)
+            "
           >
             详情
           </a-tag>
@@ -64,18 +66,8 @@ import storage from "@/utils/js/Storage";
 import StepoutDetails from "./components/StepoutDetails.vue";
 import { export2Excel } from "@/utils/js/exportExcel";
 import { stopToWindow, stopInfo } from "@/api/dataAdmin";
-const tHeader = [
-  "窗口编号",
-  "暂离次数",
-  "累计计时",
-  "最近暂离时间",
-]; // 导出的表头名信息
-const filterVal = [
-  "window_num",
-  "count",
-  "all_time",
-  "create_time",
-]; // 导出的表头字段名，需要导出表格字段名
+const tHeader = ["窗口编号", "暂离次数", "累计计时(分钟)", "最近暂离时间"]; // 导出的表头名信息
+const filterVal = ["window_num", "count", "all_time", "create_time"]; // 导出的表头字段名，需要导出表格字段名
 export default {
   components: {
     StepoutDetails,
@@ -107,7 +99,7 @@ export default {
         },
       },
       {
-        title: "累计计时",
+        title: "累计计时(分钟)",
         width: 100,
         dataIndex: "all_time",
         customRender: (text) => {
@@ -157,8 +149,8 @@ export default {
       selectedRowKeys: [], // 表格选中的key
       excelData: [], // 导出数据
       detailsInfo: {}, // 详情信息
-      allTime:"",
-      createTime:"",
+      allTime: "",
+      createTime: "",
       detailsVisible: false,
       title: "详情",
     };
@@ -312,24 +304,23 @@ export default {
       execute();
     },
     // 详情
-    async checkInfo(id,alltime,createtime) {
+    async checkInfo(id, alltime, createtime) {
       let res = await stopInfo({
-        page:1,
-        size:-1,
-        time:this.searchForm.time,
-        windowid:id 
+        page: 1,
+        size: -1,
+        time: this.searchForm.time,
+        windowid: id,
       });
       if (res.code == 1) {
         let { data } = res;
         this.detailsInfo = data;
         this.detailsVisible = true;
-        this.allTime = alltime
-        this.createTime = createtime
+        this.allTime = alltime;
+        this.createTime = createtime;
       }
     },
   },
 };
 </script>
 
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>
\ No newline at end of file