Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product

assets/css/base.less

@@ -100,7 +100,11 @@ div::-webkit-scrollbar-corner {
 .ib {
   display: inline;
 }
-
+.pa{
+  position: absolute;
+}
+.pr{position: relative;}
+.pf{position: fixed;}
 .f14 {
   font-size: 14px;
 }

components/page/dataGrid.vue

@@ -275,7 +275,8 @@ export default {
         window.onresize = () => {
           ///浏览器窗口大小变化
           return (() => {
-            this.tableHeight = this.$refs.main.offsetHeight;
+            console.warn("fasfas",this.$refs.main)
+            // this.tableHeight = this.$refs.main.offsetHeight;
           })();
         };
       });
@@ -290,10 +291,7 @@ export default {
   },
   methods: {
     //数据加载
-    load() {
-      if (this.height == 0) {
-        this.tableHeight = window.innerHeight - this.firstY - 60;
-      }
+    load() {     
       if (this.action) {
         //条件初始化处理。
         if (this.initsearch) {

package-lock.json

@@ -22331,8 +22331,8 @@
     },
     "vue-property-decorator": {
       "version": "8.5.1",
-      "resolved": "https://registry.npm.taobao.org/vue-property-decorator/download/vue-property-decorator-8.5.1.tgz",
-      "integrity": "sha1-VxqRz40rUH9TfXm/gnWvMYRXL/8=",
+      "resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-8.5.1.tgz",
+      "integrity": "sha512-O6OUN2OMsYTGPvgFtXeBU3jPnX5ffQ9V4I1WfxFQ6dqz6cOUbR3Usou7kgFpfiXDvV7dJQSFcJ5yUPgOtPPm1Q==",
       "requires": {
         "vue-class-component": "^7.1.0"
       }
@@ -22420,8 +22420,13 @@
     },
     "vue-slider-component": {
       "version": "3.1.5",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmjs.org/vue-slider-component/-/vue-slider-component-3.1.5.tgz",
+      "integrity": "sha512-RIDL2cjIfSMKxv7IeNQ5gn936SAaLi+UKc97xd8yN92zz0n5dK343GGSay/3ypzhR1C5YIN3n7/LclUQrIDoFg==",
+=======
       "resolved": "https://registry.npm.taobao.org/vue-slider-component/download/vue-slider-component-3.1.5.tgz?cache=0&sync_timestamp=1590980161427&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-slider-component%2Fdownload%2Fvue-slider-component-3.1.5.tgz",
       "integrity": "sha1-2a1vGhBcigp7cvW4+VZW0HuOTDY=",
+>>>>>>> 07734a85a7ff7845f4f995bf7879d342b5bda7d3
       "requires": {
         "core-js": "^3.6.5",
         "vue-property-decorator": "^8.0.0"
@@ -22429,8 +22434,13 @@
       "dependencies": {
         "core-js": {
           "version": "3.6.5",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+          "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
+=======
           "resolved": "https://registry.npm.taobao.org/core-js/download/core-js-3.6.5.tgz",
           "integrity": "sha1-c5XcJzrzf7LlDpvT2f6EEoUjHRo="
+>>>>>>> 07734a85a7ff7845f4f995bf7879d342b5bda7d3
         }
       }
     },

pages/aps/aps/components/check.vue

@@ -39,6 +39,7 @@ export default {
   computed:{
       list(){
            var data={};
+           if(this.data.datas){
            var item=JSON.parse(this.data.datas);
               for(var key in item)
               {
@@ -46,6 +47,7 @@ export default {
                       data[key]= item[key];
                   }
               }
+           }
           return data;
       }
   },

pages/aps/aps/index.vue

@@ -58,7 +58,6 @@
           @click="goResults"
           style="background:#515A6E;border:solid 1px #515A6E"
         >历史方案</Button>
-        <Button type="primary" @click="resultModal=true">Result</Button>
         <Button type="primary" @click="openApsModal">APS排产</Button>
       </template>
       <template slot="batch">

pages/aps/results/gantt.vue

 <template>
   <div class="q-pa-sm">
+    <div class="pr mt50" v-if="tasks.length==0" >
+<Spin size="large" fix ></Spin>
+    </div>
+    
     <gantt-elastic
+      v-else
       :options="options"
       :tasks="tasks"
       @tasks-changed="tasksUpdate"
@@ -38,6 +43,12 @@ function getDate(hours) {
   ).getTime();
   return new Date(timeStamp + hours * 60 * 60 * 1000).getTime();
 }
+function GetTimeByTimeStr(dateString) {
+    var timeArr = dateString.split(" ");
+    var d = timeArr[0].split("-");
+    var t = timeArr[1].split(":");
+    return new Date(d[0], d[1] - 1, d[2], t[0], t[1], t[2]).getTime();
+}
 let tasks = [
   {
     id: 1,
@@ -245,7 +256,7 @@ let options = {
   },
   calendar: {
     hour: {
-      display: false
+      display: true
     }
   },
   chart: {
@@ -273,12 +284,12 @@ let options = {
         value: "name",
         width: 100,
         expander: true,
-        html: true
-        // events: {
-        //   click({ data, column }) {
-        //     alert("description clicked!\n" + data.label);
-        //   }
-        // }
+        html: true,
+        events: {
+          click({ data, column }) {
+            this.$Message.info(data.name);
+          }
+        }
       },
       {
         id: 3,
@@ -374,13 +385,14 @@ export default {
 
   data() {
     return {
-      tasks,
+      tasks:[],
       options,
       dynamicStyle: {},
       lastId: 16
     };
   },
-  mounted() {
+  created() {
+    // this.tasks=tasks;
     this.gantData();
   },
 
@@ -394,15 +406,17 @@ export default {
               var list = [];
               var obj = {
                 id: r.result[0].id,
+                // parentId: 0,
                 name: r.result[0].part_name,
-                start: r.result[0].plan_start,
-                endTime: r.result[0].plan_finish,
+                start:GetTimeByTimeStr(r.result[0].plan_start) ,
+                // endTime: GetTimeByTimeStr(r.result[0].plan_finish),
                 EquipmentNo: "/",
-                duration: 15 * 24 * 60 * 60 * 1000,
+                duration: GetTimeByTimeStr(r.result[0].plan_finish)-GetTimeByTimeStr(r.result[0].plan_start),
                 percent: 85,
                 plan_qty: r.result[0].plan_qty,
                 put_into_qty: "/",
-                dispatch_qty: "/"
+                dispatch_qty: "/",
+                type: "project"
               };
               list.push(obj);
               Api.getdetail({
@@ -411,25 +425,32 @@ export default {
               }).then(r => {
                 if (r.result) {
                   for (var i = 0; i < r.result.length; i++) {
+                    var start=GetTimeByTimeStr(r.result[i].plan_start);
+                    var jg= GetTimeByTimeStr(r.result[i].plan_finish)- start;
                     let temp = {
                       id: r.result[i].op_task_pk,
                       name: r.result[i].task_name,
                       EquipmentNo: r.result[i].equip_id,
+                      // parentId: i<5?parentId:368,
                       parentId: parentId,
                       // start: r.result[i].plan_start,
                       // endTime: r.result[i].plan_finish,
-                      endTime: "2020-7-30",
-                      start: getDate(-24 * 5),
-                      duration: 15 * 24 * 60 * 60 * 1000,
-                      percent: 85,
+                      // endTime: "2020-7-30",
+                      start: start,
+                      duration: jg,
+                      percent: i*9,
                       put_into_qty: r.result[i].put_into_qty,
-                      dispatch_qty: r.result[i].dispatch_qty
+                      dispatch_qty: r.result[i].dispatch_qty,
+                      type:i%2?"task":'milestone',
+                      //  type: "milestone",
                     };
                     list.push(temp);
                   }
-                  this.tasksUpdate(list);
+                    this.tasksUpdate(list);
+              console.warn(list)
                 }
               });
+           
             }
           })
           .catch(error => {