From 55cb30b5be3d5d460c0cb541f6b669ce947728d0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 21 十二月 2021 13:48:17 +0800
Subject: [PATCH] #
---
static/js/object/CrnTask.js | 205 +++++++++++++++++++++++++++-----------------------
1 files changed, 110 insertions(+), 95 deletions(-)
diff --git a/static/js/object/CrnTask.js b/static/js/object/CrnTask.js
index b85ef13..6a81258 100644
--- a/static/js/object/CrnTask.js
+++ b/static/js/object/CrnTask.js
@@ -53,106 +53,121 @@
that.crnBody = getArrVal(object.objects, "name", that.crnNo + "-body");
that.crnLoad = getArrVal(object.objects, "name", that.crnNo + "-load");
that.crnFork = getArrVal(object.objects, "name", that.crnNo + "-fork");
+ if (that.crnBody===null || that.crnLoad===null || that.crnFork==null) {
+ console.log(that.crnNo + "鍙峰爢鍨涙満娌℃湁鍒濆鍖�");
+ }
};
init();
that.modify = function (crnData) {
- if (that.run || that.crnNo === 0 || that.crnBody===null || that.crnLoad===null || that.crnFork==null) {
- // console.log(that.crnNo + "鍙峰爢鍨涙満鏇存柊澶辫触");
- } else {
- if (JSON.stringify(crnData.position) === JSON.stringify(that.position)) {
- return;
- }
- that.run = true;
- // 涓婁竴娆�
- that.preBay = that.bay;
- that.preLev = that.lev;
- that.preX = that.x;
- that.preY = that.y;
- that.preY = that.y;
- that.prePosition = JSON.parse(JSON.stringify(that.position));
- that.preForkPos = that.forkPos;
- // 褰撳墠
- that.bay = crnData.bay;
- that.lev = crnData.lev;
- that.x = crnData.position.x;
- that.y = crnData.position.y;
- that.z = crnData.position.z;
- that.position = crnData.position;
- that.forkPos = crnData.forkPos;
-
- // create Route ------------------------------------------------
-
- // 鍫嗗灈鏈哄弶鐗� 浼稿弶
- if (that.prePosition.x !== that.position.x) {
- curves.push({
- start: false,
- progress: 0,
- part: 'fork',
- route: new Route([
- {
- x: that.prePosition.x,
- y: that.crnFork.position.y,
- z: that.crnFork.position.z
- },
- {
- x: that.position.x,
- y: that.crnFork.position.y,
- z: that.crnFork.position.z
- }
- ])
- })
- }
-
- // 鍫嗗灈鏈鸿浇璐у彴鍜屽弶鐗� 绉诲姩
- if (that.prePosition.z !== that.position.z || that.prePosition.y !== that.position.y) {
- curves.push({
- start: false,
- progress: 0,
- part: 'load',
- route: new Route([
- {
- x: that.crnLoad.position.x,
- y: that.prePosition.y,
- z: that.prePosition.z
- },
- {
- x: that.crnLoad.position.x,
- y: that.position.y,
- z: that.position.z
- }
- ])
- })
- }
-
- // 鍫嗗灈鏈烘湰浣撹繍鍔ㄨ建杩�
- if (that.prePosition.z !== that.position.z && false) {
- curves.push({
- start: false,
- progress: 0,
- part: 'body',
- route: new Route([
- {
- x: that.crnBody.position.x,
- y: that.crnBody.position.y,
- z: that.prePosition.z
- },
- {
- x: that.crnBody.position.x,
- y: that.crnBody.position.y,
- z: that.position.z
- }
- ])
- })
- }
-
- curves.map((value, index) => {
- console.log(value.part + " --> " + JSON.stringify(value.route.points))
- });
-
- curves[0].start = true;
-
+ if (that.run || that.crnNo === 0) {
+ console.error(that.crnNo + "鍙峰爢鍨涙満鏇存柊澶辫触");
+ return;
}
+ if (that.crnBody===null) {
+ that.crnBody = getArrVal(object.objects, "name", that.crnNo + "-body");
+ return;
+ }
+ if (that.crnLoad===null) {
+ that.crnLoad = getArrVal(object.objects, "name", that.crnNo + "-load");
+ return;
+ }
+ if (that.crnFork===null) {
+ that.crnFork = getArrVal(object.objects, "name", that.crnNo + "-fork");
+ return;
+ }
+ if (JSON.stringify(crnData.position) === JSON.stringify(that.position)) {
+ return;
+ }
+ that.run = true;
+ // 涓婁竴娆�
+ that.preBay = that.bay;
+ that.preLev = that.lev;
+ that.preX = that.x;
+ that.preY = that.y;
+ that.preY = that.y;
+ that.prePosition = JSON.parse(JSON.stringify(that.position));
+ that.preForkPos = that.forkPos;
+ // 褰撳墠
+ that.bay = crnData.bay;
+ that.lev = crnData.lev;
+ that.x = crnData.position.x;
+ that.y = crnData.position.y;
+ that.z = crnData.position.z;
+ that.position = crnData.position;
+ that.forkPos = crnData.forkPos;
+
+ // create Route ------------------------------------------------
+
+ // 鍫嗗灈鏈哄弶鐗� 浼稿弶
+ if (that.prePosition.x !== that.position.x) {
+ curves.push({
+ start: false,
+ progress: 0,
+ part: 'fork',
+ route: new Route([
+ {
+ x: that.prePosition.x,
+ y: that.crnFork.position.y,
+ z: that.crnFork.position.z
+ },
+ {
+ x: that.position.x,
+ y: that.crnFork.position.y,
+ z: that.crnFork.position.z
+ }
+ ])
+ })
+ }
+
+ // 鍫嗗灈鏈鸿浇璐у彴鍜屽弶鐗� 绉诲姩
+ if (that.prePosition.z !== that.position.z || that.prePosition.y !== that.position.y) {
+ curves.push({
+ start: false,
+ progress: 0,
+ part: 'load',
+ route: new Route([
+ {
+ x: that.crnLoad.position.x,
+ y: that.prePosition.y,
+ z: that.prePosition.z
+ },
+ {
+ x: that.crnLoad.position.x,
+ y: that.position.y,
+ z: that.position.z
+ }
+ ])
+ })
+ }
+
+ // 鍫嗗灈鏈烘湰浣撹繍鍔ㄨ建杩�
+ if (that.prePosition.z !== that.position.z && false) {
+ curves.push({
+ start: false,
+ progress: 0,
+ part: 'body',
+ route: new Route([
+ {
+ x: that.crnBody.position.x,
+ y: that.crnBody.position.y,
+ z: that.prePosition.z
+ },
+ {
+ x: that.crnBody.position.x,
+ y: that.crnBody.position.y,
+ z: that.position.z
+ }
+ ])
+ })
+ }
+
+ curves.map((value, index) => {
+ console.log(value.part + " --> " + JSON.stringify(value.route.points))
+ });
+
+ curves[0].start = true;
+
}
that.move = function () {
--
Gitblit v1.9.1