修复报表bug

portal-manager-ui/admin/src/views/dataAdmin/components/IOT/alerting.vue

@@ -165,6 +165,42 @@ export default {
       this.$refs.Details.modalInfo.title = "告警详情";
       this.$refs.Details.modalInfo.visible = true;
     },
+    // 导出
+    async handleExportTable() {
+      this.btnLoading = true;
+      let data = [];
+      if (this.tableSelectedKeys.length && this.tableSelectedRows.length) {
+        // 深度克隆避免影响页面表格展示
+        data = this.$_.cloneDeep(this.tableSelectedRows);
+      } else {
+        let datas = this.$_.cloneDeep(
+          await getImpossible({
+            ...this.queryform,
+            page: 1,
+            size: -1
+          })
+        );
+        this.btnLoading = false
+        data = datas.data.data
+        if (!data.length) return;
+      }
+      
+      const tHeader = []
+      const filterVal = []
+      this.tableHeaders.forEach(v=>{
+        if(v.dataIndex){
+          tHeader.push(v.title)
+          filterVal.push(v.dataIndex)
+        }
+      })
+      export2Excel(
+        tHeader,
+        filterVal,
+        data,
+        "智能边缘物联网异常告警报表" + this.$moment().format("YYYYMMDDHHmmss")
+      );
+      this.btnLoading = false;
+    },
   },
 };
 </script>

portal-manager-ui/admin/src/views/dataAdmin/components/Impossible/index.vue

@@ -5,8 +5,9 @@
 				<a-button :loading="btnLoading" type="success" @click="handleExportTable">
 					<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
 				</a-button>
-				<div class="ml20">提交总次数：{{ numObj ? numObj.count : 0 }}次</div>
-				<div class="ml20">回复总次数：{{ numObj ? numObj.reply_count : 0 }}次</div>
+				<div class="ml20">提交总次数：<span style="color:#1890ff;font-weight: bold;">{{ numObj ? numObj.count : 0 }}次</span></div>
+				<div class="ml20">回复总次数：<span style="color:#1890ff;font-weight: bold;">{{ numObj ? numObj.reply_count : 0 }}次</span></div>
+				<div style="font-size:12px;color:#a19a9a;margin-left: 20px;">统计时间段：{{ queryform.time[0] }} ~ {{ queryform.time[1] }}</div>
 			</div>
 			<a-form :model="queryform" layout="inline">
 				<a-form-item>

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

@@ -204,6 +204,9 @@ export default {
         title: "预约时间",
         align: "center",
         dataIndex: "starttime",
+        customRender: (text,row) => {
+          return `${row.starttime}-${row.endtime}` || "--";
+        },
       },
       {
         title: "签到时间",
@@ -219,6 +222,11 @@ export default {
           return text.canceltime || "--";
         },
       },
+      {
+        title: "业务名称",
+        align: "center",
+        dataIndex: "business_name",
+      },
       {
         title: "创建时间",
         align: "center",

portal-manager-ui/admin/src/views/dataAdmin/components/makeRecordReport/recordReportdetails.vue

@@ -110,7 +110,7 @@
       <h2>
         <span>操作时间：{{ orderInfo.create_time }}</span>
         <span>预约方式：-- </span>
-        <span>操作站点：-- </span>
+        <span>操作站点：{{orderInfo.siteinfo?orderInfo.siteinfo.siteName:'--'}} </span>
       </h2>
     </div>
   </div>

portal-manager-ui/admin/src/views/dataAdmin/components/microOfficialWebsite/microForm.vue

@@ -103,10 +103,10 @@ let filterVal = [
   "openid",
   "nickname",
   "idcard_Sex",
-  "普通用户省份",
-  "普通用户城市",
+  "province",
+  "city",
   "create_time",
-  "是否实名认证",
+  "idcard_IDCardNo",
 ];
 export default {
   name: "microForm",
@@ -139,12 +139,14 @@ export default {
       {
         title: "普通用户省份",
         align: "center",
-        customRender: (text) => "--",
+        dataIndex: "province",
+        customRender: (text) => text || "--",
       },
       {
         title: "普通用户城市",
         align: "center",
-        customRender: (text) => "--",
+        dataIndex: "city",
+        customRender: (text) => text || "--",
       },
       {
         title: "用户头像",