Skip to content

S
smart_gov_platform
Commit ffd80170 authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 38591d4e a9d6544d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 357 additions and 182 deletions
portal-manager-ui/admin/src/api/dataAdmin.js
View file @ ffd80170
...@@ -7,23 +7,46 @@ export function censusListInterface(params) { ...@@ -7,23 +7,46 @@ 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)
} }
//查询业务人员信息 //查询业务人员信息
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 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)
}
portal-manager-ui/admin/src/mixins/table.js
View file @ ffd80170
...@@ -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/queueCall/components/businessInfo.vue
View file @ ffd80170
...@@ -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 @ ffd80170
...@@ -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 @ ffd80170
...@@ -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 @ ffd80170
...@@ -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/dataAdmin.vue
View file @ ffd80170
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<li class="skip_list"> <li class="skip_list">
<p class="top">聚焦协同<span>FOCUS ON TEAMWORK</span></p> <p class="top">聚焦协同<span>FOCUS ON TEAMWORK</span></p>
<ul class="content"> <ul class="content">
<!-- <template v-for="itm of CensusType_2"> <template v-for="itm of CensusType_2">
<li <li
class="content_list" class="content_list"
:key="itm.id" :key="itm.id"
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<li class="content_list" @click="pushRouter11">样表记录报表</li> <li class="content_list" @click="pushRouter11">样表记录报表</li>
<li class="content_list" @click="pushRouter12">填单记录样表</li> <li class="content_list" @click="pushRouter12">填单记录样表</li>
<li class="content_list" @click="pushRouter13">微官网注册报表</li> <li class="content_list" @click="pushRouter13">微官网注册报表</li>
<li class="content_list" @click="pushRouter14">网络理政报表</li> --> <li class="content_list" @click="pushRouter14">网络理政报表</li>
</ul> </ul>
<p class="bottom">协同类数据分析<a-icon type="swap-right" /></p> <p class="bottom">协同类数据分析<a-icon type="swap-right" /></p>
</li> </li>
......
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