elink-star
/
epmet-work-pc-chengyang
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'feature-xiaowang' into dev

feature
mk 1 year ago
parent
ac1d56d594 f9d0e4bdff
commit
8b64cd8ef4
5 changed files with 73 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      src/views/modules/shequzhili/Delivery/index.vue
  2. 3
      src/views/modules/shequzhili/analysis/css/index.scss
  3. 63
      src/views/modules/shequzhili/analysis/index.vue
  4. 15
      src/views/modules/shequzhili/event/cpts/process-form-complete.vue
  5. 13
      src/views/modules/shequzhili/eventHandling/index.vue

13
src/views/modules/shequzhili/Delivery/index.vue
View File

@ -128,11 +128,12 @@
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column prop="statusName" align="center" width="110" label="指派状态" :show-overflow-tooltip="true"> <el-table-column prop="statusName" align="center" width="110" label="指派状态" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.deliverystatus === 0">未指派</span> <span v-if="scope.row.status === 'unassigned'">未指派</span>
<span v-else-if="scope.row.deliverystatus ===1">已指派</span> <span v-else-if="scope.row.status ==='assigned'">已指派</span>
<span v-else>--</span> <span v-else-if="scope.row.status ==='closed_case'">已办结</span>
</template> --> <span v-else="scope.row.status ==='processing'">处理中</span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="operationTypeName" align="center" width="110" label="办理状态" :show-overflow-tooltip="true"> <el-table-column prop="operationTypeName" align="center" width="110" label="办理状态" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
@ -152,7 +153,7 @@
<!-- <el-button @click="handleDispose(scope.row)" type="text" size="small" class="">{{scope.row.deliverystatus==0?"派件":"办理"}}</el-button> <!-- <el-button @click="handleDispose(scope.row)" type="text" size="small" class="">{{scope.row.deliverystatus==0?"派件":"办理"}}</el-button>
--> -->
<el-button @click="handleDispose(scope.row,'dispose')" type="text" size="small" v-if="(scope.row.status == 'processing'|| scope.row.status === 'assigned') && scope.row.operationType === '5'">处理</el-button> <el-button @click="handleDispose(scope.row,'dispose')" type="text" size="small" v-if="(scope.row.status == 'processing'|| scope.row.status === 'assigned') && scope.row.operationType === '5'">处理</el-button>
<el-button @click="handleDispose(scope.row,'assign')" type="text" size="small" v-if="scope.row.status =='unassigned'">派件</el-button> <el-button @click="handleDispose(scope.row,'assign')" type="text" size="small" v-if="scope.row.status =='unassigned'||scope.row.status =='processing'">派件</el-button>
<el-button @click="handleDispose(scope.row,'check')" type="text" size="small" v-if="scope.row.operationType === '11'">审核</el-button> <el-button @click="handleDispose(scope.row,'check')" type="text" size="small" v-if="scope.row.operationType === '11'">审核</el-button>
</template> </template>
</el-table-column> </el-table-column>

3
src/views/modules/shequzhili/analysis/css/index.scss
View File

@ -136,6 +136,7 @@ border-left: #777 solid 1px;
color: #333333; color: #333333;
text-align: center; text-align: center;
margin-left: 5px; margin-left: 5px;
white-space: nowrap;
} }
.text1{ .text1{
font-size: 16px; font-size: 16px;
@ -179,6 +180,7 @@ border-left: #777 solid 1px;
color: #666666; color: #666666;
text-align: center; text-align: center;
margin-left: 5px; margin-left: 5px;
white-space: nowrap;
} }
.row_right { .row_right {
@ -345,6 +347,7 @@ border-left: #777 solid 1px;
color: #333333; color: #333333;
text-align: center; text-align: center;
margin-left: 5px; margin-left: 5px;
white-space: nowrap;
} }
.row_right { .row_right {

63
src/views/modules/shequzhili/analysis/index.vue
View File

@ -104,9 +104,10 @@
<div style="display: flex;justify-content: space-between;flex-direction:row;"> <div style="display: flex;justify-content: space-between;flex-direction:row;">
<h1 style="font-size: 24px; font-weight: bold;"> 事件类型统计 </h1> <h1 style="font-size: 24px; font-weight: bold;"> 事件类型统计 </h1>
</div> </div>
<el-table <!-- <el-table
:data="tableList" :data="tableList"
style="width: 100%;" style="width: 100%;"
height="300"
row-key="id" row-key="id"
border border
default-expand-all default-expand-all
@ -114,45 +115,63 @@
<el-table-column <el-table-column
prop="level1" prop="level1"
label="一级分类" label="一级分类"
sortable
width="150"> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="level2" prop="level2"
label="二级分类" label="二级分类"
sortable
width="150"> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="level3" prop="level3"
label="三级分类" label="三级分类"
sortable
width="150"> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="level4" prop="level4"
label="四级分类" label="四级分类"
sortable
width="150"> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="eventCount" prop="eventCount"
label="事件数量" label="事件数量"
sortable
width="150"> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="proportion" prop="proportion"
label="同级占比" label="同级占比"
sortable
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.proportion }}% {{ scope.row.proportion }}%
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table> -->
<el-table
:data="tableList"
style="width: 100%;margin-bottom: 20px;"
row-key="id"
border
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column
prop="categoryName"
label="事件类型">
</el-table-column>
<el-table-column
prop="eventCount"
label="事件数量">
</el-table-column>
<el-table-column
prop="proportion"
label="同级占比"
>
</el-table-column>
</el-table>
<div style="display: flex;justify-content: space-between;flex-direction:row; height:500px"> <div style="display: flex;justify-content: space-between;flex-direction:row; height:500px">
<div style="display: flex;width: 49%; flex-direction:column;"> <div style="display: flex;width: 49%; flex-direction:column;">
<h1 style="font-size: 24px; font-weight: bold; margin: 20px 0;"> 部门科室工单量统计 </h1> <h1 style="font-size: 24px; font-weight: bold; margin: 20px 0;"> 部门科室工单量统计 </h1>
@ -871,7 +890,8 @@ export default {
} }
const { data, code, msg } = await requestPost(url, param); const { data, code, msg } = await requestPost(url, param);
if (code === 0) { if (code === 0) {
this.tableList=this.flattenTree(data); this.tableList=data
// this.tableList=this.flattenTree(data);
console.log(this.tableList); console.log(this.tableList);
console.log(this.tableList,"lksdjfklj s"); console.log(this.tableList,"lksdjfklj s");
} else { } else {
@ -894,15 +914,14 @@ export default {
//获取前一个月的日期 //获取前一个月的日期
getLastMonthRange() { getLastMonthRange() {
const now = new Date(); const now = new Date();
const firstDayOfCurrentMonth = new Date(now.getFullYear(), now.getMonth(), 1); const startOfYear = new Date(now.getFullYear(), 0, 1); // 当前年份的1月1日
const lastDayOfLastMonth = new Date(firstDayOfCurrentMonth - 1); const endOfYear = new Date(now.getFullYear(), 11, 31); // 当前年份的12月31日
const firstDayOfLastMonth = new Date(lastDayOfLastMonth.getFullYear(), lastDayOfLastMonth.getMonth(), 1);
firstDayOfLastMonth.setHours(0, 0, 0, 0); startOfYear.setHours(0, 0, 0, 0);
lastDayOfLastMonth.setHours(23, 59, 59, 999); endOfYear.setHours(23, 59, 59, 999);
this.formData.queryDateStart =this.formatDate1(firstDayOfLastMonth), this.formData.queryDateStart =this.formatDate1(startOfYear),
this.formData.queryDateEnd=this.formatDate1(lastDayOfLastMonth) this.formData.queryDateEnd=this.formatDate1(endOfYear)
console.log(this.formData.queryDateEnd); console.log(this.formData.queryDateEnd);
}, },
//对部门进行统计 //对部门进行统计

15
src/views/modules/shequzhili/event/cpts/process-form-complete.vue
View File

@ -285,6 +285,20 @@ export default {
contactFailureList: [{ label: '已接通', value: 1 }, { label: '未接通', value: 0 }], contactFailureList: [{ label: '已接通', value: 1 }, { label: '未接通', value: 0 }],
coordinateList: [{ label: '配合', value: 0 }, { label: '未配合', value: 1 }], coordinateList: [{ label: '配合', value: 0 }, { label: '未配合', value: 1 }],
examineList: [{ label: '合格', value: 0 }, { label: '不合格', value: 1 }], examineList: [{ label: '合格', value: 0 }, { label: '不合格', value: 1 }],
satisfactionType : [
{
label: '满意',
value: 'perfect'
},
{
label: '基本满意',
value: 'good'
},
{
label: '不满意',
value: 'bad'
}
],
dataRule: { dataRule: {
content: [ content: [
{ required: true, message: "办理情况不能为空", trigger: "blur" }, { required: true, message: "办理情况不能为空", trigger: "blur" },
@ -354,6 +368,7 @@ export default {
console.log(newVal,'bianle'); console.log(newVal,'bianle');
if(this.pageType === 'check'){ if(this.pageType === 'check'){
this.formData = newVal; this.formData = newVal;
console.log(this.formData);
if(this.formData.internalFile){ if(this.formData.internalFile){
this.imgList = this.formData.internalFile.filter(item=>item.attachmentType==='image') this.imgList = this.formData.internalFile.filter(item=>item.attachmentType==='image')
this.audioList = this.formData.internalFile.filter(item=>item.attachmentType==='voice') this.audioList = this.formData.internalFile.filter(item=>item.attachmentType==='voice')

13
src/views/modules/shequzhili/eventHandling/index.vue
View File

@ -116,13 +116,14 @@
<el-table-column prop="limitTime" align="center" width="110" label="办结时限（部门）" :show-overflow-tooltip="true"> <el-table-column prop="limitTime" align="center" width="110" label="办结时限（部门）" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="statusName" align="center" width="110" label="办理状态" <el-table-column prop="status" align="center" width="110" label="办理状态"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
<!-- <template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.handlestatus === 0">联系当事人超期</span> <span v-if="scope.row.status === 'unassigned'">未指派</span>
<span v-else-if="scope.row.handlestatus ===1">部门办结超期</span> <span v-else-if="scope.row.status ==='assigned'">已指派</span>
<span v-else>--</span> <span v-else-if="scope.row.status ==='closed_case'">已办结</span>
</template> --> <span v-else="scope.row.status ==='processing'">处理中</span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="limitStatus" align="center" width="110" label="办理超期" <el-table-column prop="limitStatus" align="center" width="110" label="办理超期"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">

Write Preview
Loading…
Cancel
Save