zcdsj
/
cma_search
mirror of https://e.coding.net/ctcdevteam/cma_search.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

文案更改以及其他一些小改动

This commit is contained in:
shijing 2023-06-26 10:35:00 +08:00
parent 6bba84dbef
commit dd54864b23
5 changed files with 53 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/store/getters.js
View File

@ -4,6 +4,7 @@ const getters = {
token: state => state.user.token, token: state => state.user.token,
avatar: state => state.user.avatar, avatar: state => state.user.avatar,
dept: state => state.user.dept, dept: state => state.user.dept,
dept_name: state => state.user.dept_name,
name: state => state.user.name, name: state => state.user.name,
perms: state => state.user.perms, perms: state => state.user.perms,
permission_routes: state => state.permission.routes permission_routes: state => state.permission.routes

12
client/src/store/modules/user.js
View File

@ -8,7 +8,8 @@ const getDefaultState = () => {
name: '', name: '',
avatar: '', avatar: '',
perms: [], perms: [],
dept:'' dept:'',
dept_name:'',
} }
} }
@ -32,7 +33,10 @@ const mutations = {
}, },
SET_DEPT: (state, dept) => { SET_DEPT: (state, dept) => {
state.dept = dept state.dept = dept
} },
SET_DEPTNAME: (state, dept_name) => {
state.dept_name = dept_name
},
} }
const actions = { const actions = {
@ -51,6 +55,7 @@ const actions = {
}) })
}) })
}, },
fulllogin({ commit }, userInfo) { fulllogin({ commit }, userInfo) {
const { username, password } = userInfo const { username, password } = userInfo
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@ -104,7 +109,7 @@ const actions = {
reject('验证失败,重新登陆.') reject('验证失败,重新登陆.')
} }
const { perms, name, avatar, dept } = data const { perms, name, avatar, dept, dept_name} = data
// perms must be a non-empty array // perms must be a non-empty array
if (!perms || perms.length <= 0) { if (!perms || perms.length <= 0) {
@ -115,6 +120,7 @@ const actions = {
commit('SET_NAME', name) commit('SET_NAME', name)
commit('SET_AVATAR', avatar) commit('SET_AVATAR', avatar)
commit('SET_DEPT', dept) commit('SET_DEPT', dept)
commit('SET_DEPTNAME', dept_name)
resolve(data) resolve(data)
}).catch(error => { }).catch(error => {
reject(error) reject(error)

12
client/src/views/supervisionNew/basicGoalDept.vue
View File

@ -65,6 +65,7 @@
page: 0, page: 0,
year:'', year:'',
goal_key__in:'pgoal_1,pgoal_2,pgoal_3,pgoal_4,pgoal_5', goal_key__in:'pgoal_1,pgoal_2,pgoal_3,pgoal_4,pgoal_5',
belong_dept__in:''
}, },
taskList:[], taskList:[],
heightTable:null, heightTable:null,
@ -72,7 +73,7 @@
}; };
}, },
mounted(){ mounted(){
this.getList(); this.getOrgList();
let height = document.getElementsByClassName('app-main')[0].clientHeight; let height = document.getElementsByClassName('app-main')[0].clientHeight;
this.heightTable = height-90; this.heightTable = height-90;
}, },
@ -84,8 +85,9 @@
if (that.checkPermission(["record_confirm"])) { if (that.checkPermission(["record_confirm"])) {
getOrgList({ can_supervision: true }).then((res) => { getOrgList({ can_supervision: true }).then((res) => {
let data = res.data; let data = res.data;
debugger;
for(let i=0;i<data.length;i++){ for(let i=0;i<data.length;i++){
ids= ids+item.id+','; ids= ids+data[i].id+',';
} }
that.listQuery.belong_dept__in=ids; that.listQuery.belong_dept__in=ids;
that.getList(); that.getList();
@ -93,8 +95,9 @@
} else { } else {
getSubOrgList().then((res) => { getSubOrgList().then((res) => {
let data = res.data; let data = res.data;
debugger;
for(let i=0;i<data.length;i++){ for(let i=0;i<data.length;i++){
ids= ids+item.id+','; ids= ids+data[i].id+',';
} }
that.listQuery.belong_dept__in=ids; that.listQuery.belong_dept__in=ids;
that.getList(); that.getList();
@ -111,7 +114,8 @@
let date = new Date(); let date = new Date();
that.listQuery.year = date.getFullYear()+''; that.listQuery.year = date.getFullYear()+'';
} }
that.listQuery.page=0;
console.log(that.listQuery)
getPgoalDeptList(that.listQuery).then((res) => { getPgoalDeptList(that.listQuery).then((res) => {
if (res.data) { if (res.data) {
let data0 = res.data; let data0 = res.data;

19
client/src/views/supervisionNew/mytask.vue
View File

@ -5,7 +5,7 @@
<el-card :style="{height:leftHeight+'px'}" class="leftCard"> <el-card :style="{height:leftHeight+'px'}" class="leftCard">
<h5>任务列表</h5> <h5>任务列表</h5>
<el-select <el-select
v-model="listQuery.dept" v-model="listQuery.belong_dept"
placeholder="报送部门" placeholder="报送部门"
@change="handleFilter" @change="handleFilter"
> >
@ -151,7 +151,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<div style="display:flex;position:relative"> <div style="display:flex;position:relative">
<span style="display: inline-block;line-height: 33px;">公司文件：</span> <span style="display: inline-block;line-height: 33px;">相应实施细则：</span>
<el-upload <el-upload
ref="upload1" ref="upload1"
:action="upUrl" :action="upUrl"
@ -653,7 +653,7 @@ import user from "@/store/modules/user";
}, },
listQuery:{ listQuery:{
page: 1, page: 1,
dept:null, belong_dept:null,
page_size: 20, page_size: 20,
}, },
typeOptions:{ typeOptions:{
@ -713,7 +713,7 @@ import user from "@/store/modules/user";
mounted(){ mounted(){
let height1 = document.getElementsByClassName('app-main')[0].clientHeight; let height1 = document.getElementsByClassName('app-main')[0].clientHeight;
this.leftHeight = height1-15; this.leftHeight = height1-15;
this.listQuery.dept =this.$store.getters.dept; this.listQuery.belong_dept =this.$store.getters.dept;
this.getOrgList(); this.getOrgList();
this.getList(); this.getList();
}, },
@ -725,7 +725,7 @@ import user from "@/store/modules/user";
getOrgList({ can_supervision: true }).then((res) => { getOrgList({ can_supervision: true }).then((res) => {
that.orgData = res.data; that.orgData = res.data;
that.orgData.filter(item=>{ that.orgData.filter(item=>{
if(item.id==that.listQuery.dept){ if(item.id==that.listQuery.belong_dept){
that.deptName = item.name; that.deptName = item.name;
} }
}) })
@ -734,7 +734,7 @@ import user from "@/store/modules/user";
getSubOrgList().then((res) => { getSubOrgList().then((res) => {
that.orgData = res.data; that.orgData = res.data;
that.orgData.filter(item=>{ that.orgData.filter(item=>{
if(item.id==that.listQuery.dept){ if(item.id==that.listQuery.belong_dept){
that.deptName = item.name; that.deptName = item.name;
} }
}) })
@ -747,8 +747,7 @@ import user from "@/store/modules/user";
this.dataList.count =0; this.dataList.count =0;
getMyTask2Do(this.listQuery).then((response) => { getMyTask2Do(this.listQuery).then((response) => {
if (response.data) { if (response.data) {
this.dataList.results = response.data; this.dataList = response.data;
this.dataList.count = response.data.length;
} }
this.listLoading = false; this.listLoading = false;
}); });
@ -767,7 +766,7 @@ import user from "@/store/modules/user";
that.numbers.num_issue = ''; that.numbers.num_issue = '';
that.listQuery.page = 1; that.listQuery.page = 1;
that.orgData.filter(item=>{ that.orgData.filter(item=>{
if(item.id==that.listQuery.dept){ if(item.id==that.listQuery.belong_dept){
that.deptName = item.name; that.deptName = item.name;
} }
}) })
@ -776,7 +775,7 @@ import user from "@/store/modules/user";
resetFilter() { resetFilter() {
this.listQuery = { this.listQuery = {
page: 1, page: 1,
search:'', belong_dept:'',
page_size: 20, page_size: 20,
} }
this.getList(); this.getList();

35
client/src/views/supervisionNew/statistics.vue
View File

@ -36,7 +36,7 @@
> >
</el-row> </el-row>
</el-card> </el-card>
<el-card style="margin-top:10px"> <el-card style="margin-top:6px">
<div ref="print" id="myReport" class="printContainer"> <div ref="print" id="myReport" class="printContainer">
<!-- <el-table <!-- <el-table
ref="tableRef" ref="tableRef"
@ -71,8 +71,8 @@
<template slot-scope="scope" v-if="scope.row.all">{{ scope.row.all }}</template> <template slot-scope="scope" v-if="scope.row.all">{{ scope.row.all }}</template>
</el-table-column> </el-table-column>
</el-table> --> </el-table> -->
<h3 style="text-align: center;">{{ fileName }}</h3> <h3 style="text-align: center;">{{ deptName }}</h3>
<p v-if="fileName!==''" style="text-align: center;">{{ listQuery.task2__year }}年 1—12月质量目标双月报</p> <p v-if="deptName!==''" style="text-align: center;">{{ listQuery.task2__year }}年 1—12月质量目标双月报</p>
<table border="1" width="1000" cellspacing="0" :key="timeStamp" id="numTable"> <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="numTable">
<thead style="background: #efefef;height: 40px;"> <thead style="background: #efefef;height: 40px;">
<tr> <tr>
@ -310,7 +310,6 @@
], ],
orgData:[], orgData:[],
barChart1:null, barChart1:null,
bar1option:{},
barchart2:null, barchart2:null,
lineChart1:null, lineChart1:null,
lineChart2:null, lineChart2:null,
@ -332,16 +331,31 @@
}; };
}, },
mounted() { mounted() {
this.getGroup(); this.supTate = this.checkPermission(["record_confirm"]);
if(this.supTate ){
}else{
let date = new Date();
this.listQuery.task2__year = date.getFullYear()+'';
this.deptName = this.$store.getters.dept_name;
this.listQuery.belong_dept = this.$store.getters.dept;
this.handleFilter();
}
this.optionSet(); this.optionSet();
this.getGroup();
}, },
methods: { methods: {
belongDeptChange(a){ belongDeptChange(a){
this.fileName = '';
let selectItem = this.orgData.filter(item=>{ let selectItem = this.orgData.filter(item=>{
return item.id==a return item.id==a
}) })
this.deptName = selectItem[0].name; this.deptName = selectItem[0].name;
this.bar1Data=[];
this.bar2Data=[];
this.line1Data=[];
this.line2Data =[];
this.line3Data=[];
this.line4Data=[];
this.tableDatas=[[],[],[],[],[],[],[],[],[],[],[],[],[]];
}, },
optionSet(){ optionSet(){
let chartDom1 = document.getElementById('bar1'); let chartDom1 = document.getElementById('bar1');
@ -405,9 +419,11 @@
text: '报告/证书合格率(%)' text: '报告/证书合格率(%)'
}, },
tooltip: { tooltip: {
trigger: 'axis' trigger: 'axis',
}, },
legend: { legend: {
right:30,
data: ['报告/证书合格率'] data: ['报告/证书合格率']
}, },
grid: { grid: {
@ -454,6 +470,7 @@
trigger: 'axis' trigger: 'axis'
}, },
legend: { legend: {
right:30,
data: ['报告/证书及时率'] data: ['报告/证书及时率']
}, },
grid: { grid: {
@ -500,6 +517,7 @@
trigger: 'axis' trigger: 'axis'
}, },
legend: { legend: {
right:30,
data: ['能力验证满意率'] data: ['能力验证满意率']
}, },
grid: { grid: {
@ -546,6 +564,7 @@
trigger: 'axis' trigger: 'axis'
}, },
legend: { legend: {
right:30,
data: ['客户投诉处理满意率'] data: ['客户投诉处理满意率']
}, },
grid: { grid: {
@ -593,7 +612,6 @@
that.line2Data = []; that.line2Data = [];
that.line3Data = []; that.line3Data = [];
that.line4Data = []; that.line4Data = [];
that.fileName = that.deptName;
that.tableData1 = []; that.tableData1 = [];
that.tableDatas = [ [],[],[],[],[],[],[],[],[],[],[],[],[]]; that.tableDatas = [ [],[],[],[],[],[],[],[],[],[],[],[],[]];
getTask2Do(that.listQuery).then(res=>{ getTask2Do(that.listQuery).then(res=>{
@ -746,7 +764,6 @@
}else{ }else{
this.$message.warning('请选择部门') this.$message.warning('请选择部门')
} }
}, },
handlePrint() { handlePrint() {
this.$PRINT('#myReport'); this.$PRINT('#myReport');