Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

Html/src/view/fml/operation_manage/feedingBlanking.vue

@@ -263,7 +263,7 @@ export default {
             a: -1,
             b: -1,
             attr1: false, //上料、下料、上下料
-            attr2: true, //上料、下料、上下料
+            attr2: false, //上料、下料、上下料
             modal: false,
             code: "", //工令单
             columns1: [
@@ -370,13 +370,13 @@ export default {
             this.b = index;
             let status = this.stationList[index].status;
             this.sectionid = this.stationList[index].section;
-            if (status == 3) {
-                this.attr1 = true;
-                this.tabindex = "2";
-                this.getRunningDetail(index);
-            } else {
-                this.attr2 = true;
-            }
+            // if (status == 3) {
+            //     this.attr1 = true;
+            //     this.tabindex = "2";
+            //     this.getRunningDetail(index);
+            // } else {
+            //     this.attr2 = true;
+            // }
             if (status == 2) {
                 this.getRunningDetail(index);
             }

Html/src/view/fml/statistical_analysis/lineMonitor.vue

@@ -10,6 +10,7 @@
                         class="searchSelect"
                         :data="datalevel"
                         :value="leveldata"
+                        change-on-select
                         @on-change="getSectionId"
                     ></Cascader>
                 </div>
@@ -34,6 +35,10 @@
         <div class="divborder">
             <div class="stateTitle flex">
                 <p>
+                    <span>{{ summary.waittingTotal }}</span
+                    >待上料
+                </p>
+                <p>
                     <span>{{ summary.produceTotal }}</span
                     >生产中
                 </p>
@@ -41,10 +46,7 @@
                     <span>{{ summary.complateTotal }}</span
                     >待下料
                 </p>
-                <p>
-                    <span>{{ summary.waittingTotal }}</span
-                    >待上料
-                </p>
+
                 <p>
                     <span>{{ summary.disableTotal }}</span
                     >不可用
@@ -347,10 +349,10 @@ export default {
                                 bgc = "red";
                             }
                             if (ele.status == 1) {
-                                bgc = "#2db7f5";
+                                bgc = "#ff9900";
                             }
                             if (ele.status == 2) {
-                                bgc = "#ff9900";
+                                bgc = "#2db7f5";
                             }
                             if (ele.status == 3) {
                                 bgc = "#19be6b";
@@ -445,13 +447,13 @@ export default {
             // border: 1px solid #333;
         }
     }
-    p:nth-child(1) span {
+    p:nth-child(3) span {
         background-color: #2db7f5;
     }
     p:nth-child(2) span {
         background-color: #19be6b;
     }
-    p:nth-child(3) span {
+    p:nth-child(1) span {
         background-color: #ff9900;
     }
     p:nth-child(4) span {

Server/Apis/Siger.ApiACC/Controllers/AutomationStateController.cs

@@ -58,7 +58,7 @@ namespace Siger.ApiACC.Controllers
                      fixtureCode="",
                      fixtureName="",
                      lastupdate="",
-                     status=0,
+                     status=(int)Automation.MachineStatus.Waiting,
 
                 };
                 var fixture = _automationFixtureMonitor.Get(f => f.section == d.sectionid);

Server/Infrastructure/Repositories/Siger.Middlelayer.Repository/Response/ResponseLoadStation.cs

@@ -18,5 +18,10 @@ namespace Siger.Middlelayer.Repository.Response
         /// 上料位状态
         /// </summary>
         public int status { get; set; }
+
+        /// <summary>
+        /// 1 :可以上料  2:可以下料
+        /// </summary>
+        public int upload { get; set; }
     }
 }