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

src/api/requirement.js

@@ -92,7 +92,7 @@ export function getBugStatusMapInfo(data) {
 
 export function getTaskByRequireId(data) {
   return request({
-    url: requestIp + '/task/listByTaskId',
+    url: requestIp + '/task/listByRequireId',
     method: 'get',
     params: data
   })

src/views/Platform/MyTinymce/MyTinymce.vue

@@ -17,6 +17,7 @@ import 'tinymce/plugins/wordcount'
 import 'tinymce/plugins/colorpicker'
 import 'tinymce/plugins/textcolor'
 import 'tinymce/skins/ui/oxide/skin.css'
+import 'tinymce/icons/default/icons'
 export default {
   name: 'MyTinymce',
   components: {

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

@@ -11,7 +11,7 @@
           </div>
           <el-divider />
           <el-container>
-            <el-main class="scroll" style="height: calc(100vh - 279px);" @scroll.native="getScroll($event)">
+            <el-main class="scroll" style="height: calc(100vh - 255px);" @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
@@ -30,6 +30,9 @@
                   <span class="RequirementId">{{ item.requirementDisplayId }}</span>
                   <span class="RequirementName">{{ item.pm.name }}</span>
                 </el-checkbox>
+                <div style="text-align: center; height: 35px;">
+                  <el-button v-show="scrollBottom === 0" class="solt public_Jump" type="text" :loading="loadingBtn" :disabled="Load === '没有更多了'" @click="LoadMore">{{ Load }}</el-button>
+                </div>
               </el-checkbox-group>
               <div v-else style="text-align: center; height: 100%">
                 <div class="imgCenter">
@@ -38,20 +41,17 @@
                 </div>
               </div>
             </el-main>
-            <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="{'rectangleTow': leftArray.length !== 0, 'rectangle': leftArray.length === 0}">
+          <div :class="{'rectangleTow': leftArray.length !== 0, 'rectangle': leftArray.length === 0}" @click="torightLeft(1)">
             <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)" />
+            <svg-icon v-if="leftArray.length > 0" class="inlineBlock" icon-class="右箭头1" />
           </div>
-          <div :class="{'rectangleTow': rightArray.length !== 0, 'rectangle': rightArray.length === 0}">
+          <div :class="{'rectangleTow': rightArray.length !== 0, 'rectangle': rightArray.length === 0}" @click="torightLeft(2)">
             <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)" />
+            <svg-icon v-if="rightArray.length > 0" class="inlineBlock" icon-class="左箭头1" />
           </div>
         </div>
 
@@ -61,7 +61,7 @@
           </div>
           <el-divider />
           <el-container>
-            <el-main class="scroll" style="height: calc(100vh - 279px);" @scroll.native="getScrollTow($event)">
+            <el-main class="scroll" style="height: calc(100vh - 255px);" @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
@@ -80,6 +80,9 @@
                   <span class="RequirementId">{{ item.requirementDisplayId }}</span>
                   <span class="RequirementName">{{ item.pm.name }}</span>
                 </el-checkbox>
+                <div style="text-align: center; height: 35px;">
+                  <el-button v-show="scrollBottomRight === 0" class="solt public_Jump" type="text" :loading="loadingBtn" :disabled="LoadTow === '没有更多了'" @click="LoadMore">{{ LoadTow }}</el-button>
+                </div>
               </el-checkbox-group>
               <div v-else style="text-align: center; height: 100%">
                 <div class="imgCenter">
@@ -88,9 +91,6 @@
                 </div>
               </div>
             </el-main>
-            <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>
@@ -433,6 +433,7 @@ export default {
     line-height:14px;
     color:rgba(191,198,220,1);
     opacity:1;
+    margin-top: 20px;
   }
 
   .inlineBlock {

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

@@ -197,7 +197,7 @@ export default {
   methods: {
     async iteratioFilter() {
       const list = iterationList({ id: this.iterationId, curIndex: 1, pageSize: 15, bizId: this.bizId })
-      const requiredList = iterationRequire({ id: this.iterationId, curIndex: 1, pageSize: 50 })
+      const requiredList = iterationRequire({ id: this.iterationId, curIndex: 1, pageSize: 50, bizId: this.bizId })
       const requirementEnum = showRequirementEnum()
       const listRes = await list
       const listRequire = await requiredList

src/views/projectManage/requirement/list/create.vue

@@ -192,6 +192,7 @@ export default {
           }
           this.belProject = false
           this.form.source = 1
+          this.$set(this.form, 'belongingProject', '-1')
           this.form.dependOnRelease = 0
         }
         this.$emit('cancel', false)