result ai aps

pages/aps/ai/index.vue

@@ -11,14 +11,14 @@
                 <Option v-for="item in rulesAiList" :value="item.value" :key="item.value">{{ item.label }}</Option>
             </Select> -->
             <DatePicker type="date" placeholder="设置基准日期" style="width: 150px;" v-model="entity.setTime" @on-change="getTime"></DatePicker>
-            <Button type="primary" @click="openApsModal">APS排产</Button>
+            <Button type="primary" @click="openApsModal">智能排产</Button>
         </template>
         <template slot="batch">
             <Button type="primary" class="mr10 ml10" @click="removeOk">移出排产</Button>
         </template>
     </DataGrid>
-    <Modal v-model="apsModal" title="确定APS排产" @on-ok="apsOk" @on-cancel="cancel">
-        <p>确定进行APS排产？</p>
+    <Modal v-model="apsModal" title="确定进行智能排产" @on-ok="apsOk" @on-cancel="cancel">
+        <p>确定进行智能排产？</p>
     </Modal>
 
     <Modal v-model="resultModal" title="数据检查" width="1500" @on-ok="cancel" @on-cancel="cancel">
@@ -514,7 +514,7 @@ export default {
                             this.$Message.success("排产计算成功");
                             this.circleModal = false;
                             this.$router.push({
-                                path: "/aps/results/indexData"
+                                path: "/aps/results"
                                 // params: { customerId: id }
                             });
                         } else {

pages/aps/results/index.vue

@@ -19,7 +19,7 @@
           :class="isactive == index ? 'addclass' : '' "
         >
           <Checkbox v-model="li.checked" class="i-checkbox" @on-change="changeCheck(li,index)"></Checkbox>
-          <div class="title-t" @click="listData(li.schedule_Id,index)">排产方案：{{li.schedule_Id}}</div>
+          <div class="title-t" @click="listData(li,index)">排产方案：{{li.schedule_Id}}</div>
           <div class="fa">排产时间：{{li.plan_Date}}</div>
           <div class="fa">
             <span>{{li.iNSERTFLAG}} /</span>
@@ -34,10 +34,10 @@
             <h4 :text="title">{{title}}</h4>
           </Col>
           <Col span="10">
-            <a href="#" @click="comeBlck" class="black">APS排产</a>
+            <a href="#" @click="comeBlck" class="black">{{apsTitle}}</a>
           </Col>
-          <Col span="10" style="text-align: right;">
-           <a href="#" @click="datasShow" v-if="false">数据包</a>
+          <Col span="10" style="text-align: right;" >
+           <a href="#" @click="datasShow" v-if="apsTitle=='智能排产'">数据包</a>
             <a href="#" @click="gantChart"   v-if="gant">甘特图</a>
           </Col>
         </Row>
@@ -52,7 +52,7 @@
     </div>
     <Modal v-model="modal1Gant" fullscreen :title="modalTitle" footer-hide>
       <!-- <Gantt :id="id" /> -->
-      <gantt :is="gantt" :id="id" />
+      <gantt :is="gantt" :id="id" :time="time" @close="closemodal" />
     </Modal>
   </div>
 </template>
@@ -80,13 +80,29 @@ export default {
       gant: false,
       gantt: null,
       curPage: null,
-      modalTitle:'甘特图'
+      modalTitle:'甘特图',
+      time:'',
+      apsTitle:'',
     };
   },
   async fetch({ store, params }) {
     await store.dispatch("loadDictionary"); // 加载数据字典
   },
   created() {
+    let apsCount=this.$store.state.countAps
+    let aiCount=this.$store.state.countAi
+    if(apsCount>0&&aiCount==0)
+    {
+     this.apsTitle="APS排产"
+    }
+    else if(apsCount==0&&aiCount>0)
+    {
+      this.apsTitle="智能排产"
+    }
+    else
+    {
+       this.apsTitle=""
+    }
     this.orderlist();
   },
   methods: {
@@ -105,12 +121,13 @@ export default {
           this.$Message.error("请求失败");
         });
     },
-    listData(id, index) {
+    listData(row, index) {
       this.blacks = true;
       this.gant = true;
       this.detail = () => import("./result");
       this.isactive = index;
-      this.id = id;
+      this.id = row.schedule_Id;
+      this.time=row.plan_Date;
       this.title = "排产方案结果";
     },
     clear() {
@@ -146,7 +163,14 @@ export default {
     },
     // 返回
     comeBlck() {
-      this.$router.push({ path: "/aps/aps" });
+      if(this.apsTitle=="APS排产")
+      {
+        this.$router.push({ path: "/aps/aps" });
+      }
+      else 
+      {
+      this.$router.push({ path: "/aps/ai" });
+      }
     },
     parameter() {
       Api.processschemedispatch({
@@ -168,7 +192,7 @@ export default {
     },
      datasShow() {
       this.modal1Gant = true;
-      this.modalTitle='数据包';
+      this.modalTitle='生成数据包';
       this.gantt = () => import("./datasShow");
     },
     changeCheck(item, i) {
@@ -184,6 +208,10 @@ export default {
     },
     cancel() {
       this.showFooter = false;
+    },
+    closemodal(){
+this.modal1Gant=false
+ this.time=''
     }
   },
   computed: {

pages/aps/results/indexData.vue → pages/aps/results/index1.vue

@@ -19,7 +19,7 @@
           :class="isactive == index ? 'addclass' : '' "
         >
           <Checkbox v-model="li.checked" class="i-checkbox" @on-change="changeCheck(li,index)"></Checkbox>
-          <div class="title-t" @click="listData(li,index)">排产方案：{{li.schedule_Id}}</div>
+          <div class="title-t" @click="listData(li.schedule_Id,index)">排产方案：{{li.schedule_Id}}</div>
           <div class="fa">排产时间：{{li.plan_Date}}</div>
           <div class="fa">
             <span>{{li.iNSERTFLAG}} /</span>
@@ -34,11 +34,11 @@
             <h4 :text="title">{{title}}</h4>
           </Col>
           <Col span="10">
-            <a href="#" @click="comeBlck" class="black">智能排产</a>
+            <a href="#" @click="comeBlck" class="black">APS排产</a>
           </Col>
-          <Col span="10" style="text-align: right;"  v-if="gant">
-           <a href="#" @click="datasShow" >数据包</a>
-            <a href="#" @click="gantChart"  >甘特图</a>
+          <Col span="10" style="text-align: right;">
+           <a href="#" @click="datasShow" v-if="false">数据包</a>
+            <a href="#" @click="gantChart"   v-if="gant">甘特图</a>
           </Col>
         </Row>
 
@@ -52,7 +52,7 @@
     </div>
     <Modal v-model="modal1Gant" fullscreen :title="modalTitle" footer-hide>
       <!-- <Gantt :id="id" /> -->
-      <gantt :is="gantt" :id="id" :time="time" @close="closemodal" />
+      <gantt :is="gantt" :id="id" />
     </Modal>
   </div>
 </template>
@@ -80,8 +80,7 @@ export default {
       gant: false,
       gantt: null,
       curPage: null,
-      modalTitle:'甘特图',
-      time:'',
+      modalTitle:'甘特图'
     };
   },
   async fetch({ store, params }) {
@@ -106,13 +105,12 @@ export default {
           this.$Message.error("请求失败");
         });
     },
-    listData(row, index) {
+    listData(id, index) {
       this.blacks = true;
       this.gant = true;
       this.detail = () => import("./result");
       this.isactive = index;
-      this.id = row.schedule_Id;
-      this.time=row.plan_Date;
+      this.id = id;
       this.title = "排产方案结果";
     },
     clear() {
@@ -148,7 +146,7 @@ export default {
     },
     // 返回
     comeBlck() {
-      this.$router.push({ path: "/aps/ai" });
+      this.$router.push({ path: "/aps/aps" });
     },
     parameter() {
       Api.processschemedispatch({
@@ -170,7 +168,7 @@ export default {
     },
      datasShow() {
       this.modal1Gant = true;
-      this.modalTitle='生成数据包';
+      this.modalTitle='数据包';
       this.gantt = () => import("./datasShow");
     },
     changeCheck(item, i) {
@@ -186,10 +184,6 @@ export default {
     },
     cancel() {
       this.showFooter = false;
-    },
-    closemodal(){
-this.modal1Gant=false
- this.time=''
     }
   },
   computed: {