From 5a914e25a03c11184254acc4a595f3a5832b4c14 Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Mon, 16 May 2022 15:05:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5Gantt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +
src/views/mes/pro/proroute/product.vue | 3 -
src/views/mes/pro/schedule/ganttx.vue | 192 +++++++++++++++++++++++++
src/views/mes/pro/schedule/index.vue | 43 +++++-
src/views/mes/pro/schedule/proTask.vue | 11 +-
5 files changed, 242 insertions(+), 9 deletions(-)
create mode 100644 src/views/mes/pro/schedule/ganttx.vue
diff --git a/package.json b/package.json
index 19d06af..4d3f26b 100644
--- a/package.json
+++ b/package.json
@@ -36,10 +36,12 @@
"url": "https://gitee.com/kutangguo/ktg-mes-ui.git"
},
"dependencies": {
+ "@dhtmlx/trial-vue-gantt": "1.1.0",
"@riophae/vue-treeselect": "0.4.0",
"axios": "0.24.0",
"clipboard": "2.0.8",
"core-js": "^3.21.1",
+ "dhtmlx-gantt": "^7.1.11",
"echarts": "4.9.0",
"element-ui": "2.15.6",
"file-saver": "2.0.5",
diff --git a/src/views/mes/pro/proroute/product.vue b/src/views/mes/pro/proroute/product.vue
index 6c7219b..b836429 100644
--- a/src/views/mes/pro/proroute/product.vue
+++ b/src/views/mes/pro/proroute/product.vue
@@ -77,9 +77,6 @@
-
-
-
diff --git a/src/views/mes/pro/schedule/ganttx.vue b/src/views/mes/pro/schedule/ganttx.vue
new file mode 100644
index 0000000..aa1b004
--- /dev/null
+++ b/src/views/mes/pro/schedule/ganttx.vue
@@ -0,0 +1,192 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/mes/pro/schedule/index.vue b/src/views/mes/pro/schedule/index.vue
index 8abeb93..b74f6f8 100644
--- a/src/views/mes/pro/schedule/index.vue
+++ b/src/views/mes/pro/schedule/index.vue
@@ -69,9 +69,18 @@
搜索
- 重置
+ 重置
+
+
+
+
+
+
diff --git a/src/views/mes/pro/schedule/proTask.vue b/src/views/mes/pro/schedule/proTask.vue
index 22d46ec..718a0c9 100644
--- a/src/views/mes/pro/schedule/proTask.vue
+++ b/src/views/mes/pro/schedule/proTask.vue
@@ -262,13 +262,15 @@ export default {
calculateEndTime(){
debugger;
if(this.form.startTime !=null && this.form.duration !=null){
- let startDate = new Date(this.form.startTime);
+ let parts = this.form.startTime.split(' ');
+ let startDate = new Date(parts[0]);
startDate = startDate.getFullYear() + '-'
+ (startDate.getMonth()+1) + '-'
+ startDate.getDate() + ' '
- + startDate.getHours() + ':'
- + startDate.getMinutes() + ':'
- + startDate.getSeconds();
+ + parts[1].split(':')[0] + ':'
+ + '00' + ':'
+ + '00';
+ this.form.startTime = startDate;
startDate = Date.parse(new Date(startDate))/1000;
startDate += (3600) * this.form.duration;
let endDate = new Date(parseInt(startDate) * 1000);
@@ -278,6 +280,7 @@ export default {
+ endDate.getHours() + ':'
+ endDate.getMinutes() + ':'
+ endDate.getSeconds();
+
}
},