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

assets/css/iview-reset.less

@@ -96,7 +96,8 @@
 
 .ivu-page-item-active:hover {
     background-color: @primary-color;
-    color: white;
+    // background-color: #d7e8fb;
+    a {color: white!important;}
 }
 
 .ivu-page-item-active>a {

pages/aps/results/api.js

@@ -4,6 +4,9 @@ export default {
     paged(params) {
         return Api.get(`${apsUrl}/scheduletotal/getall`, params);
     },
+    getalldetails(params) {
+        return Api.get(`${apsUrl}/scheduletotal/getalldetails`, params);
+    },
     getall(params) {
         return Api.get(`${apsUrl}/schema/getall`, params);
     },

pages/aps/results/compare.vue

@@ -29,7 +29,7 @@
           <ul class="right_ul">
             <li class="right_ul_title">
               <span class="case">{{li.scheduleId}}</span>
-              <span class="case_time">2020-03-22 13:26:35</span>
+              <span class="case_time">{{li.planDate}}&nbsp;</span>
             </li>
             <li>{{li.deferNum}}&nbsp;</li>
             <li>{{li.deferTime}}&nbsp;</li>
@@ -101,8 +101,15 @@ export default {
     items(){
       var items=[];
       this.schemas.map(p=>{
-        var info=this.list.filter(u=>u.scheduleId==p.schedule_Id)[0];
-        items.push(info);
+        if(this.list.length>0){
+          var info=this.list.filter(u=>u.scheduleId==p.schedule_Id)[0];
+          items.push(info);
+          items.forEach(itr=>{
+            if(itr.scheduleId==p.schedule_Id){
+              itr.planDate = p.plan_Date
+            }
+          })
+        }else{ return }
       })
       return items;
     }

pages/resourceManagement/productionResources/set.vue

@@ -61,7 +61,7 @@ export default {
       formItem: {
         equip_name: "",
         equip_id: "",
-        isimportant: "",
+        isimportant: 1,
         capabilityValue: ""
       },
       formItem1: {
@@ -113,7 +113,7 @@ export default {
         this.formItem.equip_name = r.result.title;
         this.formItem.equip_id = r.result.code;
         this.formItem.capabilityValue = r.result.capabilityValue;
-        this.formItem.isimportant = r.result.isimportant + "";
+        this.formItem.isimportant = r.result.isimportant || "1";
         this.formItem1.calendarwork_pk = r.result.calKey;
         this.formItem2.calendarovertime_pk = r.result.holidayKey;
         this.formItem1.equip_pk = r.result.id;