From 06df3c51c70ed3ba8a908f394a51160456151d61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 8 Jun 2024 13:03:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=87=87=E7=94=A8=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/crowd/XmTaskCrowdMng.vue      |  6 ++----
 src/views/xm/core/xmMenu/XmMenuEdit.vue         | 14 +++++---------
 src/views/xm/core/xmMenu/XmMenuMng.vue          |  5 +----
 src/views/xm/core/xmMenu/XmMenuSelect.vue       |  5 ++---
 src/views/xm/core/xmQuestion/XmQuestionEdit.vue |  4 ++--
 src/views/xm/core/xmTask/XmTaskEdit.vue         |  5 ++---
 src/views/xm/core/xmTask/XmTaskMng.vue          |  6 ++----
 vite.config.ts                                  |  7 +++++++
 8 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/src/views/xm/core/crowd/XmTaskCrowdMng.vue b/src/views/xm/core/crowd/XmTaskCrowdMng.vue
index 189e0b91..0f4afcd7 100644
--- a/src/views/xm/core/crowd/XmTaskCrowdMng.vue
+++ b/src/views/xm/core/crowd/XmTaskCrowdMng.vue
@@ -603,8 +603,7 @@ import skillMng from '@/views/xm/core/skill/skillMng.vue';
 import { batchAddSkill } from "@/api/xm/core/xmTaskSkill";
 import xmTaskTemplateMng from '../xmTaskTemplate/XmTaskTemplateMng.vue'; 
 
-import XmMenuRichDetail from '../xmMenu/XmMenuRichDetail.vue';
-import TagMng from '@/views/mdp/arc/tag/TagMng.vue';
+import XmMenuRichDetail from '../xmMenu/XmMenuRichDetail.vue'; 
 
 import XmGantt from '../components/xm-gantt.vue'; 
 
@@ -1409,8 +1408,7 @@ export default {
     skillMng,
     XmMenuRichDetail,
     XmGantt,
-    XmTaskAgileKanban,
-    TagMng,
+    XmTaskAgileKanban, 
     TagDialog, 
     XmWorkloadEdit,
     //在下面添加其它组件
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index d87e7992..535f6cac 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -129,7 +129,7 @@
 
 							<el-col :span="8">
 								<mdp-field show-style="x" size="medium" v-model="editForm.finishRate" label="进度">
-									<template #value style="min-width:150px;"><el-progress  :percentage="editForm.finishRate?editForm.finishRate:0" />
+									<template #value><el-progress  :percentage="editForm.finishRate?editForm.finishRate:0" />
 									</template>
 									<template #oper><el-button  @click="activateTabPaneName='51'" type="primary">查看工时</el-button><el-button  @click="activateTabPaneName='6'" type="primary">查看子工作项</el-button></template>
 								</mdp-field>
@@ -297,9 +297,7 @@
 	import {listXmMenuWithState,editXmMenu,editXmMenuSomeFields,batchChangeParentMenu } from '@/api/xm/core/xmMenu';
 	import { mapState } from 'pinia'
 import { useUserStore } from '@/store/modules/user'
-	
-	import XmMenuOverview from './XmMenuOverview.vue';
-  	import TagMng from '@/views/mdp/arc/tag/TagMng.vue';
+	  
 	import XmSubWorkItem from '@/views/xm/core/xmMenuWorkItem/XmSubWorkItem.vue';
 	import XmRecord from '../xmRecord/XmRecord.vue'
 	import XmMyDoFocus from '@/views/myWork/my/components/DoFocus.vue';
@@ -663,16 +661,14 @@ import CommentArea from '../xmMenuComment/comment-area.vue';
 				});
 			},
 		},//end method
-		components: { 
-			XmMenuOverview,
-			TagMng,
+		components: {   
 			XmSubWorkItem,
 			XmRecord,
 			XmMyDoFocus,
 			ArchiveEdit,
 			XmTestCaseMng,
-			'xm-menu-edit':()=>import("./XmMenuDetail"),
-			'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"),
+			'xm-menu-edit':()=>import("./XmMenuDetail.vue"),
+			'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord.vue"),
 			XmEpicFeaturesSelect,
 			xmQuestionMng,
 			CommentArea,
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 0da7f7db..4f1f6dc2 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -818,10 +818,7 @@ import { useUserStore } from '@/store/modules/user'
 			},
 			afterAddSubmit(row){
 				this.pageInfo.count=true;
-				this.xmMenus.push(row);
-				if(this.parentMenu){
-					this.parentMenu.childrenCnt=this.parentMenu.childrenCnt?this.parentMenu.childrenCnt+1:1;
-				}
+				this.xmMenus.push(row); 
 			},
 			afterEditSubmit(row){
 				this.editFormVisible=false;
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index aeba5820..53f62c09 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -185,8 +185,7 @@
  	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue';//新增界面
  	import XmMenuRichDetail from './XmMenuRichDetail.vue';
 	
-
-  	import TagMng from '@/views/mdp/arc/tag/TagMng.vue';
+ 
 
 	import  XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue';//修改界面
 	import {sn} from '@/components/mdp-ui/js/sequence'
@@ -562,7 +561,7 @@ import XmEpicFeatures from './XmEpicFeaturesSelect.vue';
 
 		},//end methods
 		components: {
- 			XmProductSelect,XmMenuRichDetail,XmIterationSelect,TagMng,
+ 			XmProductSelect,XmMenuRichDetail,XmIterationSelect,
 XmEpicFeatures,
 
 		    //在下面添加其它组件
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index ee28913a..4df1d175 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -206,7 +206,7 @@ import { useUserStore } from '@/store/modules/user';
 	import VueEditor from '@/components/Tinymce/index';
  	import xmMenuSelect from '../xmMenu/XmMenuSelect.vue';
 	import  XmQuestionHandleMng from '../xmQuestionHandle/XmQuestionHandleMng.vue';//修改界面
-  	import TagMng from '@/views/mdp/arc/tag/TagMng.vue';
+ 
 
 	import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect.vue';
 	import XmMyDoFocus from '@/views/myWork/my/components/DoFocus.vue';
@@ -671,7 +671,7 @@ import { useUserStore } from '@/store/modules/user';
 		},//end method
 		components: {
 				//在下面添加其它组件 'xm-question-edit':XmQuestionEdit
-				'upload': AttachmentUpload,VueEditor,xmMenuSelect,XmQuestionHandleMng,TagMng,XmProjectSelect,XmProductSelect,
+				'upload': AttachmentUpload,VueEditor,xmMenuSelect,XmQuestionHandleMng,XmProjectSelect,XmProductSelect,
 			XmMyDoFocus,XmFuncSelect,TestStepConfig,TestStepResult,
 			xmTestPlanCaseMng:()=>import('../xmTestPlanCase/XmTestPlanCaseSelect'),
 			'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"),
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 0a1afcf6..0ad92eef 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -589,8 +589,7 @@ import { useUserStore } from '@/store/modules/user';
 	import xmMenuSelect from '../xmMenu/XmMenuSelect.vue';
 	import XmTaskList from '../xmTask/XmTaskList.vue';
 	import XmExecuserMng from '../xmTaskExecuser/XmTaskExecuserForTask.vue';
-	import XmMenuRichDetail from '../xmMenu/XmMenuRichDetail.vue';
-	import TagMng from '@/views/mdp/arc/tag/TagMng.vue';
+	import XmMenuRichDetail from '../xmMenu/XmMenuRichDetail.vue'; 
 	import XmRecord from '../xmRecord/XmRecord.vue'
 
 	import XmSubWorkItem from '@/views/xm/core/xmTaskWorkItem/XmSubWorkItem.vue';
@@ -1138,7 +1137,7 @@ import { useUserStore } from '@/store/modules/user';
 		},//end method
 		components: {
  			xmSkillMng,
-			skillMng,xmMenuSelect,XmTaskList,XmExecuserMng,XmMenuRichDetail,TagMng,XmSubWorkItem,XmWorkloadRecord,XmMenuEdit,
+			skillMng,xmMenuSelect,XmTaskList,XmExecuserMng,XmMenuRichDetail,XmSubWorkItem,XmWorkloadRecord,XmMenuEdit,
 			XmRecord,xmQuestionMng,XmMyDoFocus,XmTaskExecuserForTask,XmPhaseSelect,ToPay,'xm-task-edit':()=>import("./XmTaskDetail"),
 			'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"),TaskMng,ProcinstMng,
 			"v-region":RegionGroup ,
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 6997258e..9dbae15a 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -867,8 +867,7 @@ import xmMenuSelect from '../xmMenu/XmMenuSelect.vue';
 import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect.vue';
 import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue';
 
-import XmMenuRichDetail from '../xmMenu/XmMenuRichDetail.vue';
-import TagMng from '@/views/mdp/arc/tag/TagMng.vue';
+import XmMenuRichDetail from '../xmMenu/XmMenuRichDetail.vue'; 
 
 import XmGantt from '../components/xm-gantt.vue';
 	import XmTaskList from '../xmTask/XmTaskList.vue'; 
@@ -2243,8 +2242,7 @@ export default {
     XmMenuRichDetail,
     XmGantt,
     XmProductSelect,
-    XmTaskAgileKanban,
-    TagMng,
+    XmTaskAgileKanban, 
     XmTaskList,
     TagDialog,
     XmGroupDialog, 
diff --git a/vite.config.ts b/vite.config.ts
index 1a46e251..76429b46 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -44,6 +44,13 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
           rewrite: (path) => path.replace(new RegExp(`^/api/m1/workflow`), '/'),
         },
          */
+        
+        ['/api/m1/xm']: {
+          target: 'http://localhost:7067',
+          ws: false,
+          changeOrigin: true,
+          rewrite: (path) => path.replace(new RegExp(`^/api/m1/xm`), '/'),
+        },
         ['/api']: {
           target: 'https://www.qingqinkj.com',
           ws: false,