Skip to content

W
workbook
提交 75a5bb04 authored 作者: 黄志强's avatar 黄志强
浏览文件
操作

修改11

上级 66fdac93
隐藏空白字符变更
内嵌 并排
正在显示 包含 116 行增加 和 56 行删除
src/axios/services.js
浏览文件 @ 75a5bb04
......@@ -199,8 +199,10 @@ const requests = {
})
},
putTaskWorkload(data) { // 修改工作量和系数
return axios(ip + '/job/work/upDate/Workload?msg=' + data.msg + '&userId=' + data.userId + '&workCoefficient=' + data.workCoefficient + '&workId=' + data.workId + '&workload=' + data.workload, {
method: 'put'
// ?msg=' + data.msg + '&userId=' + data.userId + '&workCoefficient=' + data.workCoefficient + '&workId=' + data.workId + '&workload=' + data.workload
return axios(ip + '/job/work/upDate/Workload', {
method: 'put',
data: data
})
},
putTaskUnpushToGoing(data) { // 未发布改为发布
......@@ -237,7 +239,7 @@ const requests = {
data: data
})
},
getScore(id) {
getScore(id) { // 获取考评数据
return axios(ip + '/job/sc/select?workId=' + id, {
method: 'post'
})
......
src/components/mainBreadcrumb.vue
浏览文件 @ 75a5bb04
......@@ -12,9 +12,10 @@
<el-breadcrumb-item v-if="currentRouter === '/unpublishedTask'" >未发布任务</el-breadcrumb-item>
<el-breadcrumb-item v-if="currentRouter === '/taskDetails'" >任务详情</el-breadcrumb-item>
<el-breadcrumb-item v-if="currentRouter === '/personManage' || currentRouter === '/personInfo' || currentRouter === '/personList' || currentRouter === '/personTask'" :to="{ path: '/personManage' }">人员管理</el-breadcrumb-item>
<el-breadcrumb-item v-if="currentRouter === '/personInfo'">个人信息</el-breadcrumb-item>
<el-breadcrumb-item v-if="currentRouter === '/personManage' || currentRouter === '/personDetails' || currentRouter === '/personInfo' || currentRouter === '/personList' || currentRouter === '/personTask'" :to="{ path: '/personManage' }">人员管理</el-breadcrumb-item>
<el-breadcrumb-item v-if="currentRouter === '/personDetails'">个人信息</el-breadcrumb-item>
<el-breadcrumb-item v-if="currentRouter === '/personList' || currentRouter === '/personTask'" :to="{ path: '/personList' }">人员列表</el-breadcrumb-item>
<el-breadcrumb-item v-if="currentRouter === '/personInfo'">人员信息</el-breadcrumb-item>
<el-breadcrumb-item v-if="currentRouter === '/personTask'">人员任务统计</el-breadcrumb-item>
<el-breadcrumb-item v-if="currentRouter === '/paramsSetting'">参数配置</el-breadcrumb-item>
......
src/views/AddTask.vue
浏览文件 @ 75a5bb04
......@@ -18,6 +18,8 @@
:key="item.id"
:label="item.username"
:value="item.id">
<span style="display: inline-block;width: 70px;">{{item.username}}</span>
<span>({{personStatusName(item.status)}})</span>
</el-option>
</el-select>
</el-form-item>
......@@ -37,6 +39,8 @@
:key="item.id"
:label="item.username"
:value="item.id">
<span style="display: inline-block;width: 70px;">{{item.username}}</span>
<span>({{personStatusName(item.status)}})</span>
</el-option>
</el-select>
</el-form-item>
......@@ -214,8 +218,22 @@
// alert(this.content);
this.$refs[formName].validate((valid) => {
if (valid) {
console.log(JSON.stringify(this.$store.getters.getSuperior.superior));
// console.log(JSON.stringify(this.$store.getters.getSuperior.superior));
if (JSON.stringify(this.$store.getters.getSuperior.superior) !== '{}' && JSON.stringify(this.$store.getters.getSuperior.superior) !== undefined) {
if (new Date(this.taskForm.stateTime).getTime() < new Date(this.$store.getters.getSuperior.superior.stateTime).getTime()) {
this.$message({
message: `当前任务开始时间不能早于${this.$store.getters.getSuperior.superior.stateTime}`,
type: 'warning'
});
return false;
}
if (new Date(this.taskForm.completeTime).getTime() > new Date(this.$store.getters.getSuperior.superior.completeTime).getTime()) {
this.$message({
message: `当前预计完成时间不能超过${this.$store.getters.getSuperior.superior.completeTime}`,
type: 'warning'
});
return false;
}
this.$axios.putFindWorkload(this.$store.getters.getSuperior.superior.id).then((res) => {
console.log(res)
if (res.status === 200) {
......@@ -384,6 +402,17 @@
}
})
},
personStatusName(val) {
let name = '';
if (val === '0') {
name = '空闲';
} else if (val === '1') {
name = '正常';
} else {
name = '忙碌';
}
return name;
}
},
//生命周期 - 创建完成（可以访问当前this实例）
created () {
......
src/views/ConsumerDetails.vue
浏览文件 @ 75a5bb04
......@@ -273,6 +273,11 @@
let data = JSON.parse(that.$Base64.decode(localStorage.getItem('adminUser')));
console.log(data)
that.userForm = data;
let roles = [];
data.roles.forEach((v, i) => {
roles.push(v.id);
})
that.userForm.roles = roles;
}, 300)
},
beforeCreate () {
......
src/views/ConsumerManage.vue
浏览文件 @ 75a5bb04
......@@ -121,13 +121,13 @@
this.$router.push({name: 'createConsumer'})
},
openDetails(val) {
console.log(val)
// console.log(val)
localStorage.setItem('adminUser', this.$Base64.encode(JSON.stringify(val)));
this.$router.push({name: 'consumerDetails'});
},
findDeparts(val) {
console.log(val)
console.log(this.departList)
// console.log(val)
// console.log(this.departList)
let name
for (let i = 0; i <this.departList.length; i++) {
for (let j = 0; j < val.length; j++) {
......
src/views/DepartmentManage.vue
浏览文件 @ 75a5bb04
......@@ -17,7 +17,7 @@
<div class="details" v-show="showDetail === true">
<div style="padding: 35px 100px 20px 100px;">
<el-form :model="departmentForm" :rules="rules" ref="departmentForm" label-width="100px" class="demo-ruleForm">
<el-form-item label="当前部门">
<el-form-item label="当前选择部门">
<span>{{currentDepartment.name}}</span>
</el-form-item>
<el-form-item label="部门名称" prop="name">
......
src/views/PersonInfo.vue
浏览文件 @ 75a5bb04
......@@ -154,4 +154,42 @@
}
</script>
<style scoped>
.leftImg{
text-align: center;
}
.leftImg img{
width: 300px;
height: 420px;
margin-top: 40px;
}
.first {
margin-top: 50px;
}
.roleSpan{
display: inline-block;
/*width: 100px;*/
height: 40px;
padding: 0 10px;
font-size: 18px;
line-height: 40px;
background: #53b0e6;
text-align: center;
border-radius: 4px;
color: #FFF;
}
.deSpan{
/*display: inline-block;*/
/*height: 40px;*/
/*padding: 0 5px;*/
font-size: 18px;
/*line-height: 40px;*/
/*background: #53b0e6;*/
/*text-align: center;*/
/*border-radius: 4px;*/
/*color: #FFF;*/
}
</style>
src/views/PersonList.vue
浏览文件 @ 75a5bb04
......@@ -29,11 +29,11 @@
</template>
</el-table-column>
<el-table-column
prop="role"
prop="roles"
align="center"
label="角色">
<template slot-scope="scope">
<span v-for="(item,index) in scope.row.role" :key="index">{{item.name}}<span v-show="index !== (scope.row.role.length - 1)">、</span></span>
<span v-for="(item,index) in scope.row.roles" :key="index">{{item.name}}<span v-show="index !== (scope.row.roles.length - 1)">、</span></span>
</template>
</el-table-column>
<el-table-column
......@@ -51,6 +51,9 @@
prop="status"
align="center"
label="工作状态">
<template slot-scope="scope">
<span>{{scope.row.status === '0' ? '空闲' : scope.row.status === '1' ? '正常' : '忙碌'}}</span>
</template>
</el-table-column>
<el-table-column
label="操作"
......
src/views/TaskDetails.vue
浏览文件 @ 75a5bb04
......@@ -188,9 +188,6 @@
<el-form-item label="发布者评价">
<el-input type="textarea" disabled v-model="evaForm.comments2"></el-input>
</el-form-item>
<el-form-item label="最终评分">
<span>{{evaForm.endWorkLoad}}</span>
</el-form-item>
</div>
<div v-if="isEditEva === false && isExecutor === true">
<el-form-item label="自我评分" prop="score1">
......@@ -205,9 +202,6 @@
<el-form-item label="发布者评价">
<el-input type="textarea" disabled v-model="evaForm.comments2"></el-input>
</el-form-item>
<el-form-item label="最终评分">
<span>{{evaForm.endWorkLoad}}</span>
</el-form-item>
</div>
<div v-if="isEditEva === true && isPublisher === false">
<el-form-item label="自我评分" prop="score1">
......@@ -222,9 +216,6 @@
<el-form-item label="发布者评价">
<el-input type="textarea" disabled v-model="evaForm.comments2"></el-input>
</el-form-item>
<el-form-item label="最终评分">
<span>{{evaForm.endWorkLoad}}</span>
</el-form-item>
</div>
<div v-if="isEditEva === true && isPublisher === true">
<el-form-item label="自我评分" prop="score1">
......@@ -239,28 +230,7 @@
<el-form-item label="发布者评价">
<el-input type="textarea" v-model="evaForm.comments2"></el-input>
</el-form-item>
<el-form-item label="最终评分">
<span>{{evaForm.endWorkLoad}}</span>
</el-form-item>
</div>
<!--<el-form-item label="自我评分" prop="score1">-->
<!--<el-input :disabled="isEditEva === true" v-model="evaForm.score1"></el-input>-->
<!--</el-form-item>-->
<!--<el-form-item label="自我评价">-->
<!--<el-input type="textarea" :disabled="isEditEva === true" v-model="evaForm.comments1"></el-input>-->
<!--</el-form-item>-->
<!--<el-form-item v-if="isPublisher === true" label="发布者评分" prop="score2">-->
<!--<el-input v-model="evaForm.score2"></el-input>-->
<!--</el-form-item>-->
<!--<el-form-item v-if="isPublisher === false" label="发布者评分">-->
<!--<el-input :disabled="isPublisher === false && isEditEva === false" v-model="evaForm.score2"></el-input>-->
<!--</el-form-item>-->
<!--<el-form-item label="发布者评价">-->
<!--<el-input type="textarea" :disabled="isPublisher === false" v-model="evaForm.comments2"></el-input>-->
<!--</el-form-item>-->
<!--<el-form-item label="最终评分">-->
<!--<span>{{evaForm.endWorkLoad}}</span>-->
<!--</el-form-item>-->
</el-form>
<div style="text-align: center;">
<el-button type="primary" @click="submitEvaDialog('evaForm')">确定</el-button>
......@@ -281,7 +251,6 @@
<li>自我评价：{{evaForm.comments1}}</li>
<li>发布者评分：{{evaForm.score2}}</li>
<li>发布者评价：{{evaForm.comments2}}</li>
<li>最终评分：{{evaForm.endWorkLoad}}</li>
</ul>
</div>
</el-dialog>
......@@ -349,6 +318,16 @@
//import引入的组件需要注入到对象中才能使用
components: { History },
data () {
let checkScore = (rule, value, callback) => {
if (!value) {
return callback(new Error('评分不能为空'));
}
if (value > (parseFloat(this.taskForm.workCoefficient) * 100)) {
callback(new Error(`根据考评系数，不能超过${parseFloat(this.taskForm.workCoefficient) * 100}`));
} else {
callback();
}
};
//这里存放数据
return {
showHistoryDialog: false, // 查看历史弹框
......@@ -402,12 +381,13 @@
},
evaRules: {
score1: [
// { validator: validcodeScore1, trigger: 'blur' }
{ required: true, message: '请填写自我评分', trigger: 'blur' }
{ required: true, validator: checkScore, trigger: 'blur' }
// { required: true, message: '请填写自我评分', trigger: 'blur' }
],
score2: [
{ required: true, validator: checkScore, trigger: 'blur' }
// { validator: validcodeScore2, trigger: 'blur' }
{ required: true, message: '请填写发布者评分', trigger: 'blur' }
// { required: true, message: '请填写发布者评分', trigger: 'blur' }
],
},
leaderOptions: [],
......@@ -736,7 +716,7 @@
let obj = {
"msg": this.changeTaskTextarea,
"userId": this.userDetail.id,
"workCoefficient": this.taskForm.workCoefficient,
"workCoefficient": parseFloat(this.taskForm.workCoefficient),
"workload": this.taskForm.workload,
"workId": this.taskListData.workId
}
......@@ -850,7 +830,8 @@
let obj = {
name: this.taskForm.title,
id: this.taskForm.id,
// crewList: this.taskForm.crewList,
stateTime: this.taskForm.stateTime,
completeTime: this.taskForm.completeTime,
crewList: arr,
}
this.$store.commit('changeSuperior', {
......@@ -901,8 +882,9 @@
}
.viewEvaLi li{
margin-top: 20px;
height: 60px;
line-height: 60px;
height: 80px;
line-height: 80px;
margin-left: 100px;
}
.btnStyle{
......
src/views/ViewTask.vue
浏览文件 @ 75a5bb04
......@@ -30,11 +30,11 @@
</el-card>
</div>
</el-tab-pane>
<el-tab-pane name="second">
<el-tab-pane name="four">
<span slot="label">
<!--<i class="el-icon-date"></i>-->
我的相关任务
<el-badge :is-dot="meRelatedUnread === 1" class="item"></el-badge>
我的发布任务
<el-badge :is-dot="meReleaseUnread === 1" class="item"></el-badge>
</span>
<div class="cardDiv" style="height: 100%;overflow-y: auto;padding: 0px 30px;">
<el-card @click.native="taskDetails(item)" style="margin-bottom: 10px;" class="box-card cardShadow" v-for="(item,index) in dataList" :key="index">
......@@ -86,11 +86,11 @@
</el-card>
</div>
</el-tab-pane>
<el-tab-pane name="four">
<el-tab-pane name="second">
<span slot="label">
<!--<i class="el-icon-date"></i>-->
我的发布任务
<el-badge :is-dot="meReleaseUnread === 1" class="item"></el-badge>
我的相关任务
<el-badge :is-dot="meRelatedUnread === 1" class="item"></el-badge>
</span>
<div class="cardDiv" style="height: 100%;overflow-y: auto;padding: 0px 30px;">
<el-card @click.native="taskDetails(item)" style="margin-bottom: 10px;" class="box-card cardShadow" v-for="(item,index) in dataList" :key="index">
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论