Merge branch 'http_test' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into wangzi_dev

src/styles/PublicStyle/index.scss

@@ -38,7 +38,12 @@
     padding-left: 10px;
     width: 73px;
   }
-  }
+}
+
+.public_Jump:hover { // 列表点击name跳转hover
+  cursor: pointer;
+  color: #6AB4FF;
+}
 
 .status_color { // 迭代状态样式修改（颜色）
   /deep/ input {
@@ -54,7 +59,7 @@
   /deep/ .el-select__caret {
     color: #6AB4FF !important;
   }
-  }
+}
 
   .status_color1 { // 迭代状态样式修改（颜色）
     /deep/ input {
@@ -121,7 +126,7 @@
   }
 
   .scroll { // 添加滚动条（记得设置height）
-    overflow:scroll;
+    overflow: scroll;
     overflow-x: hidden;
   }
 

src/views/projectManage/iteration/components/PlanningIteration.vue

@@ -1,20 +1,31 @@
 <template>
   <el-dialog :visible.sync="visibleplanning" class="dialogBack" style=" background: #F2F3F6; color: #333B4A;" fullscreen :modal="false" :show="show" title="规划迭代" width="60%" @close="OnClose()">
     <el-container>
-      <el-main style="padding: 0;" class="public_main Layout_space_between">
+      <el-main style="padding: 0px;margin: 10px;" class="public_main Layout_space_between">
         <div class="boxShadow">
           <div style="margin: 0 10px;" class="Layout_space_between">
             <div class="Layout_flex_start">
               <el-checkbox v-model="checkAllLeft" :indeterminate="isIndeterminateLeft" class="titNameX" style="margin: 10px; line-height: 32px;" @change="handleCheckAllChange1" />未规划的需求
             </div>
-            <el-input v-model="value1" style="width:30%;" clearable size="small" placeholder="搜索需求名称或ID" @input="search(value1)" />
+            <el-input v-model="value1" style="width:30%;" clearable size="small" suffix-icon="el-icon-search" placeholder="搜索需求名称或ID" @input="search(value1)" />
           </div>
           <el-divider />
           <el-container>
-            <el-main class="scroll" style="height: calc(100vh - 370px);">
+            <el-main class="scroll" style="height: calc(100vh - 279px);" @scroll.native="getScroll($event)">
               <el-checkbox-group v-if="citiesLeft.length>0" v-model="checkedCitiesLeft" @change="handleCheckedCitiesChange1">
                 <el-checkbox v-for="item in citiesLeft" :key="item.id" :label="item" class="Layout_flex_start" style="margin: 10px 0;">
-                  <span class="priority">{{ item.priorityName }}</span>
+                  <span
+                    class="priority"
+                    :class="{
+                      'priority_color': item.priority === 0,
+                      'priority_color1': item.priority === 1,
+                      'priority_color2': item.priority === 2,
+                      'priority_color3': item.priority === 3,
+                      'priority_color4': item.priority === 4,
+                      'priority_color5': item.priority === 5,
+                      'priority_color6': item.priority === 6
+                    }"
+                  >{{ item.priorityName }}</span>
                   <span class="Requirement">{{ item.name | ellipsis }}</span>
                   <span class="RequirementId">{{ item.requirementDisplayId }}</span>
                   <span class="RequirementName">{{ item.pm.name }}</span>
@@ -27,33 +38,44 @@
                 </div>
               </div>
             </el-main>
-            <el-footer style="text-align: center;">
-              <div v-if="citiesLeft.length > 15" class="solt" @click="LoadMore">加载更多 </div>
+            <el-footer v-show="scrollBottom === 0" style="text-align: center; height: 35px;">
+              <el-button class="solt public_Jump" type="text" :loading="loadingBtn" :disabled="Load === '没有更多了'" @click="LoadMore">{{ Load }}</el-button>
             </el-footer>
           </el-container>
         </div>
 
         <div>
-          <div class="rectangle">
-            <svg-icon v-if="leftArray.length === 0" icon-class="右箭头" />
-            <svg-icon v-if="leftArray.length > 0" icon-class="右箭头1" @click="torightLeft(1)" />
+          <div :class="{'rectangleTow': leftArray.length !== 0, 'rectangle': leftArray.length === 0}">
+            <svg-icon v-if="leftArray.length === 0" class="inlineBlock" icon-class="右箭头" />
+            <svg-icon v-if="leftArray.length > 0" class="inlineBlock" icon-class="右箭头1" @click="torightLeft(1)" />
           </div>
-          <div class="rectangle">
-            <svg-icon v-if="rightArray.length === 0" icon-class="左箭头" />
-            <svg-icon v-if="rightArray.length > 0" icon-class="左箭头1" @click="torightLeft(2)" />
+          <div :class="{'rectangleTow': rightArray.length !== 0, 'rectangle': rightArray.length === 0}">
+            <svg-icon v-if="rightArray.length === 0" class="inlineBlock" icon-class="左箭头" />
+            <svg-icon v-if="rightArray.length > 0" class="inlineBlock" icon-class="左箭头1" @click="torightLeft(2)" />
           </div>
         </div>
 
         <div class="boxShadow">
           <div class="Layout_flex_start" style="margin-left: 10px;">
-            <el-checkbox v-model="checkAll" :indeterminate="isIndeterminate" class="titNameX" style="margin: 10px; line-height: 32px;" @change="handleCheckAllChange" />迭代
+            <el-checkbox v-model="checkAll" :indeterminate="isIndeterminate" class="titNameX" style="margin: 10px; line-height: 32px;" @change="handleCheckAllChange" />{{ iterationData.name }}
           </div>
           <el-divider />
           <el-container>
-            <el-main class="scroll" style="height: calc(100vh - 370px);">
+            <el-main class="scroll" style="height: calc(100vh - 279px);" @scroll.native="getScrollTow($event)">
               <el-checkbox-group v-if="cities.length>0" v-model="checkedCities" @change="handleCheckedCitiesChange">
                 <el-checkbox v-for="item in cities" :key="item.id" :label="item" class="Layout_flex_start" style="margin: 10px 0;">
-                  <span class="priority">{{ item.priorityName }}</span>
+                  <span
+                    class="priority"
+                    :class="{
+                      'priority_color': item.priority === 0,
+                      'priority_color1': item.priority === 1,
+                      'priority_color2': item.priority === 2,
+                      'priority_color3': item.priority === 3,
+                      'priority_color4': item.priority === 4,
+                      'priority_color5': item.priority === 5,
+                      'priority_color6': item.priority === 6
+                    }"
+                  >{{ item.priorityName }}</span>
                   <span class="Requirement">{{ item.name | ellipsis }}</span>
                   <span class="RequirementId">{{ item.requirementDisplayId }}</span>
                   <span class="RequirementName">{{ item.pm.name }}</span>
@@ -66,13 +88,13 @@
                 </div>
               </div>
             </el-main>
-            <el-footer style="text-align: center;">
-              <div v-if="cities.length > 15" class="solt" @click="LoadMore">加载更多 </div>
+            <el-footer v-show="scrollBottomRight === 0" style="text-align: center; height: 35px;">
+              <el-button class="solt public_Jump" type="text" :loading="loadingBtn" :disabled="LoadTow === '没有更多了'" @click="LoadMore">{{ LoadTow }}</el-button>
             </el-footer>
           </el-container>
         </div>
       </el-main>
-      <el-footer class="public_footer">
+      <el-footer style="background: #FFF; text-align: right; padding: 10px;">
         <el-button @click="OnClose">取 消</el-button>
         <el-button type="primary" @click="addRequired()">确 定</el-button>
       </el-footer>
@@ -83,9 +105,8 @@
 
 <script>
 import '@/styles/PublicStyle/index.scss'
-import { iterationRequire, iterationUpdateBelongingIteration, requirementQueryRequirementInfoList } from '@/api/iteration.js'
+import { iterationRequire, iterationUpdateBelongingIteration, requirementQueryRequirementInfoList, iterationList } from '@/api/iteration.js'
 export default {
-  name: 'TemplateDialog',
   filters: {
     ellipsis(value) {
       if (!value) return ''
@@ -97,7 +118,8 @@ export default {
   },
   props: {
     show: { type: Boolean, default: false },
-    iterationIds: { type: Number, default: null }
+    iterationId: { type: Number, default: null },
+    title: { type: Object, default: null }
   },
   data() {
     return {
@@ -112,10 +134,19 @@ export default {
       checkedLeft: '',
       visibleplanning: this.show,
       value1: '',
+      Load: '加载更多',
+      LoadTow: '加载更多',
+      iterationData: {}, // 当前迭代数据
       leftArray: [],
       rightArray: [],
+      scrollBottom: '', // 滚动条（左）
+      scrollBottomRight: '', // 滚动条（右）
+      loadingBtn: false, // 更多loading
+      citiesLeftTotal: '', // 左total
+      citiesTotal: '', // 右total
       reqRight: [],
-      size: 50
+      size: 50,
+      bizId: localStorage.getItem('bizId')
     }
   },
   watch: {
@@ -130,13 +161,18 @@ export default {
     this.getRequirement()
   },
   methods: {
-    getRequirement() { // 获取需求
+    async getRequirement() { // 获取需求/迭代
       this.leftArray = []
       this.rightArray = []
-      iterationRequire({ id: this.iterationIds, curIndex: 1, pageSize: 50 }).then(res => {
-        this.citiesLeft = res.data.left.list // 无归属需求
-        this.cities = res.data.right.list // 迭代下需求
-      })
+      const list = iterationList({ id: this.iterationId, curIndex: 1, pageSize: 15, bizId: this.bizId })
+      const listRes = await list
+      this.iterationData = listRes.data.list[0]
+      const iterationRequireList = iterationRequire({ id: this.iterationId, curIndex: 1, pageSize: 50, bizId: this.bizId })
+      const iterationRequireRes = await iterationRequireList
+      this.citiesLeft = iterationRequireRes.data.left.list // 无归属需求
+      this.citiesLeftTotal = iterationRequireRes.data.left.total
+      this.cities = iterationRequireRes.data.right.list // 迭代下需求
+      this.citiesTotal = iterationRequireRes.data.right.total // 迭代下需求total
     },
 
     handleCheckAllChange(val) { // 迭代下需求全选
@@ -195,6 +231,23 @@ export default {
       this.checkedCitiesLeft = []
       this.checkedCities = []
     },
+
+    getScroll(event) { // 左侧滚动条监控
+      const scrollBottom = event.target.scrollHeight - event.target.scrollTop - event.target.clientHeight // 滚动条距离底部的距离scrollBottom
+      this.scrollBottom = scrollBottom
+      if (this.scrollBottom === 0) {
+        this.citiesLeft.length === this.citiesLeftTotal ? this.Load = '没有更多了' : ''
+      }
+    },
+
+    getScrollTow(event) { // 右侧滚动条监控
+      const scrollBottom = event.target.scrollHeight - event.target.scrollTop - event.target.clientHeight // 滚动条距离底部的距离scrollBottom
+      this.scrollBottomRight = scrollBottom
+      if (this.scrollBottomRight === 0) {
+        this.cities.length === this.citiesTotal ? this.LoadTow = '没有更多了' : ''
+      }
+    },
+
     addRequired() { // 保存迭代下需求
       const requirementIds = []
       const requiredArr = []
@@ -206,25 +259,28 @@ export default {
       })
       const data = [
         { id: -1, requirementIds: requiredArr.toString() },
-        { id: this.iterationIds, name: '测试', requirementIds: requirementIds.toString() }
+        { id: this.iterationId, bizId: this.bizId, requirementIds: requirementIds.toString() }
       ]
       iterationUpdateBelongingIteration(data).then(res => {
         if (res.code === 200) {
           this.$emit('update:show', false)
+          this.$emit('iteratioFilter')
           this.$message({ showClose: true, message: '保存成功', type: res.msg })
         }
       })
     },
 
     LoadMore() { // 加载更多
-      requirementQueryRequirementInfoList({ name: '', curIndex: 1, pageSize: this.size + 50, iterationId: -1, bizId: '' }).then(res => {
+      this.loadingBtn = true
+      requirementQueryRequirementInfoList({ name: '', curIndex: 1, pageSize: this.size + 50, iterationId: -1, bizId: this.bizId }).then(res => {
         this.citiesLeft = res.data.list
         this.size = this.size + 50
+        this.loadingBtn = false
       })
     },
 
     search(value) { // 需求查询
-      requirementQueryRequirementInfoList({ name: value, curIndex: 1, pageSize: this.size + 50, iterationId: -1, bizId: '' }).then(res => {
+      requirementQueryRequirementInfoList({ name: value, curIndex: 1, pageSize: this.size + 50, iterationId: -1, bizId: this.bizId }).then(res => {
         this.citiesLeft = res.data.list
       })
     },
@@ -249,8 +305,10 @@ export default {
 }
 
  .dialogBack {
+   font-family: MicrosoftYaHei;
+
   /deep/ .el-dialog__body {
-    padding: 10px;
+    padding: 0px;
     font-size: 14px;
     word-break: break-all;
     background: #F2F3F6;
@@ -280,17 +338,14 @@ export default {
     opacity:1;
     border-radius:7px;
     width: 45%;
-    min-height: calc(100vh - 240px);
-    margin-bottom: 30px;
+    min-height: calc(100vh - 190px);
   }
 
   .solt {
     font-size: 12px;
-    font-family: MicrosoftYaHei;
     line-height: 14px;
     color: #999999;
     opacity: 1;
-    cursor: pointer;
     position: relative;
     top: 50%;
     transform: translateY(-50%);
@@ -308,21 +363,30 @@ export default {
     cursor: pointer;
   }
 
+  .rectangleTow {
+    width:50px;
+    height:146px;
+    line-height: 146px;
+    margin: 10px 0;
+    text-align: center;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 11px #409EFF ;
+    opacity:1;
+    cursor: pointer;
+  }
+
   .titNameX {
     width:13px;
     font-size:14px;
-    font-family:PingFangSC-Medium;
     color:rgba(74,74,74,1);
     opacity:1;
   }
 
   .Layout_space_between .priority {
     width:40px;
-    background:rgba(245,108,108,1);
     opacity:1;
     border-radius:4px;
-    font-size:14px;
-    font-family:MicrosoftYaHei;
+    font-size:12px;
     line-height:17px;
     color:rgba(255,255,255,1);
     text-align: center;
@@ -331,8 +395,7 @@ export default {
 
   .Requirement {
     width:187px;
-    font-size:14px;
-    font-family:MicrosoftYaHei;
+    font-size:12px;
     line-height:17px;
     color:rgba(51,51,51,1);
     opacity:1;
@@ -340,17 +403,15 @@ export default {
 
   .RequirementId {
     width:150px;
-    font-size:14px;
-    font-family:MicrosoftYaHei;
+    font-size:12px;
     line-height:17px;
     color:rgba(102,102,102,1);
     opacity:1;
   }
 
   .RequirementName {
-    width:46px;
-    font-size:14px;
-    font-family:MicrosoftYaHei;
+    width:100px;
+    font-size:12px;
     line-height:17px;
     color:rgba(102,102,102,1);
     opacity:1;
@@ -369,11 +430,15 @@ export default {
 
   .TipsName {
     font-size:12px;
-    font-family:MicrosoftYaHei;
     line-height:14px;
     color:rgba(191,198,220,1);
     opacity:1;
   }
+
+  .inlineBlock {
+    width: 26px;
+    display: inline-block;
+  }
  }
 
  </style>

src/views/projectManage/iteration/components/create.vue

@@ -10,8 +10,8 @@
           v-model="iteration.startTime"
           type="date"
           placeholder="选择日期时间"
-          format="yyyy-MM-dd HH:mm:ss"
-          value-format="yyyy-MM-dd HH:mm:ss"
+          format="yyyy.MM.dd"
+          value-format="yyyy.MM.dd"
           style="width: 90%;"
         />
       </el-form-item>
@@ -20,9 +20,8 @@
           v-model="iteration.endTime"
           type="date"
           placeholder="选择日期时间"
-          format="yyyy-MM-dd HH:mm:ss"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          default-time="23:59:59"
+          format="yyyy.MM.dd"
+          value-format="yyyy.MM.dd"
           style="width: 90%;"
         />
       </el-form-item>
@@ -49,6 +48,7 @@ export default {
       userInformation: localStorage.getItem('username'),
       userNames: localStorage.getItem('realname'),
       titName: this.title,
+      bizId: localStorage.getItem('bizId'),
       iteration: {},
       rules: {
         name: [
@@ -83,6 +83,7 @@ export default {
     createdIteration(val) { // 创建迭代
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
+          val.bizId = this.bizId
           if (this.title === '新建迭代') {
             iterationCreate(val).then(res => {
               this.$message({ showClose: true, message: res.msg, type: 'success' })

src/views/projectManage/iteration/components/requiredTable.vue

@@ -58,18 +58,18 @@
     </div>
     <el-table
       ref="topicTable"
+      v-loading="loading"
       :data="RequirementSet"
-      size="small"
       row-key="id"
       :show-header="showHeader"
-      :header-cell-style="{ color: '#4A4A4A', fontSize: '14px', fontWeight: '550', textAlign: 'center' }"
+      :header-cell-style="{ color: '#4A4A4A', fontSize: '14px', fontWeight: '550', background: '#F7F7F7', borderTop: '1px solid #eceef6' }"
       show-overflow-tooltip="true"
       @selection-change="handleSelectionChange"
     >
       <el-table-column width="35">
-        <img style="display: inline-block; width: 14px; vertical-align: middle;" :src="image_role">
+        <img style="display: inline-block; width: 8px; vertical-align: middle;" :src="image_role">
       </el-table-column>
-      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column type="selection" min-width="40" align="center" />
       <!-- <el-table-column type="expand" width="40">
         <template slot="header">
           <div class="expand"><i v-show="!allChange" class="el-icon-plus" @click="expandAll(true)" /></div>
@@ -99,9 +99,9 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="需求名称" min-width="250" show-overflow-tooltip align="left">
+      <el-table-column label="需求名称" min-width="250" show-overflow-tooltip>
         <template v-slot="scope">
-          {{ scope.row.name }}
+          <span class="public_Jump" @click="clickRequiredName(scope.row.id)">{{ scope.row.name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="状态" min-width="100" align="center">
@@ -125,7 +125,7 @@
       </el-table-column>
       <el-table-column label="PM" min-width="100" show-overflow-tooltip align="center">
         <template v-slot="scope">
-          {{ scope.row.name }}
+          {{ scope.row.pm.name }}
         </template>
       </el-table-column>
       <el-table-column label="需求来源" min-width="100" show-overflow-tooltip align="center">
@@ -140,7 +140,7 @@
       </el-table-column>
       <el-table-column label="PRD链接" min-width="100" show-overflow-tooltip align="center">
         <template v-slot="scope">
-          <el-link :href="scope.row.mrdUrl" target="_blank">{{ scope.row.mrdUrl }}</el-link>
+          <a :href="scope.row.mrdUrl" style="color: #409EFF;" target="_blank">{{ scope.row.mrdUrl }}</a>
         </template>
       </el-table-column>
     </el-table>
@@ -178,13 +178,15 @@ export default {
       requiredArray: [], // 需求状态
       showHeader: true, // 是否显示表头
       checkAll: [],
+      loading: true,
       searchResult: [], // 变更迭代下的数据
       SearchIterationValue: '',
       checkAlls: false,
+      iterationId: Number(this.$route.query.id),
       selectedData: [], // 选中的数据
       RequirementSet: [], // 迭代下的需求
-      iterationId: Number(this.$route.query.id), // 当前迭代的id
-      iterationData: {} //
+      iterationData: {}, //
+      bizId: localStorage.getItem('bizId')
     }
   },
   mounted() {
@@ -194,7 +196,7 @@ export default {
   },
   methods: {
     async iteratioFilter() {
-      const list = iterationList({ id: this.iterationId, curIndex: 1, pageSize: 15 })
+      const list = iterationList({ id: this.iterationId, curIndex: 1, pageSize: 15, bizId: this.bizId })
       const requiredList = iterationRequire({ id: this.iterationId, curIndex: 1, pageSize: 50 })
       const requirementEnum = showRequirementEnum()
       const listRes = await list
@@ -204,10 +206,11 @@ export default {
       this.RequirementSet = listRequire.data.right.list
       this.requiredArray = requiredstatus.data.requirementStatus
       this.checkAll = this.RequirementSet
+      this.loading = false
     },
 
     SearchIteration(e) { // 筛选change
-      iterationList({ name: e, curIndex: 1, pageSize: 1000 }).then(res => { // 调用查询迭代list
+      iterationList({ name: e, curIndex: 1, pageSize: 1000, bizId: this.bizId }).then(res => { // 调用查询迭代list
         this.searchResult = res.data.list
       })
     },
@@ -245,6 +248,10 @@ export default {
       )
     },
 
+    clickRequiredName(e) { // 需求跳转
+      this.$router.push({ name: '需求详情', params: { id: e + '' }})
+    },
+
     expandAll(e, ele) { // 展开表格
       this.allChange = e
     },
@@ -290,14 +297,13 @@ export default {
           const currRow = _this.RequirementSet.splice(oldIndex, 1)[0]
           _this.RequirementSet.splice(newIndex, 0, currRow)
           const obj = {
-            id: [],
-            iterationId: ''
+            id: []
           }
           _this.RequirementSet.map(item => {
-            obj.iterationId = item.iterationId
             obj.id.push(item.id)
           })
-          iterationOrder(obj.id, obj.iterationId).then(res => {
+          console.log(_this.iterationId, 'cdcscdsc')
+          iterationOrder(obj.id, _this.iterationId).then(res => {
             if (res.code === 200) {
               _this.$message.success(res.msg)
               _this.iteratioFilter()
@@ -341,7 +347,7 @@ export default {
 }
 
 .el-header {
-    padding: 20px;
+  padding: 20px;
 }
 
 .iteration_back {

src/views/projectManage/iteration/details/iterationDetails.vue

@@ -26,7 +26,7 @@
             />
           </el-select>
         </div>
-        <div class="Layout_space_between" style="color: #c4c3c3;">
+        <div class="Layout_space_between">
           <el-button size="mini" type="primary" @click=" PlanningIteration(),visibleplanning = true">规划迭代</el-button>
           <div class="el-icon-setting partition" @click="showIteration = true" />
           <div class="el-icon-delete LittleHand" @click="dialogVisible = true" />
@@ -35,7 +35,7 @@
     </el-header>
     <el-main class="public_main">
       <!-- 需求 table -->
-      <required-table />
+      <required-table ref="requiredTable" :iteration-id="iterationId" />
     </el-main>
     <el-footer class="public_footer" />
     <!-- 删除 dialog -->
@@ -43,7 +43,7 @@
     <!-- 迭代配置 dialog -->
     <iteration-create title="迭代配置" width="60%" :show.sync="showIteration" :iterations="iterationData" @iteratioFilter="iteratioFilter" />
     <!-- 规划迭代 dialog -->
-    <planning-iteration ref="planningIteration" :show.sync="visibleplanning" :iteration-ids="iterationId" @iteratioFilter="iteratioFilter" />
+    <planning-iteration ref="planningIteration" :show.sync="visibleplanning" :iteration-id="iterationId" @iteratioFilter="iteratioFilter" />
   </el-container>
 </template>
 
@@ -78,23 +78,31 @@ export default {
       visibleplanning: false, // 规划迭代（弹窗）
       selectedData: [], // 选中的数据
       iterationId: Number(this.$route.query.id), // 当前迭代的id
-      iterationData: {}
+      iterationData: {},
+      bizId: localStorage.getItem('bizId')
     }
   },
   mounted() {
     this.iteratioFilter()
+    this.$store.state.data.status = true
+    this.$store.state.data.bizId = true
+  },
+  destroyed() {
+    this.$store.state.data.status = false
+    this.$store.state.data.bizId = false
   },
   methods: {
     async iteratioFilter() { // 迭代list
-      const list = iterationList({ id: this.iterationId, curIndex: 1, pageSize: 15 })
+      const list = iterationList({ id: this.iterationId, curIndex: 1, pageSize: 15, bizId: this.bizId })
       const listRes = await list
       this.iterationData = listRes.data.list[0]
       const status = configShowIterationListEnum()
       const responseStatus = await status
       this.statusArr = responseStatus.data.iterationStatus
+      this.$refs.requiredTable.iteratioFilter()
     },
     changeIterationStatus(e) { // 修改状态
-      iterationUpdate({ status: e, id: this.iterationData.id, name: this.iterationData.name }).then(res => {
+      iterationUpdate({ status: e, id: this.iterationData.id, name: this.iterationData.name, bizId: this.bizId }).then(res => {
         this.$message({ showClose: true, message: '状态更改成功！', type: res.msg })
         this.iteratioFilter()
       })
@@ -122,9 +130,9 @@ export default {
 }
 
 .partition {
+    color: #6F7C93;
     border-left: 1px solid #c4c3c3;
     border-right: 1px solid #c4c3c3;
-    line-height: 26px;
     width: 35px;
     text-align: center;
     margin: 0 10px;
@@ -132,6 +140,7 @@ export default {
 }
 
 .LittleHand {
+   color: #6F7C93;
   cursor: pointer;
 }
 }

src/views/projectManage/iteration/index.vue

@@ -31,7 +31,15 @@
       </div>
     </el-header>
     <el-main class="public_main">
-      <el-table :data="iterationTableData" style="width: 100%" show-overflow-tooltip="true">
+      <el-table
+        v-loading="loading"
+        :data="iterationTableData"
+        :header-cell-style="{ 'color':'rgba(74,74,74,1)','font-size':'14px','font-weight':'500' }"
+        :cell-style="{ 'font-size':'14px','color':'rgba(102,102,102,1)' }"
+        size="small"
+        style="width: 100%"
+        show-overflow-tooltip="true"
+      >
         <el-table-column label="迭代名称" align="left" min-width="350" show-overflow-tooltip>
           <template slot-scope="scope">
             <span class="iterationName" @click="cilckIterationName(scope.row)">{{ scope.row.name }}</span>
@@ -92,6 +100,7 @@ export default {
       iteration: {}, // 筛选项
       curIndex: 1, // 分页
       pageSize: 15, // 分页
+      loading: true,
       options: [],
       test: [],
       filterItems: {},
@@ -99,28 +108,36 @@ export default {
       total: 0,
       showIteration: false,
       currentPage: 1,
-      iterationTableData: []
+      iterationTableData: [],
+      bizId: localStorage.getItem('bizId')
     }
   },
   mounted() {
     this.iteratioFilter()
     this.getEnumList()
+    this.$store.state.data.status = true
+  },
+  destroyed() {
+    this.$store.state.data.status = false
   },
   methods: {
     iteratioFilter(e, val) { // 筛选change
+      this.loading = true
       let data = {}
       e === 1 ? data = this.filterItems : this.filterItems = {}
+      data.bizId = this.bizId
       data.curIndex = this.curIndex
       data.pageSize = this.pageSize
       // 调用查询迭代list
       iterationList(data).then(res => {
         this.iterationTableData = res.data.list
         this.total = res.data.total
+        this.loading = false
       })
     },
 
     changeIterationStatus(e) { // 修改状态
-      iterationUpdate({ status: e.status, id: e.id, name: e.name }).then(res => {
+      iterationUpdate({ status: e.status, id: e.id, name: e.name, bizId: this.bizId }).then(res => {
         this.$message({ showClose: true, message: '状态更改成功！', type: res.msg })
         this.iteratioFilter()
       })
@@ -188,15 +205,19 @@ export default {
 
 .searchName {
   width: 100px;
+  font-size:14px;
+  font-family:MicrosoftYaHei;
+  line-height:17px;
+  color:rgba(51,51,51,1);
+  opacity:1;
 }
 
 .el-header {
-    padding: 20px;
+    padding: 10px 20px;
 }
 
 .el-pagination {
   display: inline;
-  /* margin: 0.8% 0 1% 0; */
   vertical-align: bottom;
 }