From 0f0506ceb30bfc537312ec75af6abef1de0b5325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 26 Nov 2023 15:59:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=93=E5=AD=98=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=BE=AA=E7=8E=AF=E6=97=B6=E9=97=B4=E4=B8=BA1?=
 =?UTF-8?q?=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mdp_pub/mdp_api_base.js               |  2 +-
 .../mdp-ui/mdp-select-table/Index.vue         | 26 +++++--------------
 src/views/xm/core/xmMenu/XmEpicFeatures.vue   |  4 +--
 src/views/xm/core/xmMenu/XmMenuMng.vue        | 13 +++++-----
 src/views/xm/core/xmProduct/XmProductMng.vue  |  2 +-
 .../xm/core/xmQuestion/XmQuestionEdit.vue     |  5 ++--
 .../xm/core/xmQuestion/XmQuestionMng.vue      |  5 +---
 src/views/xm/core/xmTask/XmPhase.vue          |  6 ++---
 8 files changed, 23 insertions(+), 40 deletions(-)

diff --git a/src/api/mdp_pub/mdp_api_base.js b/src/api/mdp_pub/mdp_api_base.js
index a788706a..812de390 100644
--- a/src/api/mdp_pub/mdp_api_base.js
+++ b/src/api/mdp_pub/mdp_api_base.js
@@ -148,7 +148,7 @@ ajaxGetDictOptions:function(itemCode, params)
       if(lock){
         setTimeout(()=>{
           func();
-        },2000)
+        },1000)
       }else{
         func();
       }
diff --git a/src/components/mdp-ui/mdp-select-table/Index.vue b/src/components/mdp-ui/mdp-select-table/Index.vue
index c5f10c12..53c0e362 100644
--- a/src/components/mdp-ui/mdp-select-table/Index.vue
+++ b/src/components/mdp-ui/mdp-select-table/Index.vue
@@ -107,7 +107,7 @@
   
   <script> 
   import {MdpSelectMixin } from "../../mdp-ui/mixin/MdpSelectMixin.js"
-   var tableDataCacheMap=new Map();
+   const tableDataCacheMap=new Map();
   export default {
     components: {  },
     name: 'mdp-select-table',
@@ -141,7 +141,7 @@
       }
     },
     methods:{
-      getCacheList(){
+      getCacheList(){ 
         var tableDataCacheList=tableDataCacheMap.get(this.codeKey)
         if(!tableDataCacheList){
           tableDataCacheList=[]
@@ -170,15 +170,8 @@
         var tableDataCacheList=this.getCacheList();
         if(tableDataCacheList && tableDataCacheList.length>0){
           this.item={itemType:'4',options:tableDataCacheList}
-        }else{
-          var tableDatasStr=localStorage.getItem(this.codeKey)
-          if(tableDatasStr){
-            var tableDatas=JSON.parse(tableDatasStr)
-            this.item={itemType:'4',options:tableDatas}
-            this.setCacheList(tableDatas)
-          }else{
-            this.item={itemType:'4',options:[]}
-          }
+        }else{ 
+          this.item={itemType:'4',options:[]} 
         } 
         if(this.value){
           var mVals=[]
@@ -233,9 +226,7 @@
         this.onClose();
         this.$refs['tableDialog'].close();
       },
-      onClose(){
-        var tableDataCacheList=this.getCacheList();
-        localStorage.setItem(this.codeKey,JSON.stringify(tableDataCacheList));
+      onClose(){ 
       },
        
     },
@@ -244,12 +235,7 @@
         this.initItemOptions();
         
         
-    },
-    
-    beforeDestroy(){ 
-      var tableDataCacheList=this.getCacheList();
-      localStorage.setItem(this.codeKey,JSON.stringify(tableDataCacheList));
-    }
+    }, 
   }
   </script>
   <style lang="scss" scoped>  
diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index 6f7ba7e7..5fbc204c 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
@@ -11,7 +11,7 @@
 						width="250"
 						trigger="click" >
 						<el-row>
-							<el-row>
+							<el-row class="padding-bottom">
 								<div   class="icon" style="background-color:  rgb(255, 153, 51);">
 									<i class="el-icon-s-promotion"></i>
 								</div>
@@ -33,7 +33,7 @@
 							</el-row>
 							-->
 
-							<el-row>
+							<el-row class="padding-bottom">
 								<el-button  @click="showImportFromMenuTemplate()" icon="el-icon-upload2">由模板快速导入需求</el-button>
 							</el-row>
 						</el-row>
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 5d639875..c8b758c6 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -193,17 +193,18 @@
 								<el-button   @click="showAdd('2')">新建特性</el-button>
 							</el-row>
 							-->
-							<el-row>
+							<el-row class="padding-bottom">
 
 								<div  class="icon" style="background-color:  rgb(79, 140, 255);">
 								<i class="el-icon-document"></i>
 								</div>
 								<el-button   @click="showAdd('3')"  >新建用户故事</el-button>
-							</el-row>
-
-
-							<el-row>
-								<el-button  @click="showImportFromMenuTemplate()" icon="el-icon-upload2">由模板快速导入需求</el-button>
+							</el-row>  
+							<el-row class="padding-bottom"> 
+								<div  class="icon" style="background-color:  rgb(79, 140, 255);">
+								<i class="el-icon-upload2"></i>
+								</div>
+								<el-button  @click="showImportFromMenuTemplate()">由模板快速导入需求</el-button>
 							</el-row>
 						</el-row>
 						<el-button type="primary" v-if="!disabledMng"  round  slot="reference" icon="el-icon-plus"></el-button>
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index fe639f36..457b1141 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -277,7 +277,7 @@
 
 									<el-tag v-if="getPlanRealProgress(scope.row)>0" type="warning" effect="dark">超前{{ getPlanRealProgress(scope.row) }}%</el-tag>
 									<el-tag v-else-if="getPlanRealProgress(scope.row)<0" type="danger" effect="dark">落后{{ 0-getPlanRealProgress(scope.row) }}%</el-tag>
-									<el-tag v-else-if="getProgress(p)>0" effect="dark" type="success" class="el-icon-check"> </el-tag>
+									<el-tag v-else-if="getProgress(scope.row)>0" effect="dark" type="success" class="el-icon-check"> </el-tag>
 									<el-tag v-else-if="getProgress(scope.row)==0" effect="dark" type="info">未开始 </el-tag>
 								</div>
 
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index c4e88954..bc5453fa 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -81,7 +81,7 @@
 
 									<el-tab-pane label="缺陷描述" name="12" >
 										<el-form-item label="" prop="description" label-width="0px">
-												<vue-editor height="100px" v-adaptive="{bottomOffset:50}" v-if="visible && activateTabPaneName=='12'" class="rich-context" :id="'description_'+editForm.id" :branch-id="userInfo.branchId" v-model="editForm.description"></vue-editor>
+												<vue-editor :height="100" v-adaptive="{bottomOffset:50}" v-if="visible && activateTabPaneName=='12'" class="rich-context" :id="'description_'+editForm.id" :branch-id="userInfo.branchId" v-model="editForm.description"></vue-editor>
 										</el-form-item>
 										<el-row style="float:right;" v-if="opType!=='add'">
 												<el-button @click.native="handleCancel">取消</el-button>
@@ -558,8 +558,7 @@
 				}
 			},
 			initData(){
-				if(this.$refs['xmProductSelect1'])this.$refs['xmProductSelect1'].selectedProduct(null)
-				this.editForm=Object.assign(this.editForm,this.editFormInit)
+ 				this.editForm=Object.assign(this.editForm,this.editFormInit)
 				this.editForm=Object.assign(this.editForm, this.xmQuestion);
 				if(this.opType==='add'){
 					this.editForm.askUserid=this.userInfo.userid
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 99c63c76..108fd090 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -123,10 +123,7 @@
 					<el-button  slot="reference" icon="el-icon-more" @click="moreVisible=!moreVisible"></el-button>
 				</el-popover>
 				<span style="float:right;">
-   					<el-button v-if="filters.selProject && filters.selProject.id"  type="primary" icon="el-icon-plus"  @click="showAdd"  round> </el-button>
-					<xm-project-select show-style="tag" v-else style="display:inline;"  :auto-select="false" :link-product-id="xmProduct?xmProduct.id:null" @change2="showAddAfterProjectSelect" >
-						  <el-button slot="reference"  type="primary" icon="el-icon-plus"    round> </el-button>
-					</xm-project-select>
+   					<el-button type="primary" icon="el-icon-plus"  @click="showAdd"  round> </el-button>
 					<el-button @click="batchDel" type="danger" icon="el-icon-delete"></el-button>
 				</span>
 			 </el-row>
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 1dda12ed..57b3fffd 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -13,7 +13,7 @@
               trigger="click"
             >
               <el-row>
-                <el-row>
+                <el-row class="padding-bottom">
 
                   <div    class="icon" :style="{backgroundColor:   '#E6A23C'}">
                     <i :class=" 'el-icon-time' " ></i>
@@ -24,7 +24,7 @@
                     >由史诗特性快速创建计划 (推荐)</el-button
                   >
                 </el-row>
-                <el-row>
+                <el-row class="padding-bottom">
 
                   <div    class="icon" :style="{backgroundColor:   '#E6A23C'}">
                     <i :class=" 'el-icon-time' " ></i>
@@ -35,7 +35,7 @@
                     >从模板快速导入计划 </el-button
                   >
                 </el-row>
-                <el-row>
+                <el-row class="padding-bottom">
 
                   <div    class="icon" :style="{backgroundColor:   '#E6A23C'}">
                     <i :class=" 'el-icon-time' " ></i>