Эх сурвалжийг харах

trace独立成单独的html,删除ganttjs

YangZhiJie 2 жил өмнө
parent
commit
ad362add1b

+ 0 - 1
.eslintrc.js

@@ -89,7 +89,6 @@ module.exports = {
     'localStorage': true,
     'window': true,
     'BootstrapDialog': true,
-    'moment': true,
     'gantt': true,
     '__webpack_public_path__': true,
     'Notify': true,

+ 0 - 3
package.json

@@ -12,7 +12,6 @@
     "dist"
   ],
   "dependencies": {
-    "animate.css": "^4.1.0",
     "ant-design-vue": "^3.2.15",
     "axios": "^0.19.2",
     "click-outside-vue3": "^4.0.1",
@@ -20,14 +19,12 @@
     "client-dic-v3": "^3.0.26",
     "client-eam-v3": "^3.0.68",
     "client-role-v3": "^3.0.18",
-    "client-trace-v3": "^1.0.20",
     "client-sensor-v3": "^1.0.2",
     "client-wms-v3": "^3.0.9",
     "dayjs": "^1.11.6",
     "dingtalk-jsapi": "^2.8.33",
     "js-cookie": "^2.2.1",
     "lodash": "^4.17.21",
-    "moment": "^2.29.4",
     "pc-component-v3": "1.0.77",
     "qrcode": "^1.5.3",
     "select2": "^4.0.13",

+ 3 - 13
public/index-debug.html

@@ -18,14 +18,11 @@
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/bootstrap/dist/css//bootstrap-theme.min.css">
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/bootstrap3-dialog/dist/css/bootstrap-dialog.css">
 	
-	<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 rel="stylesheet" type="text/css" href="/static/dhtmlxgantt/dhtmlxgantt.css"> -->
 	<link rel="stylesheet" type="text/css" href="/static/bootstrap-treeview/bootstrap-treeview.css">
 
 
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/cropper/dist/cropper.css">
-	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/animate.css/animate.css">
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/colResizable/colResizable-1.6.css">
 
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/jQuery-ResizableColumns/jQuery.resizableColumns.css">
@@ -48,13 +45,9 @@
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/jQuery-ResizableColumns/jQuery.resizableColumns.js"></script>
 	<!-- <script src="../static/js/api.js"></script> -->
 
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/moment/moment.js"></script>
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/moment/locale/zh-cn.js"></script>
 
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/reconnecting-websocket/reconnecting-websocket.js"></script>
 	
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/layui/dist/layui.js"></script>
-
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="../static/plugin/dingtalk-jsapi/2.10.3/dingtalk.open.js"></script>
 
 	<!--VueJS has 2 different versions: the full version and the runtime version. 'unsafe-eval' is only needed for the full version of VueJS; the runtime version doesn't need it. 
@@ -69,12 +62,10 @@
 	
 	<link rel="stylesheet" type="text/css" href="/static/summernote/dist/summernote.min.css">
 	
-	<script defer="defer" type="text/javascript" src="/static/antv/x6/dist/x6.js"></script>
 	
 
 	
 	<script nonce="*NONCE_TOKEN*"  type="text/javascript">
-		moment.locale('zh');
 		
 		var nonce_token = "*NONCE_TOKEN*";
 	</script>
@@ -90,16 +81,15 @@
 	<script defer="defer" type="text/javascript" src="/static/summernote/dist/summernote.min.js"></script>
 	<script defer="defer" type="text/javascript" src="/static/summernote/dist/lang/summernote-zh-CN.min.js"></script>
 
-	<script defer="defer" type="text/javascript" src="/static/dhtmlxgantt/dhtmlxgantt.js"></script>
+	<!-- <script defer="defer" type="text/javascript" src="/static/dhtmlxgantt/dhtmlxgantt.js"></script>
 	<script defer="defer" type="text/javascript" src="/static/dhtmlxgantt/locale/locale_cn.js"></script>
 	<script defer="defer" type="text/javascript" src="/static/dhtmlxgantt/ext/dhtmlxgantt_auto_scheduling.js"></script>
 	<script defer="defer" type="text/javascript" src="/static/dhtmlxgantt/ext/dhtmlxgantt_smart_rendering.js"></script>
 	<script defer="defer" type="text/javascript" src="/static/dhtmlxgantt/ext/dhtmlxgantt_undo.js"></script>
 	<script defer="defer" type="text/javascript" src="/static/dhtmlxgantt/ext/dhtmlxgantt_fullscreen.js"></script>
-	<script defer="defer" type="text/javascript" src="/static/dhtmlxgantt/ext/api.js"></script>
+	<script defer="defer" type="text/javascript" src="/static/dhtmlxgantt/ext/api.js"></script> -->
 	<!-- <script src="../static/js/fullscreen-api.js"></script> -->
 	<!-- <script src="../static/js/problem-feedback-api.js"></script> -->
-	<!-- <script defer="defer" type="text/javascript" src="/static/antv/x6/dist/x6.js"></script> -->
 
 </body>
 

+ 4 - 15
public/index-release.html

@@ -18,13 +18,10 @@
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/bootstrap/dist/css//bootstrap-theme.min.css">
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/bootstrap3-dialog/dist/css/bootstrap-dialog.min.css">
 	
-	<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 rel="stylesheet" type="text/css" href="/static/dhtmlxgantt/dhtmlxgantt.css"> -->
 	<link rel="stylesheet" type="text/css" href="/static/bootstrap-treeview/bootstrap-treeview.css">
 
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/cropper/dist/cropper.css">
-	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/animate.css/animate.css">
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/colResizable/colResizable-1.6.css">
 
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/jQuery-ResizableColumns/jQuery.resizableColumns.css">
@@ -33,7 +30,6 @@
 
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/jquery/dist/jquery.min.js"></script>
 
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/jquery.cookie/jquery.cookie.js"></script>
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/table-fixer.jquery/table-fixer.jquery.js"></script>
 
 	
@@ -47,19 +43,15 @@
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/jQuery-ResizableColumns/jQuery.resizableColumns.js"></script>
 	<!-- <script src="../static/js/api.js"></script> -->
 
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/moment/min/moment.min.js"></script>
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/moment/locale/zh-cn.js"></script>
 
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/reconnecting-websocket/reconnecting-websocket.js"></script>
 	
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/layui/dist/layui.js"></script>
-
 	<!-- <script nonce="*NONCE_TOKEN*" type="text/javascript" src="../static/plugin/dingtalk-jsapi/2.10.3/dingtalk.open.js"></script> -->
 
 	<!--VueJS has 2 different versions: the full version and the runtime version. 'unsafe-eval' is only needed for the full version of VueJS; the runtime version doesn't need it. 
 	The runtime-only build is fully CSP-compliant. When using the runtime-only build with Webpack + vue-loader or Browserify + vueify, your templates will be precompiled into render functions which work perfectly in CSP environments. -->
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/vue/dist/vue.global.prod.js"></script>
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/vue-i18n/dist/vue-i18n.global.js"></script>
+	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/vue-i18n/dist/vue-i18n.global.prod.js"></script>
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/vuex/dist/vuex.global.prod.js"></script>
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/vue-router/dist/vue-router.global.prod.js"></script>
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/dayjs/dayjs.min.js"></script>
@@ -67,10 +59,8 @@
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/sortablejs/Sortable.min.js"></script>
 	
 	<link rel="stylesheet" type="text/css" href="/static/summernote/dist/summernote.min.css">
-	<script defer="defer" nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/antv/x6/dist/x6.js"></script>
 	
 	<script nonce="*NONCE_TOKEN*"  type="text/javascript">
-		moment.locale('zh');
 		var nonce_token = "*NONCE_TOKEN*";
 	</script>
 </head>
@@ -87,15 +77,14 @@
 	<script defer="defer" nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/summernote/dist/summernote.min.js"></script>
 	<script defer="defer" nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/summernote/dist/lang/summernote-zh-CN.min.js"></script>
 
-	<script defer="defer" nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/dhtmlxgantt/dhtmlxgantt.js"></script>
+	<!-- <script defer="defer" nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/dhtmlxgantt/dhtmlxgantt.js"></script>
 	<script defer="defer" nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/dhtmlxgantt/locale/locale_cn.js"></script>
 	<script defer="defer" nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/dhtmlxgantt/ext/dhtmlxgantt_auto_scheduling.js"></script>
 	<script defer="defer" nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/dhtmlxgantt/ext/dhtmlxgantt_smart_rendering.js"></script>
 	<script defer="defer" nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/dhtmlxgantt/ext/dhtmlxgantt_undo.js"></script>
 	<script defer="defer" nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/dhtmlxgantt/ext/dhtmlxgantt_fullscreen.js"></script>
-	<script defer="defer" nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/dhtmlxgantt/ext/api.js"></script>
+	<script defer="defer" nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/dhtmlxgantt/ext/api.js"></script> -->
 
-	<!-- <script defer="defer" nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/antv/x6/dist/x6.js"></script> -->
 </body>
 
 </html>

+ 0 - 1
src/main.js

@@ -35,7 +35,6 @@ 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 'client-sensor-v3/dist/client-sensor-v3.css';
 
 

+ 2 - 2
src/routes/index.js

@@ -6,7 +6,7 @@ import routes1 from './route-role-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 routes7 from './route-trace-v3.js';
 import routes8 from './route-sensor-v3.js';
 
 import merge from '../merge.js';
@@ -16,7 +16,7 @@ let routes = merge.mergeArray(routes0, routes1);
 routes = merge.mergeArray(routes, routes3);
 routes = merge.mergeArray(routes, routes5);
 routes = merge.mergeArray(routes, routes6);
-routes = merge.mergeArray(routes, routes7);
+// routes = merge.mergeArray(routes, routes7);
 routes = merge.mergeArray(routes, routes8);
 
 const router = createRouter({

+ 0 - 17
src/routes/route-base-v4.js

@@ -50,8 +50,6 @@ import {
     ExcelReport,
     DateExcelReport,
     DelegationReport,
-    PrintTemp,
-    PrintCard,
     DataArchive,
     ArchivalRecord,
     ExcelImport,
@@ -234,19 +232,6 @@ const router = [
                     ],
                 },
             },
-            // 条码编辑
-            {
-                path: 'barCode-edit', component: PrintTemp,
-                meta: {
-                    'loginRequired': true,
-                    'functionAccessArray': [
-                        {
-                            'functionNo': '20220328_092713',
-                            'itemNo': '3',
-                        },
-                    ],
-                },
-            },
             // 条码编辑(老编辑器)
             {
                 path: 'barCode-edit-o', component: BarCodeEdit,
@@ -260,8 +245,6 @@ const router = [
                     ],
                 },
             },
-            // 标签打印
-            { path: '/desktop/PrintCard', component: PrintCard },
             // 归档
             { path: 'archive', component: Archive },
             // 归档

+ 68 - 68
src/routes/route-trace-v3.js

@@ -1,74 +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'
+// 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 = [
+// const routes = [
 
-    { path: '/trace/hello-world', component: HelloWorld},
+//     { 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},
+//     // 追踪单主界面
+//     // { 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;
+// export default routes;

+ 2 - 5
webpack.base.js

@@ -84,17 +84,14 @@ module.exports = {
     BootstrapDialog: 'BootstrapDialog',
     d3: 'd3',
     echarts: 'echarts',
-    moment: 'moment',
+    dayjs: 'dayjs',
     'vue': 'Vue',
     'vue-i18n': 'VueI18n',
     'vue-router': 'VueRouter',
     'vuex': 'Vuex',
     'Vuex': 'Vuex',
-    '@antv/x6': 'X6',
-    'X6': 'X6',
     'axios': 'axios',
-    'sortablejs': 'Sortable',
-    // 'gantt': 'gantt'
+    'sortablejs': 'Sortable'
   },
   
   plugins: [