Skip to content

S
smart_gov_platform
Commit 13c22c40 authored by “yiyousong”'s avatar “yiyousong”
Browse files
Options

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

parents a14d1443 58dba73a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2134 additions and 643 deletions
base-manager/doc/api.md
View file @ 13c22c40
...@@ -11209,6 +11209,299 @@ data| object | 数据对象 |- ...@@ -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 ### isBusiness
......
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppDatasetServiceImpl.java
View file @ 13c22c40
...@@ -76,7 +76,9 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao ...@@ -76,7 +76,9 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao
protected void removeAfter(Long[] ids, Context context, int result) throws AppException { protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
List<AppInfoFieldEntity> appInfoFieldlist = appInfoFieldService.find(new AppInfoFieldQuery().datasetIdList(Arrays.asList(ids))); List<AppInfoFieldEntity> appInfoFieldlist = appInfoFieldService.find(new AppInfoFieldQuery().datasetIdList(Arrays.asList(ids)));
if (!ObjectUtils.isEmpty(appInfoFieldlist)) { if (!ObjectUtils.isEmpty(appInfoFieldlist)) {
appInfoFieldService.removeList(appInfoFieldlist, context); Long[] idList = appInfoFieldlist.stream().map(item -> item.getId()).toArray(Long[]::new);
appInfoFieldService.remove(idList, context);
} }
super.removeAfter(ids, context, result); super.removeAfter(ids, context, result);
} }
......
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java
View file @ 13c22c40
...@@ -353,21 +353,25 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L ...@@ -353,21 +353,25 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
//删除模板属性 //删除模板属性
List<AppInfoTempleteFieldEntity> appInfoTempleteFieldDeleteList = appInfoTempleteFieldService.find(new AppInfoTempleteFieldQuery().appIdList(Arrays.asList(ids))); List<AppInfoTempleteFieldEntity> appInfoTempleteFieldDeleteList = appInfoTempleteFieldService.find(new AppInfoTempleteFieldQuery().appIdList(Arrays.asList(ids)));
if (!ObjectUtils.isEmpty(appInfoTempleteFieldDeleteList)) { if (!ObjectUtils.isEmpty(appInfoTempleteFieldDeleteList)) {
appInfoTempleteFieldService.removeList(appInfoTempleteFieldDeleteList, context); Long[] idList = appInfoTempleteFieldDeleteList.stream().map(item -> item.getId()).toArray(Long[]::new);
appInfoTempleteFieldService.remove(idList, context);
} }
//删除版本信息 //删除版本信息
List<AppVersionEntity> appVersionDeleteList = appVersionService.find(new AppVersionQuery().appIdList(Arrays.asList(ids))); List<AppVersionEntity> appVersionDeleteList = appVersionService.find(new AppVersionQuery().appIdList(Arrays.asList(ids)));
if (!ObjectUtils.isEmpty(appVersionDeleteList)) { if (!ObjectUtils.isEmpty(appVersionDeleteList)) {
appVersionService.removeList(appVersionDeleteList, context); Long[] idList = appVersionDeleteList.stream().map(item -> item.getId()).toArray(Long[]::new);
appVersionService.remove(idList, context);
} }
//删除数据集 //删除数据集
List<AppDatasetEntity> appDatasetDeleteList = appDatasetService.find(new AppDatasetQuery().appIdList(Arrays.asList(ids))); List<AppDatasetEntity> appDatasetDeleteList = appDatasetService.find(new AppDatasetQuery().appIdList(Arrays.asList(ids)));
if (!ObjectUtils.isEmpty(appDatasetDeleteList)) { if (!ObjectUtils.isEmpty(appDatasetDeleteList)) {
appDatasetService.removeList(appDatasetDeleteList, context); Long[] idLists = appDatasetDeleteList.stream().map(item -> item.getId()).toArray(Long[]::new);
appDatasetService.remove(idLists, context);
List<AppInfoFieldEntity> appInfoFieldDeleteList = appInfoFieldService.find(new AppInfoFieldQuery().datasetIdList(appDatasetDeleteList.stream().map(AppDatasetEntity::getAppId).collect(Collectors.toList()))); List<AppInfoFieldEntity> appInfoFieldDeleteList = appInfoFieldService.find(new AppInfoFieldQuery().datasetIdList(appDatasetDeleteList.stream().map(AppDatasetEntity::getAppId).collect(Collectors.toList())));
if (!ObjectUtils.isEmpty(appInfoFieldDeleteList)) { if (!ObjectUtils.isEmpty(appInfoFieldDeleteList)) {
appInfoFieldService.removeList(appInfoFieldDeleteList, context); Long[] idList = appInfoFieldDeleteList.stream().map(item -> item.getId()).toArray(Long[]::new);
appInfoFieldService.remove(idList, context);
} }
} }
......
base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowServiceImpl.java
View file @ 13c22c40
...@@ -91,8 +91,8 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W ...@@ -91,8 +91,8 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
if (ObjectUtils.isEmpty(windowId)) { if (ObjectUtils.isEmpty(windowId)) {
throw new AppException("请选择对应窗口"); throw new AppException("请选择对应窗口");
} }
List<Long> businessIdList =new ArrayList<>(); List<Long> businessIdList = new ArrayList<>();
if(!ObjectUtils.isEmpty(businessIds)){ if (!ObjectUtils.isEmpty(businessIds)) {
businessIdList = Arrays.asList(businessIds.split(",")).stream().map(Long::parseLong).collect(Collectors.toList()); businessIdList = Arrays.asList(businessIds.split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
} }
WindowBusinessQuery windowBusinessQuery = new WindowBusinessQuery(); WindowBusinessQuery windowBusinessQuery = new WindowBusinessQuery();
...@@ -124,7 +124,7 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W ...@@ -124,7 +124,7 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
return null; return null;
} }
return windowBusinessEntity; return windowBusinessEntity;
}).filter(f->f!=null).collect(Collectors.toList()); }).filter(f -> f != null).collect(Collectors.toList());
windowBusinessService.save(windowBusinessEntities, context); windowBusinessService.save(windowBusinessEntities, context);
} }
...@@ -136,13 +136,22 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W ...@@ -136,13 +136,22 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
WindowBusinessQuery windowBusinessQuery = new WindowBusinessQuery(); WindowBusinessQuery windowBusinessQuery = new WindowBusinessQuery();
windowBusinessQuery.setWindowIdList(Arrays.asList(ids)); windowBusinessQuery.setWindowIdList(Arrays.asList(ids));
List<WindowBusinessEntity> windowBusinessEntities = windowBusinessService.find(windowBusinessQuery); List<WindowBusinessEntity> windowBusinessEntities = windowBusinessService.find(windowBusinessQuery);
windowBusinessService.removeList(windowBusinessEntities, context); log.info("remove windowBusinessEntities size:{}",windowBusinessEntities.size());
if (!ObjectUtils.isEmpty(windowBusinessEntities)) {
Long[] idList = windowBusinessEntities.stream().map(item -> item.getId()).toArray(Long[]::new);
//windowBusinessService.removeList(windowBusinessEntities, context);
windowBusinessService.remove(idList, context);
}
//级联删除窗口事项 //级联删除窗口事项
WindowMatterQuery windowMatterQuery = new WindowMatterQuery(); WindowMatterQuery windowMatterQuery = new WindowMatterQuery();
windowMatterQuery.setWindowIdList(Arrays.asList(ids)); windowMatterQuery.setWindowIdList(Arrays.asList(ids));
List<WindowMatterEntity> windowMatterEntities = windowMatterService.find(windowMatterQuery); List<WindowMatterEntity> windowMatterEntities = windowMatterService.find(windowMatterQuery);
windowMatterService.removeList(windowMatterEntities, context); log.info("remove windowMatterEntities size:{}",windowMatterEntities.size());
if (!ObjectUtils.isEmpty(windowMatterEntities)) {
Long[] idList = windowMatterEntities.stream().map(item -> item.getId()).toArray(Long[]::new);
windowMatterService.remove(idList, context);
//windowMatterService.removeList(windowMatterEntities, context);
}
} }
Arrays.asList(ids).forEach(id -> { Arrays.asList(ids).forEach(id -> {
pushChangeMsg(id); pushChangeMsg(id);
......
base-manager/src/test/java/com/mortals/httpclient/app/AppController.http
View file @ 13c22c40
...@@ -4,7 +4,7 @@ Content-Type: application/json ...@@ -4,7 +4,7 @@ Content-Type: application/json
{ {
"loginName":"admin", "loginName":"admin",
"password":"adsmile", "password":"ybsmzx@2023",
"securityCode":"8888" "securityCode":"8888"
} }
...@@ -87,7 +87,7 @@ Accept: application/json ...@@ -87,7 +87,7 @@ Accept: application/json
###自助终端应用删除 ###自助终端应用删除
GET {{baseUrl}}/app/delete?id=18 GET {{baseUrl}}/app/delete?id=14
Authorization: {{authToken}} Authorization: {{authToken}}
Accept: application/json Accept: application/json
......
base-manager/src/test/java/com/mortals/httpclient/http-client.env.json
View file @ 13c22c40
...@@ -21,5 +21,9 @@ ...@@ -21,5 +21,9 @@
"base-yibin-web": { "base-yibin-web": {
"baseUrl": "http://112.19.80.237:11078/base" "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
View file @ 13c22c40
...@@ -4,7 +4,7 @@ POST {{baseUrl}}/site/business/list ...@@ -4,7 +4,7 @@ POST {{baseUrl}}/site/business/list
Content-Type: application/json Content-Type: application/json
{ {
"idNotList": [11,18,17,14,27,26], "idNotList": [11,18,17,14,27,28],
"siteId": 1, "siteId": 1,
"page":1, "page":1,
"size":10 "size":10
......
base-manager/src/test/java/com/mortals/httpclient/system/system.http
View file @ 13c22c40
...@@ -103,4 +103,10 @@ GET {{baseUrl}}/test/syncDept ...@@ -103,4 +103,10 @@ GET {{baseUrl}}/test/syncDept
Accept: application/json 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
View file @ 13c22c40
...@@ -4,7 +4,7 @@ POST {{baseUrl}}/window/business/list ...@@ -4,7 +4,7 @@ POST {{baseUrl}}/window/business/list
Content-Type: application/json Content-Type: application/json
{ {
"windowIdList":[3,4,5], "siteBusinessId":58,
"page":1, "page":1,
"size":10 "size":10
} }
......
portal-manager-ui/admin/src/api/dataAdmin.js
View file @ 13c22c40
...@@ -7,23 +7,97 @@ export function censusListInterface(params) { ...@@ -7,23 +7,97 @@ export function censusListInterface(params) {
} }
/* 排号机部分 */
//排号机列表数据 //排号机列表数据
export function getTaskList(params){ export function getTaskList(params) {
return http.get(`${BASEURL}/admin/take/takelist`,params) return http.get(`${BASEURL}/admin/take/takelist`, params)
} }
//排队办理记录报表接口 //排队办理记录报表接口
export function getQueueData(params){ export function getQueueData(params) {
return http.post(`${BASEURL}/inter/reportform/quelist`,params) return http.post(`${BASEURL}/inter/reportform/quelist`, params)
} }
//排号记录详情 //排号记录详情
export function getQueueInfo(params){ export function getQueueInfo(params) {
return http.post(`${BASEURL}/inter/reportform/queinfo`,params) return http.post(`${BASEURL}/inter/reportform/queinfo`, params)
} }
//业务事项关联 //业务事项关联
export function getBusinessEvent(params){ export function getBusinessEvent(params) {
return http.post(`${baseURL}/basics_api/base/business/matter/list`,params) return http.get(`${BASEURL}/inter/reportform/busanalyse`, params)
} }
//查询业务人员信息 //查询业务人员信息
<<<<<<< HEAD
export function getWorkerInfo(params){ export function getWorkerInfo(params){
return http.get(`${baseURL}/basics_api/base/workman/info`,params) return http.get(`${baseURL}/basics_api/base/workman/info`,params)
} }
//评价数据列表
export function getEvaList(params){
return http.post(`${BASEURL}/bkb/evaluate/evaluatelist`,params)
}
// 评价数据详情
export function getEvaData(params){
return http.get(`${BASEURL}/bkb/evaluate/evaluatinfo`,params)
}
// 评价数据删除
export function getEvaDetil(params){
return http.get(`${BASEURL}/bkb/evaluate/evaluatedl`,params)
}
// 排号评价详情
export function getQueEvaData(params){
return http.get(`${BASEURL}/bkb/evaluate/queEvaluateInfo`,params)
}
// 短信月度账单
export function getSMSList(params){
return http.get(`${BASEURL}/inter/Recharge/smsMonthList`,params)
}
// 网络理政列表
export function getWLLZList(params){
return http.get(`${BASEURL}/wllz/index/list`,params)
}
// 网络理政统计
export function getWLLZCount(params){
return http.post(`${BASEURL}/wllz/complainapi/statisticsComplain`,params)
}
// 网络理政详情
export function getWLLZInfo(params){
return http.get(`${BASEURL}/wllz/index/complainInfo`,params)
}
// 样表列表
export function getBillList(params) {
return http.post(`${baseURL}/sampleform/sample/bill/list`, 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
View file @ 13c22c40
...@@ -6,7 +6,6 @@ export default { ...@@ -6,7 +6,6 @@ export default {
nowWeek: "", nowWeek: "",
timer: null, timer: null,
tableLoading: false, tableLoading: false,
tablePagination: { tablePagination: {
current: 1, current: 1,
pageSize: 10, pageSize: 10,
...@@ -16,11 +15,9 @@ export default { ...@@ -16,11 +15,9 @@ export default {
showTotal: (total, range) => `共${total}条`, showTotal: (total, range) => `共${total}条`,
pageSizeOptions: ["10", "20", "30"], pageSizeOptions: ["10", "20", "30"],
}, },
tableSourceData: [], tableSourceData: [],
tableSelectedRows: [], //选中的数据 tableSelectedRows: [], //选中的行数据
tableSelectedKeys: [], //选中的id tableSelectedKeys: [], //选中的id
sourceInfoForm: {}, sourceInfoForm: {},
} }
}, },
...@@ -39,25 +36,24 @@ export default { ...@@ -39,25 +36,24 @@ export default {
}, },
methods: { methods: {
//导出 //导出
exportTable() { exportTable(tHeader, filterVal, transformText) {
let tableData = []; console.log(tHeader, filterVal)
let tableData = []; //列表数据
if (this.tableSelectedRows.length == 0) { if (this.tableSelectedRows.length == 0) {
tableData = JSON.parse(JSON.stringify(this.tableSourceData)); tableData = this.downAllData()
} else { } else {
tableData = JSON.parse(JSON.stringify(this.tableSelectedRows)); tableData = JSON.parse(JSON.stringify(this.tableSelectedRows));
} }
let tableColumns = JSON.parse(JSON.stringify(this.tableHeaders)); // let tableColumns = JSON.parse(JSON.stringify(this.tableHeaders));
let newTableData = tableData.map(item => { console.log('表格数据', tableData)
let obj = {}; // console.log('表头内容', tableColumns)
for (let key in item) { // let newTableData = tableData.map(item => {
obj[key] = item[key]; // // console.log(item)
} // })
return obj;
})
let exprotExcelName = `${this.nowDay} / ${this.nowTime} / ${this.$route['meta']['title'] || '报表信息统计'}`; 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(tableColumns);
// console.log(tableData); // console.log(tableData);
// console.log(exprotExcelName); // console.log(exprotExcelName);
...@@ -67,6 +63,7 @@ export default { ...@@ -67,6 +63,7 @@ export default {
for (let i = 0; i < tableColumns.length; i++) { for (let i = 0; i < tableColumns.length; i++) {
for (let key in item) { for (let key in item) {
if (tableColumns[i]["dataIndex"] == key) { if (tableColumns[i]["dataIndex"] == key) {
console.log(tableColumns[i]["dataIndex"])
if (j == 0) { if (j == 0) {
exportHeaderName.push(tableColumns[i]["title"]); exportHeaderName.push(tableColumns[i]["title"]);
} }
...@@ -87,8 +84,8 @@ export default { ...@@ -87,8 +84,8 @@ export default {
{ {
sheetData: exportData, sheetData: exportData,
sheetName: "sheet", sheetName: "sheet",
sheetHeader: exportHeaderName, sheetHeader: tHeader,
sheetFilter: exportHeaderName, sheetFilter: tHeader,
}, },
]; ];
let toExcel = new this.$ExportJsonExcel(option); let toExcel = new this.$ExportJsonExcel(option);
...@@ -105,7 +102,8 @@ export default { ...@@ -105,7 +102,8 @@ export default {
onSelectChange(selectedRowKeys, selectedRows) { onSelectChange(selectedRowKeys, selectedRows) {
this.tableSelectedKeys = selectedRowKeys; this.tableSelectedKeys = selectedRowKeys;
this.tableSelectedRows = selectedRows; this.tableSelectedRows = selectedRows;
// console.log(this.tableSelectedKeys, this.tableSelectedRows); // console.log('选中的ID', this.tableSelectedKeys);
// console.log('选中的行数据', this.tableSelectedRows);
}, },
pagTableChange(pagination) { pagTableChange(pagination) {
......
portal-manager-ui/admin/src/views/dataAdmin/components/SMS/SMSRecord.vue
View file @ 13c22c40
...@@ -2,25 +2,19 @@ ...@@ -2,25 +2,19 @@
<div class="callRecord-Container"> <div class="callRecord-Container">
<div class="header_box"> <div class="header_box">
<div> <div>
<a-button type="success" @click="exportTable"> <a-button type="success" @click="toexportTable">
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span> <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
</a-button> </a-button>
<b>累计发送短信量：<i>589726条</i></b> <b>累计发送短信量：<i>{{allCount}}条</i></b>
</div> </div>
<span> <span>
<a-select default-value="001"> <a-space>
<!-- <a-select-option <a-select :value="nowSite" @change="changeSite">
v-for="(item, index) of selectOptions" <a-select-option v-for="item in siteList" :key="item.value" :value="item.value"> {{item.label}} </a-select-option>
:key="index"
:value="item.value"
>
{{ item.label }}
</a-select-option> -->
<a-select-option value="001"> 船山行政审批局 </a-select-option>
</a-select> </a-select>
<a-button type="primary">搜索</a-button> <a-button type="primary" @click="togetSMSList()">搜索</a-button>
</a-space>
</span> </span>
</div> </div>
<div class="main"> <div class="main">
...@@ -40,7 +34,7 @@ ...@@ -40,7 +34,7 @@
:dataSource="tableSourceData" :dataSource="tableSourceData"
> >
<template slot="operation" slot-scope="text, record, index"> <template slot="operation" slot-scope="text, record, index">
<a-button type="link">查看明细</a-button> <a-button type="link" @click="gotoSMSSystem()">查看明细</a-button>
</template> </template>
</a-table> </a-table>
</div> </div>
...@@ -49,6 +43,7 @@ ...@@ -49,6 +43,7 @@
<script> <script>
import table from "@/mixins/table"; import table from "@/mixins/table";
import {getSMSList} from "@/api/dataAdmin"
export default { export default {
mixins: [table], mixins: [table],
name: "PortalAdminVuePickUpRecord", name: "PortalAdminVuePickUpRecord",
...@@ -66,18 +61,18 @@ export default { ...@@ -66,18 +61,18 @@ export default {
{ {
title: "月度时间", title: "月度时间",
align: "center", align: "center",
dataIndex: "月度时间", dataIndex: "month",
}, },
{ {
title: "发送量", title: "发送量",
align: "center", align: "center",
dataIndex: "发送量", dataIndex: "send_num",
}, },
{ {
title: "账单生成时间", title: "账单生成时间",
align: "center", align: "center",
dataIndex: "账单生成时间", dataIndex: "update_time",
}, },
{ {
...@@ -91,21 +86,99 @@ export default { ...@@ -91,21 +86,99 @@ export default {
}, },
], ],
searchName: undefined, searchName: undefined,
nowSite:null,
siteList:[],
allCount:0
}; };
}, },
components: {}, components: {},
mounted() { mounted() {
this.setMoment(); this.setMoment();
for (let key = 0; key < 20; key++) { this.getSiteData()
this.tableSourceData.push({ this.togetSMSList()
id: `00${key + 1}`, },
月度时间: `2022-0${key + 1}`, methods: {
发送量: `585${key + 1}`, //导出
账单生成时间: `2022-07-01 09:09:09`, toexportTable() {
let tableData = [];
if (this.tableSelectedRows.length == 0) {
// 获取表信息
getSMSList({
siteid:this.nowSite,
page:1,
size:-1,
}).then((res)=>{
const {code,data} = res
if(code==1){
tableData = JSON.parse(JSON.stringify(data.list.data));
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 exprotExcelName = `${this.nowDay} / ${this.nowTime} / ${this.$route['meta']['title'] || '报表信息统计'}`;
this.exportExcel(tableColumns, newTableData, exprotExcelName);
}
})
} 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 exprotExcelName = `${this.nowDay} / ${this.nowTime} / ${this.$route['meta']['title'] || '报表信息统计'}`;
this.exportExcel(tableColumns, newTableData, exprotExcelName);
}
},
gotoSMSSystem(){
window.location.href="http://sms.wx3.com.cn/admin"
},
changeSite(e){
this.nowSite = e
},
// 获取当前站点和站点列表
getSiteData(){
this.nowSite = JSON.parse(localStorage.getItem('siteId'))
this.siteList = []
JSON.parse(localStorage.getItem('siteList')).forEach(item => {
this.siteList.push({
label:item.siteName,
value:item.id
})
}); });
},
togetSMSList(){
// 获取表信息
getSMSList({
siteid:this.nowSite,
page:this.tablePagination.current,
size:this.tablePagination.pageSize,
}).then((res)=>{
const {code,data} = res
if(code==1){
console.log(res);
this.tableSourceData = data.list.data
this.allCount=data.all_num
this.tablePagination.total = data.list.total
}
})
} }
}, },
methods: {}, watch:{
tablePagination(){
this.togetSMSList()
}
}
}; };
</script> </script>
......
portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/components/HandlingDetails.vue
View file @ 13c22c40
...@@ -3,74 +3,157 @@ ...@@ -3,74 +3,157 @@
<a-drawer <a-drawer
:destroyOnClose="true" :destroyOnClose="true"
:title="modalInfo.title" :title="modalInfo.title"
:width="modalInfo.width" width="40%"
:visible="modalInfo.visible" :visible="modalInfo.visible"
@close="modalClose" @close="modalClose"
@getContainer="() => $refs.handling" @getContainer="() => $refs.handling"
> >
<div v-if="modalInfo.show==1">
<div class="headerInfo"> <div class="headerInfo">
<p> <p>
<span v-for="item of 3" <span>总耗时：{{queEvaData.alltime}}<i class="fa fa-long-arrow-down"></i></span>
>总耗时：13分15秒<i class="fa fa-long-arrow-down"></i <span>等待时间：{{queEvaData.waittime}}<i class="fa fa-long-arrow-down"></i></span>
></span> <span>办理时间：{{queEvaData.bltime}}<i class="fa fa-long-arrow-down"></i></span>
</p>
<p>
<span>平均耗时：{{queEvaData.p_alltime}}</span>
<span>平均等待时间：{{queEvaData.p_waittime}}</span>
<span>平均办理时间：{{queEvaData.p_bltime}}</span>
</p> </p>
<p><span v-for="item of 3">平均耗时：14分0秒</span></p>
</div> </div>
<div class="state">接件结束</div> <div class="state" v-if="queEvaData.style==0">未办理</div>
<div class="state" v-if="queEvaData.style==1">办理中</div>
<div class="state" v-if="queEvaData.style==4">办理完成</div>
<a-steps <a-steps
direction="vertical" direction="vertical"
size="small" size="small"
:current="approveLs.length" :current="3"
class="steps_box" class="steps_box"
> >
<!-- 排队中 -->
<a-step <a-step
v-for="(item, index) of approveLs"
:key="item.id"
:disabled="true" :disabled="true"
@click.stop="drawerchange(item.id)"
class="step_box" class="step_box"
v-if="queEvaData.style>=0"
> >
<div class="icon_box" slot="icon"></div> <div class="icon_box" slot="icon"></div>
<div class="title_box" slot="title"> <div class="title_box" slot="title">
<span class="title_name">{{ <span class="title_name">排队中</span>
item.status == 1
? "办理中"
: item.status == 2
? "接件结束"
: "排队中"
}}</span>
</div> </div>
<div <div
class="description_box" class="description_box"
slot="description" slot="description"
v-if="item.status == 0"
> >
<div class="details"> <div class="details">
<span v-for="item of 8"><i class="lable">申报人：</i>张三</span> <span><i class="lable">申报人：</i>{{queEvaData.people_name}}</span>
<span><i class="lable">取号时间:</i>{{queEvaData.taketime}}</span>
<span><i class="lable">排队编码：</i>{{queEvaData.flownum}}</span>
<span><i class="lable">取号方式：</i>{{queEvaData.wy_signin>0?'在线取号':'现场取号'}}</span>
<span><i class="lable">注册方式：</i>--</span>
<span><i class="lable">取号设备：</i>{{queEvaData.take_name}}</span>
</div> </div>
</div> </div>
</a-step>
<!-- 办理中 -->
<a-step
:disabled="true"
class="step_box"
v-if="queEvaData.style>=1"
>
<div class="icon_box" slot="icon"></div>
<div class="title_box" slot="title">
<span class="title_name">办理中</span>
</div>
<div <div
class="description_box" class="description_box"
slot="description" slot="description"
v-else-if="item.status == 1"
> >
<div class="details"> <div class="details">
<span v-for="item of 6"><i class="lable">办理窗口：</i>s003</span> <span><i class="lable">办理窗口：</i>{{queEvaData.window_name}}</span>
<span><i class="lable">办理开始时间：</i>{{queEvaData.bltime}}</span>
<span><i class="lable">工作人员：</i>{{queEvaData.workman_name}}</span>
<span><i class="lable">叫号设备：</i>{{queEvaData.calltime}}</span>
</div> </div>
</div> </div>
</a-step>
<!-- 接件结束 -->
<a-step
:disabled="true"
class="step_box"
v-if="queEvaData.style>=1"
>
<div class="icon_box" slot="icon"></div>
<div class="title_box" slot="title">
<span class="title_name">接件结束</span>
</div>
<div <div
class="description_box" class="description_box"
slot="description" slot="description"
v-else-if="item.status == 2"
> >
<div class="details"> <div class="details">
<span v-for="item of 2" <span><i class="lable">办理结束时间：</i>{{queEvaData.endtime}}</span>
><i class="lable">办理结束时间：</i>2021-01-15 12:00:00</span <span><i class="lable">评价选项：</i>{{queEvaData.option_id}}</span>
<span><i class="lable">评价时间：</i>{{queEvaData.pj_time}}</span>
<span style="width:100%"><i class="lable">评价指标：</i>
<i class="pjzb" v-for="(item,index) in queEvaData.content" :key="index">{{item}}</i>
</span>
<span><i class="lable">评价来源：</i>{{queEvaData.source}}</span>
<span><i class="lable">评价设备：</i>{{queEvaData.pj_name}}</span>
<span><i class="lable">评价人照片：</i>
<a-avatar v-if="!queEvaData.idcardData_PhotoFileName" shape="square" :size="40" icon="user" />
<img v-else :src="process.env.VUE_APP_API_BASE_URL+text" alt="" srcset="">
</span>
</div>
</div>
</a-step>
</a-steps>
</div>
<div v-else>
<a-steps
direction="vertical"
size="small"
:current="3"
class="steps_box"
> >
<!-- 评价 -->
<a-step
:disabled="true"
class="step_box"
>
<div class="icon_box" slot="icon"></div>
<div class="title_box" slot="title">
<span class="title_name">评价</span>
</div>
<div
class="description_box"
slot="description"
>
<div class="details">
<span><i class="lable">评价人：</i>{{queEvaData.idcard_Name}}</span>
<span><i class="lable">手机号:</i>{{queEvaData.phone}}</span>
<span><i class="lable">身份证号：</i>{{queEvaData.idcard_IDCardNo}}</span>
<span><i class="lable">窗口编号：</i>{{queEvaData.window_fronum}}</span>
<span><i class="lable">评价选项：</i>{{queEvaData.option_id}}</span>
<span><i class="lable">评价时间：</i>{{queEvaData.create_time}}</span>
<span style="width:100%"><i class="lable">评价指标：</i>
<i class="pjzb" v-for="(item,index) in queEvaData.content" :key="index">{{item}}</i>
</span>
<span><i class="lable">评价来源：</i>{{queEvaData.source}}</span>
<span><i class="lable">评价设备：</i>--</span>
<span>
<i class="lable">评价人照片：</i>
<a-avatar v-if="!queEvaData.idcardData_PhotoFileName" shape="square" :size="40" icon="user" />
<img v-else :src="process.env.VUE_APP_API_BASE_URL+text" alt="" srcset="">
</span>
</div> </div>
</div> </div>
</a-step> </a-step>
</a-steps> </a-steps>
</div>
</a-drawer> </a-drawer>
</div> </div>
</template> </template>
...@@ -83,20 +166,7 @@ export default { ...@@ -83,20 +166,7 @@ export default {
data() { data() {
return { return {
approveLs: [ queEvaData:{}
{
id: "001",
status: 0,
},
{
id: "002",
status: 1,
},
{
id: "003",
status: 2,
},
],
}; };
}, },
filters: { filters: {
...@@ -130,6 +200,20 @@ export default { ...@@ -130,6 +200,20 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.pjzb{
background: rgba(5, 149, 253, 0.1);
color: #0595FD;
border: 1px solid rgba(5, 149, 253, 1);
border-radius: 4px;
height: 24px;
line-height: 24px;
display: inline-block;
padding: 0 10px;
margin: 0 5px;
font-size: 12px;
text-align: center;
}
/deep/.ant-steps-icon { /deep/.ant-steps-icon {
top: -4px !important; top: -4px !important;
} }
......
portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/components/FormDetails.vue
View file @ 13c22c40
...@@ -10,61 +10,57 @@ ...@@ -10,61 +10,57 @@
</div> </div>
<div class="card"> <div class="card">
<div class="cardTitle">纠错标题 </div> <div class="cardTitle">纠错标题 </div>
<div class="cardContent">关于《四川省2022年公共卫生特别服务岗项目实施方案》(川卫发〔2022〕7号)的问题</div> <div class="cardContent">{{fromData.title}}</div>
</div> </div>
<div class="infoDetail"> <div class="infoDetail">
<div class="card"> <div class="card">
<div class="cardTitle">建议类型 </div> <div class="cardTitle">建议类型 </div>
<div class="cardContent">部门建议</div> <div class="cardContent">{{fromData.type==1?'部门建议':fromData.type==2?'办事建议':fromData.type==3?'网站建议':fromData.type==4?'我要就错':fromData.type==5?'我要投诉':'我要咨询'}}</div>
</div> </div>
<div class="card"> <div class="card">
<div class="cardTitle">真实姓名</div> <div class="cardTitle">真实姓名</div>
<div class="cardContent">刘昊然 </div> <div class="cardContent">{{fromData.upname}} </div>
</div> </div>
<div class="card"> <div class="card">
<div class="cardTitle"> 身份证号 </div> <div class="cardTitle"> 身份证号 </div>
<div class="cardContent"> 513821196302302154</div> <div class="cardContent">{{fromData.idcard}}</div>
</div> </div>
<div class="card"> <div class="card">
<div class="cardTitle"> 电子邮箱 </div> <div class="cardTitle"> 电子邮箱 </div>
<div class="cardContent">1512685492@qq.com</div> <div class="cardContent">{{fromData.upmail}}</div>
</div> </div>
</div> </div>
<div class="card"> <div class="card">
<div class="cardTitle"> 联系地址 </div> <div class="cardTitle"> 联系地址 </div>
<div class="cardContent">四川省成都市高新区天益街1号理想中心1708号</div> <div class="cardContent">{{fromData.address}}</div>
</div> </div>
<div class="card"> <div class="card">
<div class="cardTitle"> 事件发生地 </div> <div class="cardTitle"> 事件发生地 </div>
<div class="cardContent">四川省武侯区市武侯一路大地世纪6栋631号</div> <div class="cardContent">{{fromData.thing_address}}</div>
</div> </div>
<div class="card"> <div class="card">
<div class="cardTitle"> 具体内容 </div> <div class="cardTitle"> 具体内容 </div>
<div class="cardContent">《四川省2022年新冠肺炎疫情防控应急岗位招募实施方案》（川卫人教函〔2022〕84号）有关规定，（二）就业支持政策其中：7. <div class="cardContent">{{fromData.content}}</div>
享受应届毕业生相关政策。参加公卫特别岗项目前无工作经历的人员服务满3周年且年度考核合格的，两年内参加机关和企事业单位招录（聘）、自主创业、落户等方面可同等享受应届毕业生相关政策。问题：无工作经历的人员是指从大学毕业到考上本次岗位之间没有交社保为准吗？比如我毕业后找了份工作，而且有交社保一个月再辞职，然后考上本岗位是否能享受后面的应届毕业生身份？
</div>
</div> </div>
<div class="card"> <div class="card">
<div class="cardTitle"> 附件 </div> <div class="cardTitle"> 附件 </div>
<div class="cardContent"> <div class="cardContent" v-if="fromData.url">
<img src="@/assets/images/logo.png" alt=""> <img v-for="(item,index) in fromData.url" :key="index"
<img src="@/assets/images/logo.png" alt=""> :src="process.env.VUE_APP_API_BASE_URL+item">
<img src="@/assets/images/logo.png" alt="">
<img src="@/assets/images/logo.png" alt="">
</div> </div>
</div> </div>
<div class="infoDetail"> <div class="infoDetail">
<div class="card"> <div class="card">
<div class="cardTitle"> 是否公开 </div> <div class="cardTitle"> 是否公开 </div>
<div class="cardContent">否</div> <div class="cardContent">{{fromData.valid==1?'是':'否'}}</div>
</div> </div>
<div class="card"> <div class="card">
<div class="cardTitle"> 是否保密 </div> <div class="cardTitle"> 是否保密 </div>
<div class="cardContent">否</div> <div class="cardContent">{{fromData.secrecy==1?'是':'否'}}</div>
</div> </div>
<div class="card"> <div class="card">
<div class="cardTitle"> 提交日期 </div> <div class="cardTitle"> 提交日期 </div>
<div class="cardContent">2022-09-01 11:30:00 </div> <div class="cardContent">{{fromData.create_time}}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -78,17 +74,14 @@ ...@@ -78,17 +74,14 @@
所属部门<span>（非必选）</span> 所属部门<span>（非必选）</span>
</div> </div>
<div class="cardContent"> <div class="cardContent">
市税务局 {{fromData.deptName?fromData.deptName:"--"}}
</div> </div>
</div> </div>
<div class="card"> <div class="card">
<div class="cardTitle"> <div class="cardTitle">
回复内容<span>（必填）</span> 回复内容<span>（必填）</span>
</div> </div>
<div class="cardContent"> <div class="cardContent"></div>
《四川省2022年新冠肺炎疫情防控应急岗位招募实施方案》（川卫人教函〔2022〕84号）有关规定，（二）就业支持政策其中：7.
享受应届毕业生相关政策。参加公卫特别岗项目前无工作经历的人员服务满3周年且年度考核合格的，两年内参加机关和企事业单位招录（聘）、自主创业、落户等方面可同等享受应届毕业生相关政策。问题：无工作经历的人员是指从大学毕业到考上本次岗位之间没有交社保为准吗？比如我毕业后找了份工作，而且有交社保一个月再辞职，然后考上本岗位是否能享受后面的应届毕业生身份？
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -116,6 +109,7 @@ export default { ...@@ -116,6 +109,7 @@ export default {
}, },
data() { data() {
return { return {
fromData:{}
}; };
}, },
methods: { methods: {
......
portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/components/businessInfo.vue
View file @ 13c22c40
...@@ -5,21 +5,23 @@ ...@@ -5,21 +5,23 @@
:getContainer="() => $refs.businessModal"> :getContainer="() => $refs.businessModal">
<div class="content"> <div class="content">
<h1>{{ title }}</h1> <h1>{{ title }}</h1>
<em>关联事项（{{ dataList.length }}）</em> <em v-if="dataList.matterlist">关联事项（{{ dataList.matterlist.length }}）</em>
<p> <p>
<!-- {{ item.shixiangmingcheng }} --> <template v-for="item in dataList.matterlist">
<p>{{ item }}</p>
</template>
</p> </p>
<h4> <h4>
<span>受理次数<br /><i>12</i></span> <span>受理次数<br /><i>{{ dataList.slcount }}</i></span>
<span>办结次数<br /><i>12</i></span> <span>办结次数<br /><i>{{ dataList.bjcount }}</i></span>
<span>好评率<br /><i>99%</i></span> <span>好评率<br /><i>{{ dataList.hplv }}</i></span>
</h4> </h4>
</div> </div>
<template slot="footer"> <template slot="footer">
<a-button type="primary" ghost @click="lookDetails">查看业务分析</a-button> <a-button type="primary" ghost @click="lookDetails">查看业务分析</a-button>
</template> </template>
</a-modal> </a-modal>
</div> </div>
</template> </template>
<script> <script>
...@@ -33,7 +35,6 @@ export default { ...@@ -33,7 +35,6 @@ export default {
dataList: [] dataList: []
}; };
}, },
mounted() { }, mounted() { },
methods: { methods: {
lookDetails() { lookDetails() {
......
portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/components/userInfo.vue
View file @ 13c22c40
...@@ -11,26 +11,26 @@ ...@@ -11,26 +11,26 @@
:getContainer="() => $refs.userModal" :getContainer="() => $refs.userModal"
> >
<div class="content"> <div class="content">
<h1>{{ useInfo.name }}</h1> <h1>{{ dataList.people_name}}</h1>
<p> <p>
<span>{{ defaultInfoForm.Gender }}</span> <span>{{ dataList.people_sex }}</span>
<span>{{ defaultInfoForm.Age }}</span> <span>{{ dataList.age }}</span>
<span>{{ defaultInfoForm.Phone }}</span> <span>{{ dataList.people_phone }}</span>
</p> </p>
<h2> <h2>
<span <span
>预约次数<br /><i>{{ defaultInfoForm.yuyuecishu }}</i></span >预约次数<br /><i>{{ dataList.ordernum }}</i></span
> >
<span <span
>排队次数<br /><i>{{ defaultInfoForm.paiduicishu }}</i></span >排队次数<br /><i>{{ dataList.quenum }}</i></span
> >
<span <span
>关联业务<br /><i>{{ defaultInfoForm.guanlianyewu }}</i></span >关联业务<br /><i>{{ dataList.bus_num}}</i></span
> >
</h2> </h2>
</div> </div>
<template slot="footer"> <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 type="primary" ghost @click="openBlockchain"
>区块链信息</a-button >区块链信息</a-button
> >
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
name: "PortalAdminVueUserInfo", name: "PortalAdminVueUserInfo",
data() { data() {
return { return {
useInfo:[] dataList:[],
}; };
}, },
components: { components: {
...@@ -58,7 +58,8 @@ export default { ...@@ -58,7 +58,8 @@ export default {
mounted() {}, mounted() {},
methods: { methods: {
openBlockchain() { 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
View file @ 13c22c40
...@@ -14,15 +14,15 @@ ...@@ -14,15 +14,15 @@
<span><i class="lable">工号：</i>{{ infoData.number || "--" }}</span> <span><i class="lable">工号：</i>{{ infoData.number || "--" }}</span>
<span><i class="lable">所属部门：</i>{{ infoData.deptName || "--" }}</span> <span><i class="lable">所属部门：</i>{{ infoData.deptName || "--" }}</span>
<span><i class="lable">政治面貌：</i>{{ $codeMap.politicalStatus[infoData.politicalstatus] || "--" }}</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.mobile || "--" }}</span>
<span><i class="lable">星级：</i>{{ infoData.starlevel || "--" }}</span> <span><i class="lable">星级：</i>{{ infoData.starlevel +'星' || "--" }} </span>
</div> </div>
</div> </div>
</div> </div>
<h2> <h2>
<span>受理业务<br /><i>{{ "--" }}</i></span> <span>受理业务<br /><i>{{ infoData.slbusiness || "0" }}</i></span>
<span>评价次数<br /><i>{{ "--" }}</i></span> <span>评价次数<br /><i>{{ infoData.pjnum || "0" }}</i></span>
<span>好评率<br /><i>{{ "--" }}</i></span> <span>好评率<br /><i>{{ infoData.hplv || "0" }}</i></span>
</h2> </h2>
</div> </div>
<template slot="footer"> <template slot="footer">
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</template> </template>
</a-modal> </a-modal>
<Blockchain ref="Blockchain" /> <Blockchain ref="Blockchain" />
</div> </div>
</template> </template>
<script> <script>
...@@ -98,7 +98,7 @@ export default { ...@@ -98,7 +98,7 @@ export default {
.lable { .lable {
display: inline-block; display: inline-block;
font-style: normal; font-style: normal;
width: 100px; width: 70px;
text-align: right; text-align: right;
} }
} }
......
portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/queueRecord.vue
View file @ 13c22c40
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<div class="queueRecord-Container"> <div class="queueRecord-Container">
<div class="header_box"> <div class="header_box">
<div> <div>
<a-button type="success" @click="exportTable"> <a-button type="success" @click="exportTable(tHeader, filterVal, style, downAllData)">
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span> <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
</a-button> </a-button>
<b>叫号次数：<i>{{ tablePagination.total }}</i>次</b> <b>叫号次数：<i>{{ tablePagination.total }}</i> 次</b>
<sub>统计时间段：{{ searchForm.time[0] }}~{{ searchForm.time[1] }}</sub> <sub>统计时间段：{{ searchForm.time[0] }}~{{ searchForm.time[1] }}</sub>
</div> </div>
<span> <span>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</template> </template>
<!-- 办理业务 --> <!-- 办理业务 -->
<template slot="business" slot-scope="text"> <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> <span v-else>--</span>
</template> </template>
<!-- 办理开始时间 --> <!-- 办理开始时间 -->
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<WorkpeopleInfo ref="WorkpeopleInfo" /> <WorkpeopleInfo ref="WorkpeopleInfo" />
<HandlingDetails ref="HandlingDetails" /> <HandlingDetails ref="HandlingDetails" />
</div> </div>
</div> </div>
</template> </template>
<script> <script>
...@@ -109,7 +109,10 @@ import UserInfo from "./components/userInfo.vue"; ...@@ -109,7 +109,10 @@ import UserInfo from "./components/userInfo.vue";
import BusinessInfo from "./components/businessInfo.vue"; import BusinessInfo from "./components/businessInfo.vue";
import WorkpeopleInfo from "./components/workpeopleInfo.vue"; import WorkpeopleInfo from "./components/workpeopleInfo.vue";
import HandlingDetails from "./components/HandlingDetails.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 { export default {
mixins: [table], mixins: [table],
name: "PortalAdminVueQueueRecord", name: "PortalAdminVueQueueRecord",
...@@ -209,6 +212,32 @@ export default { ...@@ -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: [], deviceData: [],
// 搜索数据 // 搜索数据
...@@ -235,6 +264,11 @@ export default { ...@@ -235,6 +264,11 @@ export default {
], ],
//Form数据列表 //Form数据列表
tableList: [], tableList: [],
obj: {
0: "排队中",
1: "办理中",
4: "办理完成",
},
}; };
}, },
components: { components: {
...@@ -289,8 +323,13 @@ export default { ...@@ -289,8 +323,13 @@ export default {
this.getQueueDataArr() this.getQueueDataArr()
}, },
//用户模态框 //用户模态框
openDeclarant(item) { async openDeclarant(item) {
console.log(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.title = "用户信息";
this.$refs.UserInfo.modalInfo.width = "25%"; this.$refs.UserInfo.modalInfo.width = "25%";
this.$refs.UserInfo.modalInfo.visible = true; this.$refs.UserInfo.modalInfo.visible = true;
...@@ -298,8 +337,8 @@ export default { ...@@ -298,8 +337,8 @@ export default {
//业务关联模块 //业务关联模块
async openBusiness(business, id) { async openBusiness(business, id) {
let siteId = localStorage.getItem('siteId') let siteId = localStorage.getItem('siteId')
await getBusinessEvent({ siteId, page: 1, size: -1, siteBusinessId: id }).then(res => { await getBusinessEvent({ businessid: id, time: this.searchForm.time }).then(res => {
this.$refs.BusinessInfo.dataList = res.data.data this.$refs.BusinessInfo.dataList = res.data
}) })
this.$refs.BusinessInfo.modalInfo.title = "业务分析"; this.$refs.BusinessInfo.modalInfo.title = "业务分析";
this.$refs.BusinessInfo.title = business this.$refs.BusinessInfo.title = business
...@@ -307,10 +346,15 @@ export default { ...@@ -307,10 +346,15 @@ export default {
}, },
//工作人员信息模态框 //工作人员信息模态框
async openWorkpeople(id) { async openWorkpeople(id) {
let a, b = {}
await getWorkerInfo({ id }).then(res => { await getWorkerInfo({ id }).then(res => {
console.log(res.data) a = res.data
this.$refs.WorkpeopleInfo.infoData = 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.title = "工作人员信息";
this.$refs.WorkpeopleInfo.modalInfo.visible = true; this.$refs.WorkpeopleInfo.modalInfo.visible = true;
}, },
...@@ -323,7 +367,17 @@ export default { ...@@ -323,7 +367,17 @@ export default {
this.$refs.HandlingDetails.modalInfo.title = "办理明细"; this.$refs.HandlingDetails.modalInfo.title = "办理明细";
this.$refs.HandlingDetails.modalInfo.visible = true; this.$refs.HandlingDetails.modalInfo.visible = true;
}, },
//获取全部数据
downAllData() {
getQueueData({
page: 1,
size: -1,
...this.searchForm,
}).then(res => {
return res
});
}
}, },
}; };
</script> </script>
......
portal-manager-ui/admin/src/views/dataAdmin/components/sampleRecordReport/sampleForm.vue
View file @ 13c22c40
...@@ -2,31 +2,31 @@ ...@@ -2,31 +2,31 @@
<div class="callRecord-Container"> <div class="callRecord-Container">
<div class="header_box"> <div class="header_box">
<div> <div>
<a-button type="success" @click="exportTable"> <a-button type="success" @click="toexportTable">
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span> <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
</a-button> </a-button>
<b>查看样表次数：<i>233次</i></b> <b>查看样表次数：<i>{{tablePagination.total}}次</i></b>
<sub>统计时间段：2020.09.09~2021.09.09</sub> <sub>统计时间段：{{BegindAndEndTime[0]}}~{{BegindAndEndTime[1]}}
</sub>
</div> </div>
<span> <span>
<a-input-group compact> <!-- <a-input-group compact> -->
<a-select default-value="Zhejiang" style="width:25%"> <a-select :default-value="1" style="width:25%" @change="changeSearchType">
<a-select-option value="Zhejiang"> <a-select-option :value="1">
按事项 按事项
</a-select-option> </a-select-option>
<a-select-option value="Jiangsu"> <a-select-option :value="2">
按材料 按材料
</a-select-option> </a-select-option>
</a-select> </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-icon slot="prefix" type="search" />
</a-input> </a-input>
</a-input-group> <!-- </a-input-group> -->
<a-range-picker format="YYYY年MM月DD日" class="range_picker_style" @change="rangePickerChange" <a-range-picker format="YYYY年MM月DD日" class="range_picker_style" @change="rangePickerChange">
v-model="BegindAndEndTime">
</a-range-picker> </a-range-picker>
<a-button type="primary">搜索</a-button> <a-button type="primary" @click="togetBillList">搜索</a-button>
</span> </span>
</div> </div>
<div class="main"> <div class="main">
...@@ -37,18 +37,18 @@ ...@@ -37,18 +37,18 @@
:columns="tableHeaders" :dataSource="tableSourceData"> :columns="tableHeaders" :dataSource="tableSourceData">
<template slot="事项名称" slot-scope="text, record, index"> <template slot="事项名称" slot-scope="text, record, index">
<div> <div>
机动车登记证、行驶证核发 {{record.matterName}}
</div> </div>
<div class="tabFont"> <div class="tabFont">
事项全称：机动车登记证、行驶证审查、办理、核发 事项全称：{{record.matterFullName}}
</div> </div>
</template> </template>
<template slot="材料名称" slot-scope="text, record, index"> <template slot="材料名称" slot-scope="text, record, index">
<div> <div>
分公司登记申请书 {{record.materialName}}
</div> </div>
<div class="tabFont"> <div class="tabFont">
样表全称：分公司登记、变更、注销一张表申请书 样表全称：{{record.materialFullName}}
</div> </div>
</template> </template>
</a-table> </a-table>
...@@ -58,6 +58,8 @@ ...@@ -58,6 +58,8 @@
<script> <script>
import table from "@/mixins/table"; import table from "@/mixins/table";
import { getBillList } from "@/api/dataAdmin";
export default { export default {
mixins: [table], mixins: [table],
...@@ -75,16 +77,16 @@ export default { ...@@ -75,16 +77,16 @@ export default {
}, },
{ {
title: "事项名称", title: "事项名称",
// align: "center", align: "center",
dataIndex: "事项名称", dataIndex: "matterName",
scopedSlots: { scopedSlots: {
customRender: "事项名称", customRender: "事项名称",
}, },
}, },
{ {
title: "材料名称", title: "材料名称",
// align: "center", align: "center",
dataIndex: "材料名称", dataIndex: "materialName",
scopedSlots: { scopedSlots: {
customRender: "材料名称", customRender: "材料名称",
}, },
...@@ -92,12 +94,12 @@ export default { ...@@ -92,12 +94,12 @@ export default {
{ {
title: "设备名称", title: "设备名称",
align: "center", align: "center",
dataIndex: "设备名称", dataIndex: "deviceName",
}, },
{ {
title: "操作时间", title: "操作时间",
align: "center", align: "center",
dataIndex: "操作时间", dataIndex: "operTime",
}, },
{ {
title: "查看时间", title: "查看时间",
...@@ -105,8 +107,10 @@ export default { ...@@ -105,8 +107,10 @@ export default {
dataIndex: "查看时间", dataIndex: "查看时间",
}, },
], ],
BegindAndEndTime: [], BegindAndEndTime: [],//时间段
searchName: undefined, searchName: undefined,
searchType:1,
siteId:undefined,
}; };
}, },
components: { components: {
...@@ -114,18 +118,90 @@ export default { ...@@ -114,18 +118,90 @@ export default {
}, },
mounted() { mounted() {
this.setMoment(); this.setMoment();
for (let key = 0; key < 20; key++) { this.BegindAndEndTime=[this.$moment(new Date()).format("YYYY-MM-DD"),this.$moment(new Date()).format("YYYY-MM-DD")]
this.tableSourceData.push({ this.siteId = localStorage.getItem('siteId')
id: `00${key + 1}`, this.togetBillList()
设备名称: `一楼样表填单机`,
操作时间: `2021-09-09 09:09:09${key + 1}`,
查看时间: `10分20秒`,
});
}
}, },
methods: { methods: {
//导出
toexportTable() {
let tableData = [];
if (this.tableSelectedRows.length == 0) {
let pramse = {
page:1,
size:-1,
siteId:this.siteId,
matterName:"%%",
materialName:"%%",
operTimeStart:this.BegindAndEndTime[0],
operTimeEnd:this.BegindAndEndTime[1]
}
if(this.searchType==1 && this.searchName){
pramse.matterName = '%'+this.searchName+'%'
}else if(this.searchName){
pramse.materialName='%'+this.searchName+'%'
}
getBillList(pramse).then((res)=>{
const{code,data} = res;
if(code == 1){
tableData = JSON.parse(JSON.stringify(data.data));
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 exprotExcelName = `${this.nowDay} / ${this.nowTime} / ${this.$route['meta']['title'] || '报表信息统计'}`;
this.exportExcel(tableColumns, newTableData, exprotExcelName);
}
})
} 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 exprotExcelName = `${this.nowDay} / ${this.nowTime} / ${this.$route['meta']['title'] || '报表信息统计'}`;
this.exportExcel(tableColumns, newTableData, exprotExcelName);
}
},
togetBillList(){
let pramse = {
page:this.tablePagination.current,
size:this.tablePagination.pageSize,
siteId:this.siteId,
matterName:"%%",
materialName:"%%",
operTimeStart:this.BegindAndEndTime[0],
operTimeEnd:this.BegindAndEndTime[1]
}
if(this.searchType==1 && this.searchName){
pramse.matterName = '%'+this.searchName+'%'
}else if(this.searchName){
pramse.materialName='%'+this.searchName+'%'
}
getBillList(pramse).then((res)=>{
const{code,data} = res;
if(code==1){
this.tableSourceData = data.data
this.tablePagination.total = data.total
}
})
},
changeSearchType(val){
this.searchType = val
},
rangePickerChange(val) { rangePickerChange(val) {
console.log(val); this.BegindAndEndTime=[this.$moment(val[0]).format("YYYY-MM-DD"),this.$moment(val[1]).format("YYYY-MM-DD")]
}, },
QueueState(type) { QueueState(type) {
......
portal-manager/pom.xml
View file @ 13c22c40
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<profiles.log.level>INFO</profiles.log.level> <profiles.log.level>INFO</profiles.log.level>
<profiles.log.path>/home/mortals/app/logs</profiles.log.path> <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<package.environment>yibin</package.environment> <package.environment>yibin</package.environment>
<skipUi>false</skipUi> <skipUi>true</skipUi>
</properties> </properties>
</profile> </profile>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment