|
|
@@ -316,6 +316,29 @@
|
|
|
</div>
|
|
|
|
|
|
<!-- 任务进展列表 -->
|
|
|
+ <!-- <div class="ddl" v-if="ProgressList.length > 0">
|
|
|
+ <div class="elCard" v-for="item in ProgressList" :key="item.id" style="margin-bottom: 10px; height:" >
|
|
|
+ <i class="el-icon-success" style="color: #43d14f;" v-if="item.status == 0"></i>
|
|
|
+ <i class="el-icon-success" style="color: #fd7624;" v-else-if="item.status == 1"></i>
|
|
|
+ <i class="el-icon-success" style="color: #fd4d47;" v-else></i>
|
|
|
+ <span v-if="item.status == 0">状态正常</span>
|
|
|
+ <span v-else-if="item.status == 1">状态正常</span>
|
|
|
+ <span v-else>进展预期</span>
|
|
|
+
|
|
|
+ <el-dropdown trigger="click" style="float:right;cursor:pointer; float: right;">
|
|
|
+ <i class="el-icon-more" ></i>
|
|
|
+ <el-dropdown-menu slot="dropdown">
|
|
|
+
|
|
|
+ <el-dropdown-item divided>
|
|
|
+ <span @click="deleteTaskProgress(item.id)"><i class="el-icon-delete"></i>删除列表</span></el-dropdown-item>
|
|
|
+ </el-dropdown-menu>
|
|
|
+ </el-dropdown>
|
|
|
+ <div class="elCard_qu">屈经理更新于{{item.indate | relativeTime}}</div>
|
|
|
+ <p style="padding-left: 20px;">{{item.content}}</p>
|
|
|
+ <div class="examine"><el-button type="text" @click="innerVisibless = true" style="color: #8F87A3;">查看历史记录</el-button></div>
|
|
|
+ </div>
|
|
|
+ </div> -->
|
|
|
+
|
|
|
<div class="ddl" v-if="ProgressList.length > 0">
|
|
|
<div class="elCard" v-for="item in ProgressList" :key="item.id" style="margin-bottom: 10px; height:" >
|
|
|
<i class="el-icon-success" style="color: #43d14f;" v-if="item.status == 0"></i>
|
|
|
@@ -469,11 +492,11 @@
|
|
|
<!-- <el-input type="textarea" class="textareays" label-width="100%" label-height="140px"></el-input> -->
|
|
|
<div class="issue_fixation">
|
|
|
<div class="inputDeep"><el-input
|
|
|
- class="issue-input"
|
|
|
type="textarea"
|
|
|
placeholder="请输入内容"
|
|
|
:autosize="{ minRows: 6, maxRows: 6}"
|
|
|
v-model.trim="textarea2"
|
|
|
+ class="inputDeeps"
|
|
|
>
|
|
|
</el-input></div>
|
|
|
<el-button class="issue-button" type="primary" @click="release()">发布</el-button>
|
|
|
@@ -830,7 +853,6 @@
|
|
|
},
|
|
|
//删除任务进展
|
|
|
deleteTaskProgress(id) {
|
|
|
- console.log(id, '删除传过来的数据');
|
|
|
this.http.post('/task-progress/deleteProgress', {id: id},
|
|
|
res => {
|
|
|
if (res.code == "ok") {
|
|
|
@@ -850,16 +872,12 @@
|
|
|
},
|
|
|
//创建任务进展
|
|
|
addTaskProgress() {
|
|
|
- console.log(this.taskIid, 'idididi');
|
|
|
- // var param = {taskId:0,status:0,content:'输入进展内容',participatorIds:'1,2,3,4,5'};
|
|
|
- // console.log(this.checkLists.toString(), '看看打印的是什么');
|
|
|
var param = {
|
|
|
taskId: this.taskIid,
|
|
|
status: this.radio,
|
|
|
content: this.text2,
|
|
|
participatorIds: this.checkLists.toString()
|
|
|
};
|
|
|
- console.log(param, '发布过去的数据');
|
|
|
this.http.post('/task-progress/addProgress', param,
|
|
|
res => {
|
|
|
if (res.code == "ok") {
|
|
|
@@ -884,15 +902,12 @@
|
|
|
},
|
|
|
//获取任务进展列表
|
|
|
getTaskProgressList(taskId) {
|
|
|
- console.log(taskId);
|
|
|
this.taskIid = taskId
|
|
|
this.http.post('/task-progress/list', {taskId: taskId},
|
|
|
res => {
|
|
|
if (res.code == "ok") {
|
|
|
this.ProgressList = res.data;
|
|
|
this.progres = res.data[0]
|
|
|
- console.log(this.addForm, '获取到的表单信息');
|
|
|
- console.log(this.ProgressList, '获取过来的任务进展列表数据');
|
|
|
} else {
|
|
|
this.$message({
|
|
|
message: res.msg,
|
|
|
@@ -909,8 +924,6 @@
|
|
|
} else {
|
|
|
this.checkLists.splice(k, 1)
|
|
|
}
|
|
|
- // this.checkLists.push(el.id)
|
|
|
- // console.log(this.checkLists);
|
|
|
},
|
|
|
showExportDialog() {
|
|
|
this.exportDialog = true;
|
|
|
@@ -963,9 +976,7 @@
|
|
|
// 获得焦点时触发
|
|
|
onEditorBlur(){
|
|
|
let theEle = this.$refs.text; // 获取元素
|
|
|
- console.log(theEle.value); // 获取到富文本内容
|
|
|
var img = theEle.value.match(/<img[^>]+>/g); // 赛选 img 标签
|
|
|
- console.log(img);
|
|
|
var arrImg = ''
|
|
|
for (var j = 0; j < img.length; j++) {
|
|
|
// 正则匹配，摘出img标签下的src里的内容，即capture
|
|
|
@@ -977,7 +988,6 @@
|
|
|
var strLen = arrImg.length;
|
|
|
// 计算后得到的文件流大小，单位为字节
|
|
|
var fileSize=parseInt(strLen-(strLen/8)*2);
|
|
|
- console.log(fileSize,"字节");
|
|
|
var size = "";
|
|
|
size = (fileSize/1024/1024).toFixed(2);
|
|
|
if (size > 2){
|
|
|
@@ -1210,7 +1220,6 @@
|
|
|
res => {
|
|
|
if (res.code == "ok") {
|
|
|
this.taskDataList = res.data;
|
|
|
- console.log(this.taskDataList, '视图任务列表');
|
|
|
this.taskDataList.forEach(t=>{
|
|
|
t.isFinish = t.taskStatus==1?true:false;
|
|
|
});
|
|
|
@@ -1312,14 +1321,12 @@
|
|
|
},
|
|
|
// 点击卡片事件
|
|
|
editTask(task) {
|
|
|
- console.log(task);
|
|
|
- // this.addForm = JSON.parse(JSON.stringify(task));
|
|
|
this.addFormVisible = true;
|
|
|
this.addLoading = false;
|
|
|
this.title = "编辑任务";
|
|
|
this.getTaskDetail(task.id);
|
|
|
this.getTaskProgressList(task.id); // 获取任务进展列表
|
|
|
- this.users(); // 获取名单数据
|
|
|
+ this.getUsers(); // 获取名单数据
|
|
|
this.gain(task); // 获取评论列表
|
|
|
},
|
|
|
// 获取评论列表
|
|
|
@@ -1356,7 +1363,6 @@
|
|
|
// 点击发布
|
|
|
release() {
|
|
|
if(this.textarea2.length <= 0) return this.$message({message: "请输入内容", type: "error"})
|
|
|
- // console.log(this.taskId);
|
|
|
this.http.post('/task-comment/add', {taskId: this.taskId, userId: this.user.id, content: this.textarea2},
|
|
|
res => {
|
|
|
if(res.code == "ok"){
|
|
|
@@ -1380,7 +1386,6 @@
|
|
|
},
|
|
|
// 滚动到底部
|
|
|
contRoll(){
|
|
|
- // console.log("滚动到底部");
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.main.scrollTop = this.$refs.contRoll.scrollHeight;
|
|
|
})
|
|
|
@@ -1390,7 +1395,6 @@
|
|
|
res => {
|
|
|
if (res.code == "ok") {
|
|
|
this.addForm = res.data;
|
|
|
- console.log(this.addForm, 'getTaskDetail');
|
|
|
this.addForm.createDate = null;
|
|
|
this.addForm.indate = null;
|
|
|
this.addLoading = false;
|
|
|
@@ -1498,7 +1502,6 @@
|
|
|
this.stageForm = {groupId: this.selectedGroup.id, projectId: this.curProjectId};
|
|
|
},
|
|
|
viewChange(index, indexPath) {
|
|
|
- console.log(index);
|
|
|
this.groupType = 1;
|
|
|
this.order = "create_date";
|
|
|
this.isDesc = true;
|
|
|
@@ -1507,7 +1510,6 @@
|
|
|
this.displayTable = true;
|
|
|
} ,
|
|
|
groupChange(index, indexPath) {
|
|
|
- console.log(index);
|
|
|
this.groupType = 0;
|
|
|
this.order = "seq";
|
|
|
this.isDesc = false;
|
|
|
@@ -1603,31 +1605,6 @@
|
|
|
});
|
|
|
},
|
|
|
|
|
|
- // addGroup() {
|
|
|
- // this.http.post('/task-group/save',this.groupForm,
|
|
|
- // res => {
|
|
|
- // if (res.code == "ok") {
|
|
|
- // this.groupList = res.data;
|
|
|
- // this.addGroupDialog = false;
|
|
|
- // this.modGroupDialog = false;
|
|
|
- // if (this.selectedGroup.id == this.groupForm.id) {
|
|
|
- // this.selectedGroup = this.groupForm;
|
|
|
- // }
|
|
|
- // } else {
|
|
|
- // this.$message({
|
|
|
- // message: res.msg,
|
|
|
- // type: "error"
|
|
|
- // });
|
|
|
- // }
|
|
|
- // },
|
|
|
- // error => {
|
|
|
- // this.$message({
|
|
|
- // message: error,
|
|
|
- // type: "error"
|
|
|
- // });
|
|
|
- // });
|
|
|
- // },
|
|
|
-
|
|
|
// 重新定义了 addGroup 方法
|
|
|
addGroup() {
|
|
|
this.http.post('/task-group/save',this.groupForm,
|
|
|
@@ -1636,7 +1613,6 @@
|
|
|
this.groupList = res.data;
|
|
|
this.addGroupDialog = false;
|
|
|
this.modGroupDialog = false;
|
|
|
- console.log(this.selectedGroup.id);
|
|
|
if (this.selectedGroup.id !== this.groupForm.id) {
|
|
|
this.selectedGroup = this.groupForm;
|
|
|
}
|
|
|
@@ -1702,8 +1678,6 @@
|
|
|
this.http.post('/task-group/list',{projectId: this.curProjectId},
|
|
|
res => {
|
|
|
if (res.code == "ok") {
|
|
|
- console.log(res);
|
|
|
- console.log(res.data.length)
|
|
|
this.allGroupData = res.data;
|
|
|
this.groupList = res.data;
|
|
|
if (this.groupList.length > 0) {
|
|
|
@@ -1736,7 +1710,6 @@
|
|
|
let path = this.$route.path;
|
|
|
path = path.substring(0,path.lastIndexOf('/'))+'/'+this.curProjectId;
|
|
|
this.$router.push(path);
|
|
|
- console.log('this.activeName=='+this.activeName);
|
|
|
this.getTaskGroups();
|
|
|
this.$refs.fileCenter.refreshPage();
|
|
|
this.$refs.projectInfo.refreshPage();
|
|
|
@@ -1807,7 +1780,6 @@
|
|
|
res => {
|
|
|
if (res.code == "ok") {
|
|
|
this.users = res.data.records;
|
|
|
- console.log(this.users, '得到的数据');
|
|
|
} else {
|
|
|
this.$message({
|
|
|
message: res.msg,
|
|
|
@@ -1981,7 +1953,6 @@
|
|
|
window.onresize = function temp() {
|
|
|
that.tableHeight = window.innerHeight - 135;
|
|
|
that.stageListHeight = that.tableHeight - 45;
|
|
|
- console.log('stageList height=='+that.stageListHeight);
|
|
|
};
|
|
|
},
|
|
|
mounted() {
|
|
|
@@ -1992,8 +1963,6 @@
|
|
|
this.getMyProjectList();
|
|
|
this.getInsideData();
|
|
|
this.getGroupTemplate();
|
|
|
- // tinymce.init({});
|
|
|
-
|
|
|
}
|
|
|
};
|
|
|
</script>
|
|
|
@@ -2336,18 +2305,20 @@
|
|
|
right: 20px;
|
|
|
}
|
|
|
}
|
|
|
-.issue-input {
|
|
|
+.inputDeep {
|
|
|
position: absolute;
|
|
|
- bottom: 85px;
|
|
|
+ bottom: 85px;
|
|
|
+ width: 95%;
|
|
|
+ margin: 0 12px;
|
|
|
}
|
|
|
-.inputDeep>>>.el-input__inner {
|
|
|
- border: 0;
|
|
|
- }
|
|
|
-.inputDeep>>>.el-textarea__inner {
|
|
|
+.inputDeep .el-textarea .el-textarea__inner{
|
|
|
border: 0 !important;
|
|
|
- resize: none !important;/* 这个是去掉 textarea 下面拉伸的那个标志，如下图 */
|
|
|
- }
|
|
|
-
|
|
|
+ resize: none !important;
|
|
|
+}
|
|
|
+.inputDeeps .el-textarea__inner {
|
|
|
+ border: 0 !important;
|
|
|
+ resize: none !important;
|
|
|
+}
|
|
|
.scop_span {
|
|
|
display: inline-block;
|
|
|
padding: 2px 5px;
|
|
|
@@ -2530,6 +2501,7 @@
|
|
|
.ddl {
|
|
|
height: 136px;
|
|
|
overflow: hidden;
|
|
|
+ border: 1px solid #EBEEF5
|
|
|
}
|
|
|
.tb{
|
|
|
position: relative;
|
Lljy-ai