评价、短信、填单、样表、网络理政

base-manager/doc/api.md

@@ -11209,6 +11209,299 @@ data| object  | 数据对象            |-
 }
 ```
 
+## 样表报表服务
+
+### 查询样报服务列表
+
+**请求URL:** sampleform/sample/bill/list
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查询样表报表服务
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+page|Integer|否|当前页
+size|Integer|否|每页条数，值为-1，查询所有记录
+siteId|Long|否|站点ID
+matterName|String|否|事项名称,字段前后添加%%模糊查询
+materialName|String|否|材料名称,字段前后添加%%模糊查询
+operTimeStart|String|否|操作开始时间
+operTimeEnd|String|否|操作结束时间
+
+**请求样例:**
+```
+  {
+        "siteId":1,
+        "matterName":"%xxxx%",
+        "materialName":"%xxxxx%",
+        "operTimeStart":"2023-02-23",
+        "operTimeEnd":"2023-02-24",
+        "page":1,
+        "size":10
+  }
+
+```
+**响应参数:**
+
+参数名称|参数类型|描述
+:---|:---|:------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ per_page|Integer|每页条数
+ total|Integer|总条数
+ last_page|Integer|总页数
+ current_page|Integer|当前页
+ data|array|结果集列表|数组
+  id|Long|主键，自增长
+  siteId|Long|站点ID
+  matterId|Long|事项id
+  matterName|String|事项名称
+  matterFullName|String|事项全称
+  materialName|String|材料名称
+  materialFullName|String|材料全称
+  deviceCode|String|设备编码
+  deviceName|String|设备名称
+  operTime|Date|操作时间
+  createTime|Date|创建时间
+  createUserId|Long|创建用户
+  updateTime|Date|修改时间
+dict|object|字典对象
+
+**响应消息样例:**
+```
+{
+    "code":1,
+    "data":{
+    }
+}
+```
+
+### 查看样表报表服务
+
+**请求URL:** sampleform/sample/bill/info
+
+**请求方式:** GET
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查看样表服务，返回实例详细信息
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+id|Long|是|ID
+
+**请求样例:**
+```
+    http://localhost/sample/bill/info?id=549
+```
+**响应参数:**
+
+参数名称 |参数类型|描述
+:---|:---|:-------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ id|Long|主键，自增长
+ siteId|Long|站点ID
+ matterId|Long|事项id
+ matterName|String|事项名称
+ matterFullName|String|事项全称
+ materialName|String|材料名称
+ materialFullName|String|材料全称
+ deviceCode|String|设备编码
+ deviceName|String|设备名称
+ operTime|Date|操作时间
+ createTime|Date|创建时间
+ createUserId|Long|创建用户
+ updateTime|Date|修改时间
+dict|object|字典对象
+
+**响应消息样例:**
+```
+{
+    "code": 1,
+    "data": {
+            "id":2816,
+            "siteId":644,
+            "matterId":9498,
+            "matterName":"56bz30",
+            "matterFullName":"9fyv44",
+            "materialName":"kiq3e4",
+            "materialFullName":"xbseak",
+            "deviceCode":"5plyd7",
+            "deviceName":"yt2qku",
+            "operTime":"2023-02-23",
+            "createTime":"2023-02-23",
+            "createUserId":644,
+            "updateTime":"2023-02-23"
+        }
+}
+```
+
+
+## 填单报表列表
+
+### 查询填单报表列表
+
+**请求URL:** fm/matter/datum/print/list
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查询填单报表
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+page|Integer|否|当前页
+size|Integer|否|每页条数，值为-1，查询所有记录
+siteId|Long|否|站点ID
+matterName|String|否|事项名,字段前后添加%%模糊查询
+materialName|String|否|材料名,字段前后添加%%模糊查询
+createTimeStart|String|否|操作开始时间
+createTimeEnd|String|否|操作结束时间
+type|Integer|否|打印类型(1.本地打印,2.在线打印)
+
+**请求样例:**
+```
+  {
+        "materialName":"%xxxxx%",
+        "createTimeStart":"2022-01-11",
+        "createTimeEnd":"2022-01-15",
+        "materialName":"%xxxxx%",
+        "siteId":1,
+        "page":1,
+        "type":1,
+        "page":1,
+        "size":10
+  }
+
+```
+**响应参数:**
+
+参数名称|参数类型|描述
+:---|:---|:------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ per_page|Integer|每页条数
+ total|Integer|总条数
+ last_page|Integer|总页数
+ current_page|Integer|当前页
+ data|array|结果集列表|数组
+  id|Long|主键，自增长
+  siteId|Long|站点id
+  orderId|String|打印订单
+  materialId|Long|材料Id
+  materialName|String|材料名
+  printPage|Integer|材料页数
+  type|Integer|打印类型(1.本地打印,2.在线打印)
+  docPath|String|合成doc后地址
+  formContent|String|提交的表单
+  createTime|Date|创建时间
+  createUserId|Long|创建用户
+  updateTime|Date|修改时间
+  idCard|String|身份证号
+  idName|String|身份证名称
+  mobile|String|手机号码
+  matterId|Long|事项id
+  matterName|String|事项名称
+  matterCode|String|事项编码
+  deviceCode|String|设备编码
+  deviceName|String|设备名称
+dict|object|字典对象
+ type|object|字典属性对象，详见附录
+
+**响应消息样例:**
+```
+{
+    "code":1,
+    "data":{
+    }
+}
+```
+
+### 查看填单报表
+
+**请求URL:** fm/matter/datum/print/info
+
+**请求方式:** GET
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查看填单报表，返回实例详细信息
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+id|Long|是|ID
+
+**请求样例:**
+```
+    http://localhost/fm/matter/datum/print/info?id=549
+```
+**响应参数:**
+
+参数名称 |参数类型|描述
+:---|:---|:-------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ id|Long|主键，自增长
+ siteId|Long|站点id
+ orderId|String|打印订单
+ materialId|Long|材料Id
+ materialName|String|材料名
+ printPage|Integer|材料页数
+ type|Integer|打印类型(1.本地打印,2.在线打印)
+ docPath|String|合成doc后地址
+ formContent|String|提交的表单
+ createTime|Date|创建时间
+ createUserId|Long|创建用户
+ updateTime|Date|修改时间
+ idCard|String|身份证号
+ idName|String|身份证名称
+ mobile|String|手机号码
+ matterId|Long|事项id
+ matterName|String|事项名称
+ matterCode|String|事项编码
+ deviceCode|String|设备编码
+ deviceName|String|设备名称
+dict|object|字典对象
+ type|object|字典属性对象，详见附录
+
+**响应消息样例:**
+```
+{
+    "code": 1,
+    "data": {
+            "id":9177,
+            "orderId":"dhhddy",
+            "materialId":2805,
+            "materialName":"hz30qw",
+            "page":7237,
+            "type":340,
+            "docPath":"aw74kl",
+            "formContent":"h719lm",
+            "createTime":"2022-12-09",
+            "createUserId":7489,
+            "updateTime":"2022-12-09"
+        }
+}
+```
+
+
 ## 字典附录
 
 ### isBusiness

base-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -21,5 +21,9 @@
 
   "base-yibin-web": {
     "baseUrl": "http://112.19.80.237:11078/base"
+  },
+
+  "base-yibin-php": {
+    "phpUrl": "http://112.19.80.237:8090"
   }
 }
\ No newline at end of file

base-manager/src/test/java/com/mortals/httpclient/site/SiteBusinessController.http

@@ -4,7 +4,7 @@ POST {{baseUrl}}/site/business/list
 Content-Type: application/json
 
 {
-  "idNotList": [11,18,17,14,27,26],
+  "idNotList": [11,18,17,14,27,28],
    "siteId": 1,
     "page":1,
     "size":10

base-manager/src/test/java/com/mortals/httpclient/system/system.http

@@ -103,4 +103,10 @@ GET {{baseUrl}}/test/syncDept
 Accept: application/json
 
 
+###testre
+POST {{phpUrl}}/inter/take/takebusiness
+Content-Type: application/x-www-form-urlencoded
+
+businessid=125&matter=125&devicenum=C0-FB-F9-CD-3B-5D&peopleid=13
+
 

base-manager/src/test/java/com/mortals/httpclient/window/WindowBusinessController.http

@@ -4,7 +4,7 @@ POST {{baseUrl}}/window/business/list
 Content-Type: application/json
 
 {
-    "windowIdList":[3,4,5],
+    "siteBusinessId":58,
     "page":1,
     "size":10
 }

portal-manager-ui/admin/src/api/dataAdmin.js

@@ -7,23 +7,26 @@ export function censusListInterface(params) {
 }
 
 
+
+/* 排号机部分 */
 //排号机列表数据
-export function getTaskList(params){
-  return http.get(`${BASEURL}/admin/take/takelist`,params)
+export function getTaskList(params) {
+  return http.get(`${BASEURL}/admin/take/takelist`, params)
 }
 //排队办理记录报表接口
-export function getQueueData(params){
-  return http.post(`${BASEURL}/inter/reportform/quelist`,params)
+export function getQueueData(params) {
+  return http.post(`${BASEURL}/inter/reportform/quelist`, params)
 }
 //排号记录详情
-export function getQueueInfo(params){
-  return http.post(`${BASEURL}/inter/reportform/queinfo`,params)
+export function getQueueInfo(params) {
+  return http.post(`${BASEURL}/inter/reportform/queinfo`, params)
 }
 //业务事项关联
-export function getBusinessEvent(params){
-  return http.post(`${baseURL}/basics_api/base/business/matter/list`,params)
+export function getBusinessEvent(params) {
+  return http.get(`${BASEURL}/inter/reportform/busanalyse`, params)
 }
 //查询业务人员信息
+<<<<<<< HEAD
 export function getWorkerInfo(params){
   return http.get(`${baseURL}/basics_api/base/workman/info`,params)
 }
@@ -72,3 +75,29 @@ export function getBillList(params) {
 export function getPrintList(params) {
   return http.post(`${baseURL}/fm/matter/datum/print/list`, params);
 }
+=======
+export function getWorkerInfo(params) {
+  return http.get(`${baseURL}/basics_api/base/workman/info`, params)
+}
+//查询业务人员业务数据分析
+export function getWorkmananalyse(params) {
+  return http.get(`${BASEURL}/inter/reportform/workmananalyse`, params)
+}
+//查询用户信息
+export function getPeopleanalyse(params) {
+  return http.get(`${BASEURL}/inter/reportform/peopleanalyse`, params)
+}
+
+
+
+/* 呼叫部分 */
+// 呼叫器列表
+export function getCalllist(params) {
+  return http.get(`${baseURL}/zwfw_api/admin/call/calllist`, params)
+}
+// 呼叫记录报表
+export function getCallQueList(params) {
+  return http.post(`${BASEURL}/inter/reportform/callQueList`, params)
+}
+
+>>>>>>> 0334a060231b88a82691e8a4f429b0ab38bdddc5

portal-manager-ui/admin/src/mixins/table.js

@@ -6,7 +6,6 @@ export default {
             nowWeek: "",
             timer: null,
             tableLoading: false,
-
             tablePagination: {
                 current: 1,
                 pageSize: 10,
@@ -16,11 +15,9 @@ export default {
                 showTotal: (total, range) => `共${total}条`,
                 pageSizeOptions: ["10", "20", "30"],
             },
-
             tableSourceData: [],
-            tableSelectedRows: [], //选中的数据
+            tableSelectedRows: [], //选中的行数据
             tableSelectedKeys: [], //选中的id
-
             sourceInfoForm: {},
         }
     },
@@ -39,25 +36,24 @@ export default {
     },
     methods: {
         //导出
-        exportTable() {
-            let tableData = [];
+        exportTable(tHeader, filterVal, transformText) {
+            console.log(tHeader, filterVal)
+            let tableData = []; //列表数据
             if (this.tableSelectedRows.length == 0) {
-                tableData = JSON.parse(JSON.stringify(this.tableSourceData));
+                tableData = this.downAllData()
             } else {
                 tableData = JSON.parse(JSON.stringify(this.tableSelectedRows));
             }
-            let tableColumns = JSON.parse(JSON.stringify(this.tableHeaders));
-            let newTableData = tableData.map(item => {
-                let obj = {};
-                for (let key in item) {
-                    obj[key] = item[key];
-                }
-                return obj;
-            })
+            // let tableColumns = JSON.parse(JSON.stringify(this.tableHeaders));
+            console.log('表格数据', tableData)
+            // console.log('表头内容', tableColumns)
+            // let newTableData = tableData.map(item => {
+            // //    console.log(item)
+            // })
             let exprotExcelName = `${this.nowDay} / ${this.nowTime} / ${this.$route['meta']['title'] || '报表信息统计'}`;
-            this.exportExcel(tableColumns, newTableData, exprotExcelName);
+            this.exportExcel(tHeader, filterVal, tableData, exprotExcelName);
         },
-        exportExcel(tableColumns, tableData, exprotExcelName) {
+        exportExcel(tHeader, filterVal, tableData, exprotExcelName) {
             // console.log(tableColumns);
             // console.log(tableData);
             // console.log(exprotExcelName);
@@ -67,6 +63,7 @@ export default {
                 for (let i = 0; i < tableColumns.length; i++) {
                     for (let key in item) {
                         if (tableColumns[i]["dataIndex"] == key) {
+                            console.log(tableColumns[i]["dataIndex"])
                             if (j == 0) {
                                 exportHeaderName.push(tableColumns[i]["title"]);
                             }
@@ -87,8 +84,8 @@ export default {
                 {
                     sheetData: exportData,
                     sheetName: "sheet",
-                    sheetHeader: exportHeaderName,
-                    sheetFilter: exportHeaderName,
+                    sheetHeader: tHeader,
+                    sheetFilter: tHeader,
                 },
             ];
             let toExcel = new this.$ExportJsonExcel(option);
@@ -105,7 +102,8 @@ export default {
         onSelectChange(selectedRowKeys, selectedRows) {
             this.tableSelectedKeys = selectedRowKeys;
             this.tableSelectedRows = selectedRows;
-            // console.log(this.tableSelectedKeys, this.tableSelectedRows);
+            // console.log('选中的ID', this.tableSelectedKeys);
+            // console.log('选中的行数据', this.tableSelectedRows);
         },
 
         pagTableChange(pagination) {

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

@@ -19,7 +19,7 @@
                             按材料
                         </a-select-option>
                     </a-select>
-                    <a-input style="width:74.3%" v-model="searchName" placeholder="请输入评价人姓名或窗口编号搜索">
+                    <a-input style="width:73%" v-model="searchName" placeholder="请输入评价人姓名或窗口编号搜索">
                         <a-icon slot="prefix" type="search" />
                     </a-input>
                 <!-- </a-input-group> -->

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

@@ -5,21 +5,23 @@
       :getContainer="() => $refs.businessModal">
       <div class="content">
         <h1>{{ title }}</h1>
-        <em>关联事项（{{ dataList.length }}）</em>
+        <em v-if="dataList.matterlist">关联事项（{{ dataList.matterlist.length }}）</em>
         <p>
-          <!-- {{ item.shixiangmingcheng }} -->
+          <template v-for="item in dataList.matterlist">
+            <p>{{ item }}</p>
+          </template>
         </p>
         <h4>
-          <span>受理次数<br /><i>12</i></span>
-          <span>办结次数<br /><i>12</i></span>
-          <span>好评率<br /><i>99%</i></span>
+          <span>受理次数<br /><i>{{ dataList.slcount }}</i></span>
+          <span>办结次数<br /><i>{{ dataList.bjcount }}</i></span>
+          <span>好评率<br /><i>{{ dataList.hplv }}</i></span>
         </h4>
       </div>
       <template slot="footer">
         <a-button type="primary" ghost @click="lookDetails">查看业务分析</a-button>
       </template>
     </a-modal>
-</div>
+  </div>
 </template>
 
 <script>
@@ -33,7 +35,6 @@ export default {
       dataList: []
     };
   },
-
   mounted() { },
   methods: {
     lookDetails() {

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

@@ -11,26 +11,26 @@
       :getContainer="() => $refs.userModal"
     >
       <div class="content">
-        <h1>{{ useInfo.name }}</h1>
+        <h1>{{ dataList.people_name}}</h1>
         <p>
-          <span>{{ defaultInfoForm.Gender }}</span>
-          <span>{{ defaultInfoForm.Age }}</span>
-          <span>{{ defaultInfoForm.Phone }}</span>
+          <span>{{ dataList.people_sex }}</span>
+          <span>{{ dataList.age  }}</span>
+          <span>{{ dataList.people_phone }}</span>
         </p>
         <h2>
           <span
-            >预约次数<br /><i>{{ defaultInfoForm.yuyuecishu }}</i></span
+            >预约次数<br /><i>{{ dataList.ordernum }}</i></span
           >
           <span
-            >排队次数<br /><i>{{ defaultInfoForm.paiduicishu }}</i></span
+            >排队次数<br /><i>{{ dataList.quenum }}</i></span
           >
           <span
-            >关联业务<br /><i>{{ defaultInfoForm.guanlianyewu }}</i></span
+            >关联业务<br /><i>{{ dataList.bus_num}}</i></span
           >
         </h2>
       </div>
       <template slot="footer">
-        <a-button type="primary" ghost>查看TA的数据画像</a-button>
+        <a-button type="primary" ghost @click="openBlockchain">查看TA的数据画像</a-button>
         <a-button type="primary" ghost @click="openBlockchain"
           >区块链信息</a-button
         >
@@ -48,7 +48,7 @@ export default {
   name: "PortalAdminVueUserInfo",
   data() {
     return {
-      useInfo:[]
+      dataList:[],
     };
   },
   components: {
@@ -58,7 +58,8 @@ export default {
   mounted() {},
   methods: {
     openBlockchain() {
-      this.$refs.Blockchain.modalInfo.visible = true;
+      // this.$refs.Blockchain.modalInfo.visible = true;
+      this.$message.warning('暂未开放')
     },
   },
 };

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

@@ -14,15 +14,15 @@
               <span><i class="lable">工号：</i>{{ infoData.number || "--" }}</span>
               <span><i class="lable">所属部门：</i>{{ infoData.deptName || "--" }}</span>
               <span><i class="lable">政治面貌：</i>{{ $codeMap.politicalStatus[infoData.politicalstatus] || "--" }}</span>
-              <span><i class="lable">电话：</i>{{ infoData.phone || "--" }}</span>
-              <span><i class="lable">星级：</i>{{ infoData.starlevel || "--" }}</span>
+              <span><i class="lable">电话：</i>{{ infoData.mobile || "--" }}</span>
+              <span><i class="lable">星级：</i>{{ infoData.starlevel +'星' || "--" }} </span>
             </div>
           </div>
         </div>
         <h2>
-          <span>受理业务<br /><i>{{ "--" }}</i></span>
-          <span>评价次数<br /><i>{{ "--" }}</i></span>
-          <span>好评率<br /><i>{{ "--" }}</i></span>
+          <span>受理业务<br /><i>{{ infoData.slbusiness || "0" }}</i></span>
+          <span>评价次数<br /><i>{{ infoData.pjnum || "0" }}</i></span>
+          <span>好评率<br /><i>{{ infoData.hplv || "0" }}</i></span>
         </h2>
       </div>
       <template slot="footer">
@@ -31,7 +31,7 @@
       </template>
     </a-modal>
     <Blockchain ref="Blockchain" />
-</div>
+  </div>
 </template>
 
 <script>
@@ -98,7 +98,7 @@ export default {
             .lable {
               display: inline-block;
               font-style: normal;
-              width: 100px;
+              width: 70px;
               text-align: right;
             }
           }

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

@@ -2,10 +2,10 @@
   <div class="queueRecord-Container">
     <div class="header_box">
       <div>
-        <a-button type="success" @click="exportTable">
+        <a-button type="success" @click="exportTable(tHeader, filterVal, style, downAllData)">
           <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
         </a-button>
-        <b>叫号次数：<i>{{ tablePagination.total }}</i>次</b>
+        <b>叫号次数：<i>{{ tablePagination.total }}</i> 次</b>
         <sub>统计时间段：{{ searchForm.time[0] }}~{{ searchForm.time[1] }}</sub>
       </div>
       <span>
@@ -57,7 +57,7 @@
         </template>
         <!-- 办理业务 -->
         <template slot="business" slot-scope="text">
-          <a v-if="text.business" @click="openBusiness(text.business, text.businessId)">{{ text.business }}</a>
+          <a v-if="text.business" @click="openBusiness(text.business, text.businessid)">{{ text.business }}</a>
           <span v-else>--</span>
         </template>
         <!-- 办理开始时间 -->
@@ -99,7 +99,7 @@
       <WorkpeopleInfo ref="WorkpeopleInfo" />
       <HandlingDetails ref="HandlingDetails" />
     </div>
-</div>
+  </div>
 </template>
 
 <script>
@@ -109,7 +109,10 @@ import UserInfo from "./components/userInfo.vue";
 import BusinessInfo from "./components/businessInfo.vue";
 import WorkpeopleInfo from "./components/workpeopleInfo.vue";
 import HandlingDetails from "./components/HandlingDetails.vue";
-import { getTaskList, getQueueData, getQueueInfo, getBusinessEvent, getWorkerInfo } from "@/api/dataAdmin";
+import {
+  getTaskList, getQueueData, getQueueInfo, getBusinessEvent,
+  getWorkerInfo, getPeopleanalyse, getWorkmananalyse
+} from "@/api/dataAdmin";
 export default {
   mixins: [table],
   name: "PortalAdminVueQueueRecord",
@@ -209,6 +212,32 @@ export default {
           },
         },
       ],
+      tHeader: [// 导出的表头名信息
+        "排队编号",
+        "申报人",
+        "联系方式",
+        "取号时间",
+        "取号设备",
+        "办理业务",
+        "办理开始时间",
+        "办理窗口",
+        "工作人员",
+        "办理结束时间",
+        "状态",
+      ],
+      filterVal: [// 导出的表头字段名，需要导出表格字段名
+        "flownum",
+        "people_name",
+        "people_phone",
+        "taketime",
+        "device_name",
+        "business",
+        "calltime",
+        "window_name",
+        "workman_name",
+        "endtime",
+        "style",
+      ],
       //设备数据
       deviceData: [],
       // 搜索数据
@@ -235,6 +264,11 @@ export default {
       ],
       //Form数据列表
       tableList: [],
+      obj: {
+        0: "排队中",
+        1: "办理中",
+        4: "办理完成",
+      },
     };
   },
   components: {
@@ -289,8 +323,13 @@ export default {
       this.getQueueDataArr()
     },
     //用户模态框
-    openDeclarant(item) {
-      console.log(item)
+    async openDeclarant(item) {
+      await getPeopleanalyse({ peopleid: item.peopleid, time: this.searchForm.time }).then(res => {
+        if (res.code = 1) {
+          this.$refs.UserInfo.dataList = { ...item, ...res.data }
+          // console.log(this.$refs.UserInfo.dataList)
+        }
+      })
       this.$refs.UserInfo.modalInfo.title = "用户信息";
       this.$refs.UserInfo.modalInfo.width = "25%";
       this.$refs.UserInfo.modalInfo.visible = true;
@@ -298,8 +337,8 @@ export default {
     //业务关联模块
     async openBusiness(business, id) {
       let siteId = localStorage.getItem('siteId')
-      await getBusinessEvent({ siteId, page: 1, size: -1, siteBusinessId: id }).then(res => {
-        this.$refs.BusinessInfo.dataList = res.data.data
+      await getBusinessEvent({ businessid: id, time: this.searchForm.time }).then(res => {
+        this.$refs.BusinessInfo.dataList = res.data
       })
       this.$refs.BusinessInfo.modalInfo.title = "业务分析";
       this.$refs.BusinessInfo.title = business
@@ -307,10 +346,15 @@ export default {
     },
     //工作人员信息模态框
     async openWorkpeople(id) {
+      let a, b = {}
       await getWorkerInfo({ id }).then(res => {
-        console.log(res.data)
-        this.$refs.WorkpeopleInfo.infoData = res.data
+        a = res.data
       })
+      await getWorkmananalyse({ workmanid: id, time: this.searchForm.time }).then(res => {
+        b = res.data
+      })
+      this.$refs.WorkpeopleInfo.infoData = { ...a, ...b }
+      console.log(this.$refs.WorkpeopleInfo.infoData)
       this.$refs.WorkpeopleInfo.modalInfo.title = "工作人员信息";
       this.$refs.WorkpeopleInfo.modalInfo.visible = true;
     },
@@ -323,7 +367,17 @@ export default {
       this.$refs.HandlingDetails.modalInfo.title = "办理明细";
       this.$refs.HandlingDetails.modalInfo.visible = true;
     },
+    //获取全部数据
+    downAllData() {
+      getQueueData({
+        page: 1,
+        size: -1,
+        ...this.searchForm,
+      }).then(res => {
+        return res
+      });
 
+    }
   },
 };
 </script>

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

@@ -19,7 +19,7 @@
                             按材料
                         </a-select-option>
                     </a-select>
-                    <a-input style="width:74.2%" v-model="searchName" placeholder="请输入评价人姓名或窗口编号搜索">
+                    <a-input style="width:73%" v-model="searchName" placeholder="请输入评价人姓名或窗口编号搜索">
                         <a-icon slot="prefix" type="search" />
                     </a-input>
                 <!-- </a-input-group> -->

portal-manager/pom.xml

@@ -116,7 +116,7 @@
 				<profiles.log.level>INFO</profiles.log.level>
 				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<package.environment>yibin</package.environment>
-				<skipUi>false</skipUi>
+				<skipUi>true</skipUi>
 			</properties>
 		</profile>