Merge branch 'master' of http://prodog.leanwo.com:3000/client-2022/PcClient

# Conflicts:
#	package-lock.json
#	package.json

package.json

@@ -1,7 +1,7 @@
 {
   "name": "prodog-pc-client",
   "description": "Leanwo Prodog Client",
-  "version": "1.0.16",
+  "version": "1.0.19",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",
@@ -22,9 +22,10 @@
     "client-base-v4": "3.0.24",
     "client-dic-v3": "^3.0.6",
     "client-dictionary-v3": "^3.0.3",
-    "client-eam-v3": "^3.0.13",
-    "client-role-v3": "^3.0.3",
+    "client-eam-v3": "^3.0.15",
+    "client-role-v3": "^3.0.4",
     "client-wms-v3": "^3.0.4",
+    "client-trace-v3": "^1.0.3",
     "dayjs": "^1.11.6",
     "dingtalk-jsapi": "^2.8.33",
     "js-cookie": "^2.2.1",

public/index.html

@@ -20,6 +20,7 @@
 	
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/layui/dist/css/layui.css">
 
+	<link rel="stylesheet" type="text/css" href="/static/dhtmlxgantt/dhtmlxgantt.css">
 
 
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/cropper/dist/cropper.css">
@@ -41,7 +42,13 @@
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/bootstrap3-dialog/dist/js/bootstrap-dialog.js"></script>
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/colResizable/colResizable-1.6.js"></script>
 
-	
+	<script src="/static/dhtmlxgantt/dhtmlxgantt.js"></script>
+	<script src="/static/dhtmlxgantt/locale/locale_cn.js"></script>
+	<script src="/static/dhtmlxgantt/ext/dhtmlxgantt_auto_scheduling.js"></script>
+	<script src="/static/dhtmlxgantt/ext/dhtmlxgantt_smart_rendering.js"></script>
+	<script src="/static/dhtmlxgantt/ext/dhtmlxgantt_undo.js"></script>
+	<script src="/static/dhtmlxgantt/ext/dhtmlxgantt_fullscreen.js"></script>
+	<script src="/static/dhtmlxgantt/ext/api.js"></script>
 
 
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/jQuery-ResizableColumns/jQuery.resizableColumns.js"></script>
@@ -66,7 +73,9 @@
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/axios/dist/axios.js"></script>
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/sortablejs/Sortable.js"></script>
 	
-
+	<link rel="stylesheet" type="text/css" href="/static/summernote/dist/summernote.min.css">
+	<script src="/static/summernote/dist/summernote.min.js"></script>
+	<script src="/static/summernote/dist/lang/summernote-zh-CN.min.js"></script>
 	
 
 	

src/main.js

@@ -35,6 +35,7 @@ import 'client-dic-v3/dist/client-dic-v3.css';
 
 import 'client-eam-v3/dist/client-eam-v3.css';
 import 'client-wms-v3/dist/client-wms-v3.css';
+import 'client-trace-v3/dist/client-trace-v3.css';
 
 
 import { store } from './store.js';

src/routes/index.js

@@ -6,6 +6,7 @@ import routes2 from './route-dictionary-v3.js';
 import routes3 from './route-dic-v3.js';
 import routes5 from './route-eam-v3.js';
 import routes6 from './route-wms-v3.js';
+import routes7 from './route-trace-v3.js';
 
 import merge from '../merge.js';
 
@@ -14,6 +15,7 @@ routes = merge.mergeArray(routes, routes2);
 routes = merge.mergeArray(routes, routes3);
 routes = merge.mergeArray(routes, routes5);
 routes = merge.mergeArray(routes, routes6);
+routes = merge.mergeArray(routes, routes7);
 
 const router = createRouter({
   history: createWebHashHistory(),

src/routes/route-trace-v3.js

@@ -0,0 +1,74 @@
+import{
+    HelloWorld,
+    TraceList,
+    TraceDynamic,
+    ProjectUserList,
+    ProjectList,
+    TraceCreate,
+    TraceUpdate,
+    Trace,
+    TraceCommentCreate,
+    TraceCommentEdit,
+    TraceTimeLineCreate,
+    TraceTimeLineEdit,
+    UserNotFinishedTrace,
+    UseFinishedTrace,
+    NotFinishedProjectTraces,
+    FinishedProjectTraces,
+    TeamList,
+    TraceConfig,
+    ProjectArchive,
+    ProjectManagement,
+    ProjectAdminUserList,
+    CompleteProjectList,
+} from 'client-trace-v3/dist/client-trace-v3.js'
+
+
+const routes = [
+
+    { path: '/trace/hello-world', component: HelloWorld},
+  
+    // 追踪单主界面
+    // { path: '/trace/traceMenu/:uuid', component: TraceMenu},
+    { path: '/trace/traceList/:traceState', component: TraceList},
+    { path: '/trace/traceDynamic', component: TraceDynamic},
+    //项目人员列表
+    { path: '/trace/projectUserList/:projectId', component: ProjectUserList},
+    // 项目追踪
+    { path: '/trace/projectList', component: ProjectList},
+    // 追踪单主界面-新建追踪单
+    { path: '/trace/traceCreate/:projectId', component: TraceCreate},
+    { path: '/trace/traceUpdate/:traceId', component: TraceUpdate},
+    // 追踪单主界面(追踪列表)-追踪单		
+    { path: '/trace/trace/:traceId', component: Trace},
+    // 创建追踪单评论信息
+    { path: '/trace/traceCommentCreate/:traceId', component: TraceCommentCreate},
+    // 创建追踪单评论信息
+    { path: '/trace/traceCommentEdit/:traceCommentId', component: TraceCommentEdit},
+    // 创建追踪单时间节点
+    { path: '/trace/traceTimeLineCreate/:traceId', component: TraceTimeLineCreate},
+    // 创建追踪单时间节点
+    { path: '/trace/traceTimeLineEdit/:traceTimeLineId', component: TraceTimeLineEdit},
+    // 个人未完成的任务
+    { path: '/trace/userNotFinishedTrace/:userId', component: UserNotFinishedTrace},
+    // 个人已完成的任务
+    { path: '/trace/useFinishedTrace/:userId', component: UseFinishedTrace},
+    // 未完成的项目任务
+    { path: '/trace/notFinishedProjectTraces/:projectId', component: NotFinishedProjectTraces},
+    // 已完成的项目任务
+    { path: '/trace/finishedProjectTraces/:projectId', component: FinishedProjectTraces },
+    { path: '/trace/teamList', component: TeamList},
+    //任务配置
+    { path: '/trace/traceConfig', component: TraceConfig },
+    // 项目归档界面
+    { path: '/trace/projectArchive/:projectId', component: ProjectArchive},
+    // 项目管理图
+    { path: '/trace/projectManagement/:projectId', component: ProjectManagement},
+    //项目管理员列表
+    { path: '/trace/projectAdminUserList/:projectId', component: ProjectAdminUserList},
+    // 已完成项目追踪
+    { path: '/trace/completeProjectList', component: CompleteProjectList},
+      
+  ];
+
+export default routes;

webpack.base.js

@@ -92,6 +92,7 @@ module.exports = {
     '@antv/x6': 'X6',
     'axios': 'axios',
     'sortablejs': 'Sortable',
+    'gantt': 'gantt'
   },
   
   plugins: [