ai aistep3 aistep4 aistep5

pages/aps/ai/index.vue

@@ -6,19 +6,19 @@
             <Search />
         </template>
         <template slot="buttons">
-            应用规则：
+            <!-- 应用规则：
             <Select v-model="rulesAi" multiple style="width:280px;" class="tl">
                 <Option v-for="item in rulesAiList" :value="item.value" :key="item.value">{{ item.label }}</Option>
-            </Select>
+            </Select> -->
             <DatePicker type="date" placeholder="设置基准日期" style="width: 150px;" v-model="entity.setTime" @on-change="getTime"></DatePicker>
-            <Button type="primary" @click="openApsModal">智能排产</Button>
+            <Button type="primary" @click="openApsModal">APS排产</Button>
         </template>
         <template slot="batch">
             <Button type="primary" class="mr10 ml10" @click="removeOk">移出排产</Button>
         </template>
     </DataGrid>
-    <Modal v-model="apsModal" title="确定智能排产" @on-ok="apsOk" @on-cancel="cancel">
-        <p>确定进行智能排产？</p>
+    <Modal v-model="apsModal" title="确定APS排产" @on-ok="apsOk" @on-cancel="cancel">
+        <p>确定进行APS排产？</p>
     </Modal>
 
     <Modal v-model="resultModal" title="数据检查" width="1500" @on-ok="cancel" @on-cancel="cancel">
@@ -505,30 +505,18 @@ export default {
             //排产计算
             let paramsTime = {
                 setTime: this.entity.setTime,
-                rules: JSON.stringify(this.rulesAi).replace('[', '').replace(']', '').replace(/\"/g, '')
+                //rules: JSON.stringify(this.rulesAi).replace('[', '').replace(']', '').replace(/\"/g, '')
             };
             Api.apsprepareandcalc(paramsTime)
                 .then((res2) => {
                     if (res2.success) {
                         if (res2.result.res) {
-                            // this.$Message.success("排产计算成功");
-                            //智能排产操作start
-                            Api.aischedule(paramsTime).then((res3) => {
-                                if (res3.success) {
-                                    if (res3.result.res) {
-                                        this.$Message.success("排产成功");
-                                        this.circleModal = false;
-                                        this.$router.push({
-                                            path: "/aps/results",
-                                            // params: { customerId: id }
-                                        });
-                                    } else {
-                                        this.circleModal = false;
-                                        this.$Message.error(res3.result.msg);
-                                    }
-                                }
+                            this.$Message.success("排产计算成功");
+                            this.circleModal = false;
+                            this.$router.push({
+                                path: "/aps/results/indexData"
+                                // params: { customerId: id }
                             });
-                            //智能排产操作end
                         } else {
                             this.circleModal = false;
                             this.$Message.error(res2.result.msg);

pages/aps/aps/api.js

@@ -139,12 +139,27 @@ export default {
   },
   //智能排产end----
 
-  //多级连排
+  //多级连排start
   createorderproductrelation() {
     return Api.post(`${apsUrl}/apspoolappservices/createorderproductrelation`)
   },
   apsdatascheduledlevel(params) {
     return Api.post(`${apsUrl}/apspoolappservices/aps_data_scheduled_level`, params)
   },
-  
+  //多级连排end
+  //智能排产数据包start
+  //数据包生成
+  aistep3(params) {
+    return Api.post(`${apsUrl}/aps/aistep3`, params)
+  },
+  //Python计算结果
+  aistep4() {
+    return Api.post(`${apsUrl}/aps/aistep4`)
+  },
+  //保存到规则表
+  aistep5() {
+    return Api.post(`${apsUrl}/aps/aistep5`)
+  },
+  //智能排产数据包end
+
 }

pages/aps/results/datasShow.vue

 <template>
   <div>
+    <div>
+      应用规则：
+      <Select v-model="rulesAi" multiple style="width: 280px" class="tl">
+        <Option
+          v-for="item in rulesAiList"
+          :value="item.value"
+          :key="item.value"
+          >{{ item.label }}</Option
+        >
+      </Select>
+    </div>
+    <div>
+      数据包结果集：
+      <dl v-html="step3Info" style="margin-left: 40px"></dl>
+    </div>
+    <div v-if="step4Statu">
+      Python计算结果：
+      <dl v-html="step4Info" style="margin-left: 40px"></dl>
+    </div>
     <FooterToolbar class="ftball">
-    <Button type="primary">下一步</Button>
-        <Button>取消</Button>
+      <Button type="primary" @click="loadStep4">下一步</Button>
+      <Button @click="cancel">取消</Button>
     </FooterToolbar>
   </div>
 </template>
@@ -11,32 +30,93 @@
 </style>
 
 <script>
-import Api from "./api";
+import Api from "../aps/api";
 
 export default {
   name: "datasShow",
-  components: {
-  },
+  components: {},
   props: {
     id: String,
+    time: String,
   },
 
   data() {
     return {
-    
+      rulesAi: ["1", "2", "3", "4"],
+      rulesAiList: [
+        {
+          value: "1",
+          label: "转序",
+        },
+        {
+          value: "2",
+          label: "多台",
+        },
+        {
+          value: "3",
+          label: "加班",
+        },
+        {
+          value: "4",
+          label: "公休",
+        },
+      ],
+      step3Info: "",
+      step4Info: "",
+      step4Statu: false,
+      step5Statu:false,
     };
   },
-  created() {
+  created() {},
+  mounted() {
+    if (this.time != "") {
+      this.loadStep3(this.time);
+    }
   },
   methods: {
-
+    loadStep3(val) {
+      let paramsTime = {
+        rules: JSON.stringify(this.rulesAi).replace('[', '').replace(']', '').replace(/\"/g, ''),
+      };
+      Api.aistep3(paramsTime).then((res) => {
+        if (res.success && res.result != "") {
+          this.step3Info = res.result;
+        }
+      });
+    },
+    loadStep4() {
+      if (!this.step4Statu && !this.step5Statu) {
+        this.step4Statu = true;
+        Api.aistep4().then((res) => {
+          if (res.success) {
+            this.step4Info = res.result;
+          }
+        });
+      }
+      else if(this.step4Statu && !this.step5Statu)
+      {
+          this.step4Statu = true;
+          this.step5Statu = true;
+        Api.aistep5().then((res1) => {
+          if (res1.success) {
+               this.$Message.success("成功保存到规则表");
+               setTimeout(this.$router.push({ path: "/aps/ai" }),2000)
+              
+          }
+        });
+      }
+    },
+    cancel()
+    {
+        this.$emit('close')
+    }
   },
-   watch: {
-        id(v) {
-            if (v != '') {
-               
-            }
-        },
+  watch: {
+    time(v) {
+      if (v != "") {
+        this.loadStep3(v);
+      }
     },
+  },
 };
 </script>

pages/aps/results/index.vue

@@ -37,7 +37,7 @@
             <a href="#" @click="comeBlck" class="black">APS排产</a>
           </Col>
           <Col span="10" style="text-align: right;">
-           <a href="#" @click="datasShow" >数据包</a>
+           <a href="#" @click="datasShow" v-if="false">数据包</a>
             <a href="#" @click="gantChart"   v-if="gant">甘特图</a>
           </Col>
         </Row>

pages/aps/results/indexData.vue

+<style lang="less">
+@import "./results.less";
+</style>
+<template>
+  <div class="results">
+    <Layout>
+      <Sider hide-trigger width="300">
+        <h4>排产方案列表</h4>
+        <div class="btn">
+          <a href="#" @click="clear">
+            <Icon type="ios-trash" />
+            <span>清空列表</span>
+          </a>
+        </div>
+        <div
+          class="left-body"
+          v-for="(li,index) in list"
+          :key="index"
+          :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="fa">排产时间：{{li.plan_Date}}</div>
+          <div class="fa">
+            <span>{{li.iNSERTFLAG}} /</span>
+            <span>参数级别：{{li.routing_schema}} /</span>
+            <span>参数应用：{{li.routing_version}}</span>
+          </div>
+        </div>
+      </Sider>
+      <Content>
+        <Row class="i-row">
+          <Col span="2" v-if="blacks">
+            <h4 :text="title">{{title}}</h4>
+          </Col>
+          <Col span="10">
+            <a href="#" @click="comeBlck" class="black">智能排产</a>
+          </Col>
+          <Col span="10" style="text-align: right;"  v-if="gant">
+           <a href="#" @click="datasShow" >数据包</a>
+            <a href="#" @click="gantChart"  >甘特图</a>
+          </Col>
+        </Row>
+
+        <component :is="detail" :eid="id" :schemas="schemas" @ok-claer="clearS" />
+      </Content>
+    </Layout>
+    <div class="footer" v-if="showFooter">
+      <span>已选：{{schemas.length}}项</span>&nbsp;&nbsp;&nbsp;
+      <Button type="primary" @click="submit">方案对比</Button>&nbsp;
+      <Button type="default" @click="cancel">取消</Button>
+    </div>
+    <Modal v-model="modal1Gant" fullscreen :title="modalTitle" footer-hide>
+      <!-- <Gantt :id="id" /> -->
+      <gantt :is="gantt" :id="id" :time="time" @close="closemodal" />
+    </Modal>
+  </div>
+</template>
+<script>
+import Api from "./api";
+// import Gantt from "./gantt";
+export default {
+  // components: {
+  //   Gantt
+  // },
+  data() {
+    return {
+      curId: null,
+      detail: null,
+      isactive: null,
+      list: [],
+      name: "name1",
+      id: null,
+      contrastList: [],
+      title: "",
+      modal1Gant: false,
+      showFooter: false,
+      total: 0,
+      blacks: false,
+      gant: false,
+      gantt: null,
+      curPage: null,
+      modalTitle:'甘特图',
+      time:'',
+    };
+  },
+  async fetch({ store, params }) {
+    await store.dispatch("loadDictionary"); // 加载数据字典
+  },
+  created() {
+    this.orderlist();
+  },
+  methods: {
+    clickTab(name) {},
+    orderlist() {
+      Api.getall()
+        .then(r => {
+          if (r.result) {
+            this.list = r.result;
+            this.list.map(u => {
+              u.checked = false;
+            });
+          }
+        })
+        .catch(error => {
+          this.$Message.error("请求失败");
+        });
+    },
+    listData(row, 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.title = "排产方案结果";
+    },
+    clear() {
+      if (this.list.length > 0) {
+        this.$Modal.confirm({
+          title: "清空列表",
+          content: "您确定要清空列表吗",
+          onOk: () => {
+            Api.clearall().then(r => {
+              if (r.success) {
+                this.$Message.success("清空列表成功");
+                this.orderlist();
+                this.id = 0;
+                this.listData();
+              }
+            });
+          },
+          onCancel: () => {
+            this.$Message.info("已取消");
+          }
+        });
+      }
+    },
+    clearS() {
+      this.id = 0;
+      Api.clearall().then(r => {
+        if (r.success) {
+          this.orderlist();
+          this.id = 0;
+          this.listData();
+        }
+      });
+    },
+    // 返回
+    comeBlck() {
+      this.$router.push({ path: "/aps/ai" });
+    },
+    parameter() {
+      Api.processschemedispatch({
+        id: this.id
+      }).then(r => {
+        if (r.result) {
+          this.$Message.success(r.result.retmsg);
+          this.orderlist();
+        } else {
+          this.$Message.success("下发失败");
+        }
+      });
+    },
+    //甘特图
+    gantChart() {
+      this.modal1Gant = true;
+      this.modalTitle='甘特图';
+      this.gantt = () => import("./gantt");
+    },
+     datasShow() {
+      this.modal1Gant = true;
+      this.modalTitle='生成数据包';
+      this.gantt = () => import("./datasShow");
+    },
+    changeCheck(item, i) {
+      this.$set(this.list, i, item);
+      if (this.title != "排产方案对比") {
+        this.showFooter = true;
+      }
+    },
+    submit() {
+      this.detail = () => import("./compare");
+      this.title = "排产方案对比";
+      this.showFooter = false;
+    },
+    cancel() {
+      this.showFooter = false;
+    },
+    closemodal(){
+this.modal1Gant=false
+ this.time=''
+    }
+  },
+  computed: {
+    schemas() {
+      return this.list.filter(u => {
+        return u.checked == true;
+      });
+    }
+  }
+};
+</script>
\ No newline at end of file