|
@@ -68,8 +68,19 @@
|
|
<!-- <div style="width:30%">
|
|
<!-- <div style="width:30%">
|
|
<el-progress :percentage="50" color='#cc9966'></el-progress>
|
|
<el-progress :percentage="50" color='#cc9966'></el-progress>
|
|
</div> -->
|
|
</div> -->
|
|
- <el-button type="warning" icon="el-icon-edit" size='mini' circle @click="editTask(item)"></el-button>
|
|
|
|
- <el-button type="danger" icon="el-icon-delete" size='mini' circle @click="deleteTask(item)"></el-button>
|
|
|
|
|
|
+ <el-button type="warning" icon="el-icon-edit" size='mini' circle @click="editTask(item)" style='margin-right:5px'></el-button>
|
|
|
|
+ <el-popconfirm
|
|
|
|
+
|
|
|
|
+ icon="el-icon-info"
|
|
|
|
+ iconColor="red"
|
|
|
|
+ title="确定删除吗?"
|
|
|
|
+ @onConfirm="deleteTask(item)"
|
|
|
|
+ >
|
|
|
|
+ <!-- <el-button slot="reference">删除</el-button> -->
|
|
|
|
+ <el-button type="danger" slot="reference" icon="el-icon-delete" size='mini' circle ></el-button>
|
|
|
|
+ </el-popconfirm>
|
|
|
|
+
|
|
|
|
+
|
|
</div>
|
|
</div>
|
|
|
|
|
|
</li>
|
|
</li>
|
|
@@ -92,14 +103,34 @@
|
|
<div class="KRBox">
|
|
<div class="KRBox">
|
|
<ul>
|
|
<ul>
|
|
<li v-for="(ele,index) in item.krList" :key="index">
|
|
<li v-for="(ele,index) in item.krList" :key="index">
|
|
- <span class="KR-tip">KR{{index+1}}</span>
|
|
|
|
- <span class="KR-content">{{ele.krInfo}}</span>
|
|
|
|
|
|
+ <span class="KR-tip">KR</span>
|
|
|
|
+ <el-popover
|
|
|
|
+ placement="top-start"
|
|
|
|
+
|
|
|
|
+ width="300"
|
|
|
|
+ trigger="hover"
|
|
|
|
+ :content="'KR:'+ele.krInfo">
|
|
|
|
+
|
|
|
|
+ <span slot="reference" class="content">
|
|
|
|
+ <span class="KR-content">{{ele.krInfo}}</span>
|
|
|
|
+ </span>
|
|
|
|
+ </el-popover>
|
|
|
|
+
|
|
<span class="KR-opt">
|
|
<span class="KR-opt">
|
|
<span style="width:35%">
|
|
<span style="width:35%">
|
|
<el-progress :percentage="ele.completion" color='#cc9966'></el-progress>
|
|
<el-progress :percentage="ele.completion" color='#cc9966'></el-progress>
|
|
</span>
|
|
</span>
|
|
- <el-button type="warning" icon="el-icon-edit" size='mini' circle @click="editKR(ele)"></el-button>
|
|
|
|
- <el-button type="danger" icon="el-icon-delete" size='mini' circle @click="deleteKR(ele)"></el-button>
|
|
|
|
|
|
+ <el-button type="warning" icon="el-icon-edit" size='mini' circle @click="editKR(ele)" style='margin-right:5px'></el-button>
|
|
|
|
+ <el-popconfirm
|
|
|
|
+ icon="el-icon-info"
|
|
|
|
+ iconColor="red"
|
|
|
|
+ title="确定删除吗?"
|
|
|
|
+ @onConfirm="deleteKR(ele)"
|
|
|
|
+ >
|
|
|
|
+ <!-- <el-button slot="reference">删除</el-button> -->
|
|
|
|
+ <el-button type="danger" slot="reference" icon="el-icon-delete" size='mini' circle ></el-button>
|
|
|
|
+ </el-popconfirm>
|
|
|
|
+
|
|
</span>
|
|
</span>
|
|
</li>
|
|
</li>
|
|
</ul>
|
|
</ul>
|
|
@@ -133,8 +164,17 @@
|
|
<!-- <div style="width:30%">
|
|
<!-- <div style="width:30%">
|
|
<el-progress :percentage="50" color='#cc9966'></el-progress>
|
|
<el-progress :percentage="50" color='#cc9966'></el-progress>
|
|
</div> -->
|
|
</div> -->
|
|
- <el-button type="warning" icon="el-icon-edit" size='mini' circle @click="editTask(item)"></el-button>
|
|
|
|
- <el-button type="danger" icon="el-icon-delete" size='mini' circle @click="deleteTask(item)"></el-button>
|
|
|
|
|
|
+ <el-button type="warning" icon="el-icon-edit" size='mini' circle @click="editTask(item)" style="margin-right:5px"></el-button>
|
|
|
|
+ <el-popconfirm
|
|
|
|
+ icon="el-icon-info"
|
|
|
|
+ iconColor="red"
|
|
|
|
+ title="确定删除吗?"
|
|
|
|
+ @onConfirm="deleteTask(item)"
|
|
|
|
+ >
|
|
|
|
+ <!-- <el-button slot="reference">删除</el-button> -->
|
|
|
|
+ <el-button type="danger" slot="reference" icon="el-icon-delete" size='mini' circle ></el-button>
|
|
|
|
+ </el-popconfirm>
|
|
|
|
+
|
|
</div>
|
|
</div>
|
|
</li>
|
|
</li>
|
|
</ul>
|
|
</ul>
|
|
@@ -145,11 +185,10 @@
|
|
<p class="top-title">状态指标</p>
|
|
<p class="top-title">状态指标</p>
|
|
<el-button type="text" class="createTask" @click="createStatus"><i class="el-icon-plus"></i>新建状态指标</el-button>
|
|
<el-button type="text" class="createTask" @click="createStatus"><i class="el-icon-plus"></i>新建状态指标</el-button>
|
|
</div>
|
|
</div>
|
|
- <div class="status-list">
|
|
|
|
-
|
|
|
|
- <span v-for="item in status" :key='item.id' :style="'background-color:'+item.color" class="status" @click="editSatus(item)">
|
|
|
|
- {{item.content}}
|
|
|
|
- </span>
|
|
|
|
|
|
+ <div class="status-list">
|
|
|
|
+ <li v-for="item in status" :key='item.id' class="status">
|
|
|
|
+ <span class="itemStatus" :style="'background-color:'+item.color" @click="editSatus(item)">{{item.content}}</span>
|
|
|
|
+ </li>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -186,7 +225,7 @@
|
|
</div>
|
|
</div>
|
|
|
|
|
|
<div class="targetKR" v-for="(item,index) in KRList" :key='index'>
|
|
<div class="targetKR" v-for="(item,index) in KRList" :key='index'>
|
|
- <span class="tip"><span class="sc-bQduHL kArEgh"></span> KR{{index}}</span>
|
|
|
|
|
|
+ <span class="tip"><span class="sc-bQduHL kArEgh"></span> KR</span>
|
|
<span class="info">
|
|
<span class="info">
|
|
<el-input
|
|
<el-input
|
|
type="text"
|
|
type="text"
|
|
@@ -196,8 +235,8 @@
|
|
></el-input>
|
|
></el-input>
|
|
</span>
|
|
</span>
|
|
<span class="progress">
|
|
<span class="progress">
|
|
- <span class="progressBar">
|
|
|
|
- <span>KR的完成进度:</span>
|
|
|
|
|
|
+ <span class="progressBar creatOxia">
|
|
|
|
+ <span class="krtitle">KR的完成进度:</span>
|
|
<el-slider
|
|
<el-slider
|
|
v-model="item.completion"
|
|
v-model="item.completion"
|
|
show-input
|
|
show-input
|
|
@@ -205,13 +244,22 @@
|
|
</el-slider>
|
|
</el-slider>
|
|
</span>
|
|
</span>
|
|
<span >
|
|
<span >
|
|
|
|
+ <!-- <el-popconfirm
|
|
|
|
+ icon="el-icon-info"
|
|
|
|
+ iconColor="red"
|
|
|
|
+ title="确定删除吗?"
|
|
|
|
+ @onConfirm="deleteTask(item)"
|
|
|
|
+ >
|
|
|
|
+
|
|
|
|
+ <el-button type="danger" slot="reference" icon="el-icon-delete" size='mini' circle ></el-button>
|
|
|
|
+ </el-popconfirm> -->
|
|
<el-button icon="el-icon-delete" circle class="delete" size='mini' @click="createdeleteKR(item,index)"></el-button>
|
|
<el-button icon="el-icon-delete" circle class="delete" size='mini' @click="createdeleteKR(item,index)"></el-button>
|
|
<!-- <i class="el-icon-delete"></i> -->
|
|
<!-- <i class="el-icon-delete"></i> -->
|
|
</span>
|
|
</span>
|
|
</span>
|
|
</span>
|
|
</div>
|
|
</div>
|
|
<div class="addKR">
|
|
<div class="addKR">
|
|
- <el-button type="text" style="font-size:16px" @click="addKR"><i class="el-icon-plus"></i>添加关键成果</el-button>
|
|
|
|
|
|
+ <el-button type="text" style="font-size:16px" @click="addKR"><i class="el-icon-plus"></i>添加关键结果</el-button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<span slot="footer" class="dialog-footer">
|
|
<span slot="footer" class="dialog-footer">
|
|
@@ -221,7 +269,7 @@
|
|
</el-dialog>
|
|
</el-dialog>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
- <!-- 创建的模态框 -->
|
|
|
|
|
|
+ <!-- 创建任务的模态框 -->
|
|
<div class="openTaskBox">
|
|
<div class="openTaskBox">
|
|
<el-dialog
|
|
<el-dialog
|
|
:title="taskTitle"
|
|
:title="taskTitle"
|
|
@@ -234,7 +282,7 @@
|
|
<!-- <span class="item-name">名称:</span> -->
|
|
<!-- <span class="item-name">名称:</span> -->
|
|
<el-input
|
|
<el-input
|
|
type="text"
|
|
type="text"
|
|
- placeholder="请输入名称"
|
|
|
|
|
|
+ placeholder="请输入任务名称"
|
|
v-model="taskName"
|
|
v-model="taskName"
|
|
maxlength="20"
|
|
maxlength="20"
|
|
show-word-limit
|
|
show-word-limit
|
|
@@ -243,7 +291,7 @@
|
|
@blur='checkTaskName'
|
|
@blur='checkTaskName'
|
|
>
|
|
>
|
|
</el-input>
|
|
</el-input>
|
|
- <span style="font-size:12px;color:#CC6666; margin-left:15px" v-if='taskNameOk'>名称是必须得填写的哦!</span>
|
|
|
|
|
|
+ <span style="font-size:12px;color:#CC6666; margin-left:15px" v-if='taskNameOk'>任务名称是必须得填写的哦!</span>
|
|
</div>
|
|
</div>
|
|
<div class="task-item">
|
|
<div class="task-item">
|
|
<!-- <span class="item-name">描述</span> -->
|
|
<!-- <span class="item-name">描述</span> -->
|
|
@@ -262,9 +310,7 @@
|
|
<span class="item-name" >选择等级:</span>
|
|
<span class="item-name" >选择等级:</span>
|
|
<el-radio-group v-model="taskRange" size="small" >
|
|
<el-radio-group v-model="taskRange" size="small" >
|
|
<el-radio label="1" border>P1</el-radio>
|
|
<el-radio label="1" border>P1</el-radio>
|
|
- <el-radio label="2" border>P2</el-radio>
|
|
|
|
- <el-radio label="3" border>P3</el-radio>
|
|
|
|
-
|
|
|
|
|
|
+ <el-radio label="2" border>P2</el-radio>
|
|
</el-radio-group>
|
|
</el-radio-group>
|
|
</div>
|
|
</div>
|
|
<!-- 完成的进度 -->
|
|
<!-- 完成的进度 -->
|
|
@@ -281,8 +327,8 @@
|
|
<span slot="footer" class="dialog-footer">
|
|
<span slot="footer" class="dialog-footer">
|
|
|
|
|
|
<el-button @click="taskVisible = false">取 消</el-button>
|
|
<el-button @click="taskVisible = false">取 消</el-button>
|
|
- <el-button type="warning" @click="taskOk" v-if="taskTitle=='创建'">创 建</el-button>
|
|
|
|
- <el-button type="warning" @click="editTaskOk" v-if="taskTitle=='修改'">修 改</el-button>
|
|
|
|
|
|
+ <el-button type="warning" @click="taskOk" v-if="taskTitle=='创建任务'">创 建</el-button>
|
|
|
|
+ <el-button type="warning" @click="editTaskOk" v-if="taskTitle=='修改任务'">修 改</el-button>
|
|
</span>
|
|
</span>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
</div>
|
|
</div>
|
|
@@ -313,7 +359,7 @@
|
|
<div class="task-item">
|
|
<div class="task-item">
|
|
<span class="item-name" >选择状态:</span>
|
|
<span class="item-name" >选择状态:</span>
|
|
<el-radio-group v-model="statusType" size="small" >
|
|
<el-radio-group v-model="statusType" size="small" >
|
|
- <el-radio label="1" border class="first">危险</el-radio>
|
|
|
|
|
|
+ <el-radio label="1" border class="first">较差</el-radio>
|
|
<el-radio label="2" border class="second">一般</el-radio>
|
|
<el-radio label="2" border class="second">一般</el-radio>
|
|
<el-radio label="3" border class="third">良好</el-radio>
|
|
<el-radio label="3" border class="third">良好</el-radio>
|
|
|
|
|
|
@@ -321,6 +367,15 @@
|
|
</div>
|
|
</div>
|
|
<div class="task-item" v-if="statusTitle=='修改状态指标'">
|
|
<div class="task-item" v-if="statusTitle=='修改状态指标'">
|
|
<div style="width:200px;height:30px;margin:0 auto;text-align:center;margin-top:30px">
|
|
<div style="width:200px;height:30px;margin:0 auto;text-align:center;margin-top:30px">
|
|
|
|
+ <!-- <el-popconfirm
|
|
|
|
+ icon="el-icon-info"
|
|
|
|
+ iconColor="red"
|
|
|
|
+ title="确定删除吗?"
|
|
|
|
+ @onConfirm="deleteStatusOk"
|
|
|
|
+ >
|
|
|
|
+
|
|
|
|
+ <el-button type="warning" slot="reference" >删除本条状态指标</el-button>
|
|
|
|
+ </el-popconfirm> -->
|
|
<el-button type="warning" @click="deleteStatusOk" >删除本条状态指标</el-button>
|
|
<el-button type="warning" @click="deleteStatusOk" >删除本条状态指标</el-button>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
@@ -384,7 +439,7 @@
|
|
<el-slider
|
|
<el-slider
|
|
v-model="KRProgress"
|
|
v-model="KRProgress"
|
|
show-input
|
|
show-input
|
|
- style="width:80%;margin-left:10px">
|
|
|
|
|
|
+ style="width:70%;margin-left:10px">
|
|
</el-slider>
|
|
</el-slider>
|
|
</span>
|
|
</span>
|
|
</span>
|
|
</span>
|
|
@@ -426,7 +481,7 @@
|
|
type="text"
|
|
type="text"
|
|
placeholder="请输入目标名称"
|
|
placeholder="请输入目标名称"
|
|
v-model="ObjectName"
|
|
v-model="ObjectName"
|
|
- maxlength="50"
|
|
|
|
|
|
+ maxlength="30"
|
|
show-word-limit
|
|
show-word-limit
|
|
clearable
|
|
clearable
|
|
@blur="checkedObjectName"
|
|
@blur="checkedObjectName"
|
|
@@ -530,7 +585,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
|
|
this.okrVisible=true;
|
|
this.okrVisible=true;
|
|
this.syncPeopleOptions=[];
|
|
this.syncPeopleOptions=[];
|
|
//请求所有的公司人
|
|
//请求所有的公司人
|
|
- postAction('/api/okr/qywx/getUserListByName',{
|
|
|
|
|
|
+ postAction('/okr/qywx/getUserListByName',{
|
|
|
|
|
|
}).then((res)=>{
|
|
}).then((res)=>{
|
|
// console.log(res)
|
|
// console.log(res)
|
|
@@ -547,7 +602,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
|
|
|
|
|
|
})
|
|
})
|
|
//请求已经同步的人
|
|
//请求已经同步的人
|
|
- postAction('/api/okr/okr/getMemberListByUserId',{
|
|
|
|
|
|
+ postAction('/okr/okr/getMemberListByUserId',{
|
|
|
|
|
|
}).then((res)=>{
|
|
}).then((res)=>{
|
|
this.selectedPeople=[]
|
|
this.selectedPeople=[]
|
|
@@ -561,7 +616,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
|
|
})
|
|
})
|
|
},
|
|
},
|
|
syncOK(){
|
|
syncOK(){
|
|
- postAction('/api/okr/okr/saveOkrMember',{
|
|
|
|
|
|
+ postAction('/okr/okr/saveOkrMember',{
|
|
userIdList:this.syncPeopleValue
|
|
userIdList:this.syncPeopleValue
|
|
}).then((res)=>{
|
|
}).then((res)=>{
|
|
// console.log(res)
|
|
// console.log(res)
|
|
@@ -601,7 +656,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
|
|
// console.log(item)
|
|
// console.log(item)
|
|
this.checkedTargetName()
|
|
this.checkedTargetName()
|
|
if(!this.targetNameOk){
|
|
if(!this.targetNameOk){
|
|
- postAction('/api/okr/okr/insertObjectAndKrList',{
|
|
|
|
|
|
+ postAction('/okr/okr/insertObjectAndKrList',{
|
|
objectInfo:{
|
|
objectInfo:{
|
|
objectInfo:this.targetName,
|
|
objectInfo:this.targetName,
|
|
completion:0
|
|
completion:0
|
|
@@ -632,7 +687,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
|
|
|
|
|
|
this.checkedObjectName();
|
|
this.checkedObjectName();
|
|
if(!this.ObjectNameOk){
|
|
if(!this.ObjectNameOk){
|
|
- postAction('/api/okr/okr/updateObject',{
|
|
|
|
|
|
+ postAction('/okr/okr/updateObject',{
|
|
objectInfo:{
|
|
objectInfo:{
|
|
id:this.currentObjId,
|
|
id:this.currentObjId,
|
|
objectInfo:this.ObjectName,
|
|
objectInfo:this.ObjectName,
|
|
@@ -657,9 +712,9 @@ import {postAction , getAction} from '@/utils/api/http.js'
|
|
targeOKROk(){
|
|
targeOKROk(){
|
|
this.targetVisible=false;
|
|
this.targetVisible=false;
|
|
},
|
|
},
|
|
- // 创建
|
|
|
|
|
|
+ // 创建任务
|
|
createTask(val){
|
|
createTask(val){
|
|
- this.taskTitle='创建'
|
|
|
|
|
|
+ this.taskTitle='创建任务'
|
|
this.taskVisible=true;
|
|
this.taskVisible=true;
|
|
this.currentTask=val;
|
|
this.currentTask=val;
|
|
this.taskName='';
|
|
this.taskName='';
|
|
@@ -674,7 +729,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
|
|
this.taskNameOk=this.taskName? false:true;
|
|
this.taskNameOk=this.taskName? false:true;
|
|
if(!this.taskNameOk){
|
|
if(!this.taskNameOk){
|
|
|
|
|
|
- postAction('/api/okr/okr/insertTaskInfo',{
|
|
|
|
|
|
+ postAction('/okr/okr/insertTaskInfo',{
|
|
taskInfo:{
|
|
taskInfo:{
|
|
taskTitle:this.taskName,
|
|
taskTitle:this.taskName,
|
|
taskInfo:this.taskDesc,
|
|
taskInfo:this.taskDesc,
|
|
@@ -691,7 +746,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
|
|
}
|
|
}
|
|
|
|
|
|
},
|
|
},
|
|
- // 检查名字是否输入
|
|
|
|
|
|
+ // 检查任务名字是否输入
|
|
checkTaskName(){
|
|
checkTaskName(){
|
|
this.taskNameOk=this.taskName? false:true
|
|
this.taskNameOk=this.taskName? false:true
|
|
},
|
|
},
|
|
@@ -702,7 +757,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
|
|
// 删除task
|
|
// 删除task
|
|
deleteTask(val){
|
|
deleteTask(val){
|
|
// console.log(val)
|
|
// console.log(val)
|
|
- postAction('/api/okr/okr/deleteTaskInfoById',{
|
|
|
|
|
|
+ postAction('/okr/okr/deleteTaskInfoById',{
|
|
taskInfo:{
|
|
taskInfo:{
|
|
id:val.id
|
|
id:val.id
|
|
}
|
|
}
|
|
@@ -718,10 +773,10 @@ import {postAction , getAction} from '@/utils/api/http.js'
|
|
})
|
|
})
|
|
},
|
|
},
|
|
|
|
|
|
- // 编辑
|
|
|
|
|
|
+ // 编辑任务
|
|
editTask(val){
|
|
editTask(val){
|
|
// console.log(val)
|
|
// console.log(val)
|
|
- this.taskTitle='修改';
|
|
|
|
|
|
+ this.taskTitle='修改任务';
|
|
|
|
|
|
// this.currentTask=val;
|
|
// this.currentTask=val;
|
|
this.taskName=val.taskTitle;
|
|
this.taskName=val.taskTitle;
|
|
@@ -737,7 +792,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
|
|
this.taskNameOk=this.taskName? false:true;
|
|
this.taskNameOk=this.taskName? false:true;
|
|
if(!this.taskNameOk){
|
|
if(!this.taskNameOk){
|
|
|
|
|
|
- postAction('/api/okr/okr/updateTaskInfo',{
|
|
|
|
|
|
+ postAction('/okr/okr/updateTaskInfo',{
|
|
taskInfo:{
|
|
taskInfo:{
|
|
id:this.taskId,
|
|
id:this.taskId,
|
|
taskTitle:this.taskName,
|
|
taskTitle:this.taskName,
|
|
@@ -748,11 +803,16 @@ import {postAction , getAction} from '@/utils/api/http.js'
|
|
// console.log(res)
|
|
// console.log(res)
|
|
if(res.success){
|
|
if(res.success){
|
|
this.$message({
|
|
this.$message({
|
|
- message: '修改成功啦!',
|
|
|
|
|
|
+ message: '任务修改成功啦!',
|
|
type: 'success'
|
|
type: 'success'
|
|
});
|
|
});
|
|
this.taskVisible=false;
|
|
this.taskVisible=false;
|
|
this.getOkrPageList();
|
|
this.getOkrPageList();
|
|
|
|
+ }else{
|
|
|
|
+ this.$message({
|
|
|
|
+ message: '任务修改失败',
|
|
|
|
+ type: 'error'
|
|
|
|
+ });
|
|
}
|
|
}
|
|
})
|
|
})
|
|
}
|
|
}
|
|
@@ -776,7 +836,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
|
|
statusOk(){
|
|
statusOk(){
|
|
this.checkStatusName();
|
|
this.checkStatusName();
|
|
if(!this.statusNameOk){
|
|
if(!this.statusNameOk){
|
|
- postAction('/api/okr/okr/insertContentStatus',{
|
|
|
|
|
|
+ postAction('/okr/okr/insertContentStatus',{
|
|
content:{
|
|
content:{
|
|
content:this.statusName,
|
|
content:this.statusName,
|
|
type:this.statusType,
|
|
type:this.statusType,
|
|
@@ -796,7 +856,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
|
|
editStatusOk(){
|
|
editStatusOk(){
|
|
this.checkStatusName();
|
|
this.checkStatusName();
|
|
if(!this.statusNameOk){
|
|
if(!this.statusNameOk){
|
|
- postAction('/api/okr/okr/updateContentStatus',{
|
|
|
|
|
|
+ postAction('/okr/okr/updateContentStatus',{
|
|
content:{
|
|
content:{
|
|
id:this.statusId,
|
|
id:this.statusId,
|
|
content:this.statusName,
|
|
content:this.statusName,
|
|
@@ -818,7 +878,12 @@ import {postAction , getAction} from '@/utils/api/http.js'
|
|
}
|
|
}
|
|
},
|
|
},
|
|
deleteStatusOk(){
|
|
deleteStatusOk(){
|
|
- postAction('/api/okr/okr/deleteContentStatusById',{
|
|
|
|
|
|
+ this.$confirm('即将删除本状态, 是否继续?', '提示', {
|
|
|
|
+ confirmButtonText: '确定',
|
|
|
|
+ cancelButtonText: '取消',
|
|
|
|
+ type: 'warning'
|
|
|
|
+ }).then(() => {
|
|
|
|
+ postAction('/okr/okr/deleteContentStatusById',{
|
|
content:{
|
|
content:{
|
|
id:this.statusId,
|
|
id:this.statusId,
|
|
}
|
|
}
|
|
@@ -834,11 +899,19 @@ import {postAction , getAction} from '@/utils/api/http.js'
|
|
this.getOkrPageList()
|
|
this.getOkrPageList()
|
|
}
|
|
}
|
|
})
|
|
})
|
|
|
|
+
|
|
|
|
+ }).catch(() => {
|
|
|
|
+ this.$message({
|
|
|
|
+ type: 'info',
|
|
|
|
+ message: '已取消删除'
|
|
|
|
+ });
|
|
|
|
+ });
|
|
|
|
+
|
|
},
|
|
},
|
|
|
|
|
|
deleteKR(item){
|
|
deleteKR(item){
|
|
console.log(item);
|
|
console.log(item);
|
|
- postAction('/api/okr/okr/deleteKrById',{
|
|
|
|
|
|
+ postAction('/okr/okr/deleteKrById',{
|
|
krInfo:{
|
|
krInfo:{
|
|
id:item.id
|
|
id:item.id
|
|
}
|
|
}
|
|
@@ -866,7 +939,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
|
|
KROk(){
|
|
KROk(){
|
|
this.checkKRName();
|
|
this.checkKRName();
|
|
if(!this.KRNameOk){
|
|
if(!this.KRNameOk){
|
|
- postAction('/api/okr/okr/insertOkrKrInfo ',{
|
|
|
|
|
|
+ postAction('/okr/okr/insertOkrKrInfo ',{
|
|
krInfo:{
|
|
krInfo:{
|
|
completion:this.KRProgress,
|
|
completion:this.KRProgress,
|
|
krInfo:this.KRName,
|
|
krInfo:this.KRName,
|
|
@@ -893,7 +966,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
|
|
editKROk(){
|
|
editKROk(){
|
|
this.checkKRName();
|
|
this.checkKRName();
|
|
if(!this.KRNameOk){
|
|
if(!this.KRNameOk){
|
|
- postAction('/api/okr/okr/updateKr',{
|
|
|
|
|
|
+ postAction('/okr/okr/updateKr',{
|
|
krInfo:{
|
|
krInfo:{
|
|
completion:this.KRProgress,
|
|
completion:this.KRProgress,
|
|
krInfo:this.KRName,
|
|
krInfo:this.KRName,
|
|
@@ -912,7 +985,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
|
|
|
|
|
|
// 获取页面展示的list
|
|
// 获取页面展示的list
|
|
getOkrPageList(){
|
|
getOkrPageList(){
|
|
- postAction('/api/okr/okr/getOkrInfo',{}
|
|
|
|
|
|
+ postAction('/okr/okr/getOkrInfo',{}
|
|
).then((res)=>{
|
|
).then((res)=>{
|
|
console.log(res);
|
|
console.log(res);
|
|
if(res.success){
|
|
if(res.success){
|
|
@@ -1058,29 +1131,42 @@ ul,li{
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.status-list{
|
|
.status-list{
|
|
- padding: 20px;
|
|
|
|
- display: flex;
|
|
|
|
- flex-wrap: wrap ;
|
|
|
|
- height: 80%;
|
|
|
|
- justify-content: space-around;
|
|
|
|
|
|
+ overflow: auto;
|
|
|
|
+ max-height: 80%;
|
|
|
|
+ // margin-top: 10px;
|
|
|
|
+ text-align: left;
|
|
|
|
+ font-size: 14px;
|
|
|
|
+ color: #333;
|
|
box-sizing: border-box;
|
|
box-sizing: border-box;
|
|
// align-content: center;
|
|
// align-content: center;
|
|
.status{
|
|
.status{
|
|
- display: inline-block;
|
|
|
|
- width: 20%;
|
|
|
|
|
|
+ display: block;
|
|
|
|
+ // width: 20%;
|
|
|
|
+ width: auto;
|
|
min-width: 120px;
|
|
min-width: 120px;
|
|
- height: 65px;
|
|
|
|
- padding: 10px 10px;
|
|
|
|
|
|
+ height: 60px;
|
|
|
|
+ // padding: 10px 10px;
|
|
box-sizing: border-box;
|
|
box-sizing: border-box;
|
|
- margin-right: 2%;
|
|
|
|
- border-radius: 20px;
|
|
|
|
- cursor: pointer;
|
|
|
|
|
|
+ justify-content: center;
|
|
|
|
+ display: flex;
|
|
|
|
+
|
|
|
|
+ // margin-bottom: 10px;
|
|
|
|
+ .itemStatus{
|
|
|
|
+ display: inline-block;
|
|
|
|
+ height: 40px;
|
|
|
|
+ line-height: 40px;
|
|
|
|
+ padding: 0 15px;
|
|
|
|
+ border-radius: 10px;
|
|
|
|
+ margin: 0 auto;
|
|
|
|
+ cursor: pointer;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.objectList{
|
|
.objectList{
|
|
text-align: left;
|
|
text-align: left;
|
|
overflow: auto;
|
|
overflow: auto;
|
|
- min-height: 75%;
|
|
|
|
|
|
+ height: 75%;
|
|
|
|
+ max-height: 85%;
|
|
.OBox{
|
|
.OBox{
|
|
background: #fafbfc;
|
|
background: #fafbfc;
|
|
height: 62px;
|
|
height: 62px;
|
|
@@ -1128,10 +1214,12 @@ ul,li{
|
|
ul{
|
|
ul{
|
|
li{
|
|
li{
|
|
width: 100%;
|
|
width: 100%;
|
|
- height: 30px;
|
|
|
|
|
|
+ height: 40px;
|
|
padding: 5px 20px;
|
|
padding: 5px 20px;
|
|
position: relative;
|
|
position: relative;
|
|
box-sizing:border-box;
|
|
box-sizing:border-box;
|
|
|
|
+ line-height: 40px;
|
|
|
|
+ position: relative;
|
|
.KR-tip{
|
|
.KR-tip{
|
|
height: 20px;
|
|
height: 20px;
|
|
line-height: 20px;
|
|
line-height: 20px;
|
|
@@ -1141,9 +1229,18 @@ ul,li{
|
|
background: rgba(46, 156, 255, 0.1);
|
|
background: rgba(46, 156, 255, 0.1);
|
|
border-radius: 11.5px;
|
|
border-radius: 11.5px;
|
|
padding: 3px 9px;
|
|
padding: 3px 9px;
|
|
|
|
+ position: absolute;
|
|
|
|
+ top: 8px;
|
|
}
|
|
}
|
|
.KR-content{
|
|
.KR-content{
|
|
-
|
|
|
|
|
|
+ width:60% ;
|
|
|
|
+ display: inline-block;
|
|
|
|
+ overflow:hidden;
|
|
|
|
+ white-space:nowrap;
|
|
|
|
+ text-overflow:ellipsis;
|
|
|
|
+ height:100%;
|
|
|
|
+ line-height: 30px;
|
|
|
|
+ padding-left: 40px;
|
|
}
|
|
}
|
|
.KR-opt{
|
|
.KR-opt{
|
|
position: absolute;
|
|
position: absolute;
|
|
@@ -1151,7 +1248,7 @@ ul,li{
|
|
top:5px;
|
|
top:5px;
|
|
display: flex;
|
|
display: flex;
|
|
// display: none;
|
|
// display: none;
|
|
- width: 50%;
|
|
|
|
|
|
+ width: 30%;
|
|
position: absolute;
|
|
position: absolute;
|
|
justify-content:flex-end;
|
|
justify-content:flex-end;
|
|
align-items:center
|
|
align-items:center
|
|
@@ -1311,12 +1408,16 @@ ul,li{
|
|
width: 70%;
|
|
width: 70%;
|
|
display: flex;
|
|
display: flex;
|
|
}
|
|
}
|
|
|
|
+ .creatOxia{
|
|
|
|
+ width: 85%;
|
|
|
|
+ }
|
|
.delete{
|
|
.delete{
|
|
// width: 25px;
|
|
// width: 25px;
|
|
// height: 25px;
|
|
// height: 25px;
|
|
// font-size: 12px;
|
|
// font-size: 12px;
|
|
position:absolute;
|
|
position:absolute;
|
|
right: 5px;
|
|
right: 5px;
|
|
|
|
+ top: 5px;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1339,7 +1440,7 @@ ul,li{
|
|
.krtitle{
|
|
.krtitle{
|
|
line-height: 40px;
|
|
line-height: 40px;
|
|
display: inline-block;
|
|
display: inline-block;
|
|
- width: 20%;
|
|
|
|
|
|
+ width: 35%;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1473,6 +1574,13 @@ ul,li{
|
|
background: none;
|
|
background: none;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ .el-input--suffix .el-input__inner {
|
|
|
|
+ padding-right: 66px;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ .el-input--suffix .el-input__inner {
|
|
|
|
+ padding-right: 50px;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.editKRBody{
|
|
.editKRBody{
|
|
@@ -1515,5 +1623,6 @@ ul,li{
|
|
color:#fff
|
|
color:#fff
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+
|
|
</style>
|
|
</style>
|