Pārlūkot izejas kodu

样式修改,查询项目树结构数据参数修改

yanshichao 1 gadu atpakaļ
vecāks
revīzija
0ebbba6ddd

+ 1 - 1
src/views/dashboard/index.vue

@@ -92,7 +92,7 @@
     <el-dialog :title="detailForm.id+'、'+detailForm.taskName" :visible.sync="auditOpen" width="900px"
                class="i-audit-dialog" append-to-body @close="auditCancel">
       <div class="indicator">{{ currentTaskIndex + '/' + carouselNum }}</div>
-      <el-carousel ref="auditCarousel" trigger="click" height="630px" :autoplay="false" indicator-position="none"
+      <el-carousel ref="auditCarousel" trigger="click" height="calc(100vh - 110px)" :autoplay="false" indicator-position="none"
                    @change="auditTaskChange">
         <el-carousel-item v-for="item in carouselNum" :key="item">
           <task-detail :detail-form="detailForm"></task-detail>

+ 2 - 2
src/views/task/components/project.vue

@@ -325,7 +325,7 @@ export default {
       this.reset();
       let arr = []
       if (row.parentId != '0') {
-        arr.push(getProjectTree().then(response => {
+        arr.push(getProjectTree({status: '0'}).then(response => {
           this.projectOptions = response.data
         }))
         getAuditUsers().then(res => {
@@ -394,7 +394,7 @@ export default {
         this.form = res.data;
       }))
 
-      arr.push(getProjectTree().then(res => {
+      arr.push(getProjectTree({status: '0'}).then(res => {
         this.projectData = res.data
       }))
       await Promise.all(arr)

+ 5 - 7
src/views/task/components/taskDetail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="height:calc(100vh - 200px)">
+  <div style="height:calc(100vh - 240px)">
     <el-descriptions class="margin-top" :column="8" direction="vertical">
       <el-descriptions-item label="负责人">
         <div class="desc-item-content">{{ form.executorName }}</div>
@@ -97,7 +97,7 @@
         <span slot="label"><i class="el-icon-document"></i>
           <span style="margin-left: 5px">反馈信息({{ form.feedbacks.length }})</span>
         </span>
-        <el-table :data="form.feedbacks" size="mini" max-height="400" border>
+        <el-table :data="form.feedbacks" size="mini" height="320" border>
           <el-table-column width="75" label="反馈状态">
             <template slot-scope="scope">
               <div>{{ getFeedbackTypeName(scope.row.feedbackType) }}</div>
@@ -140,7 +140,7 @@
             <span style="margin-left: 5px">子任务({{ form.children.length }})</span>
           </span>
         <el-table :data="form.children"
-                  max-height="400"
+                  max-height="320"
                   size="mini"
                   @cell-mouse-enter="cellMouseEnter"
                   @cell-mouse-leave="cellMouseLeave"
@@ -187,9 +187,7 @@
         <span slot="label"><i class="el-icon-edit"></i>
           <span style="margin-left: 5px">修改日志({{ form.updateLogs.length }})</span>
         </span>
-        <el-table :data="form.updateLogs"
-                  max-height="400"
-                  size="mini">
+        <el-table :data="form.updateLogs" height="320" size="mini">
           <el-table-column label="修改项" prop="fieldName" width="90">
             <template slot-scope="scope">
               <span>{{ getFieldName(scope.row.field) }}</span>
@@ -336,7 +334,7 @@ export default {
 
 .description {
   margin-top: -13px;
-  max-height: 270px;
+  max-height: 180px;
   overflow: auto;
 }
 

+ 5 - 1
src/views/task/projectView.vue

@@ -332,7 +332,7 @@ export default {
       this.$set(this.queryParams, 'startDate', DateUtil.beforeDay(null, 15))
       this.$set(this.queryParams, 'endDate', DateUtil.afterDay(null, 15))
       this.getList()
-      getProjectTree().then(res => {
+      getProjectTree({status: '0'}).then(res => {
         this.projectTree = res.data
       })
       getDeptUserTree('1').then(res => {
@@ -627,6 +627,10 @@ export default {
   padding: 0 20px 10px 20px;
 }
 
+.add-dialog ::v-deep .el-dialog__body {
+  padding: 0 20px 10px 20px;
+}
+
 .el-tag--dark {
   border-color: white;
 }

+ 1 - 1
src/views/task/task.vue

@@ -585,7 +585,7 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加任务";
-      getProjectTree().then(response => {
+      getProjectTree({status:'0'}).then(response => {
         this.projectOptions = response.data
         if (this.selectProjectId && this.projectOptions.length > 0) {
           let ids = this.projectOptions.map(item => item.id);