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

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

@@ -24,15 +24,16 @@
                         <span class="red">*</span>
                     </p>
                     <div class="row">
-                        <p
+                        <div
                             :key="index"
-                            class="options"
-                            v-for="(item, index) in productionLine"
+                            class="options2"
+                            v-for="(item, index) in stationList"
                             @click="change(index)"
                             :class="{ active: a == index }"
                         >
-                            {{ item.title }}
-                        </p>
+                            <p>{{ item.title }}</p>
+                            <p>{{ item.status == 1 ? "待上料" : "运行中" }}</p>
+                        </div>
                     </div>
                 </div>
                 <div class="choose">
@@ -46,11 +47,8 @@
                                 <label style="font-size: 16px"
                                     >上料信息：</label
                                 >
-                                <Input
-                                    type="text"
-                                    class="searchInput"
-                                    style="width: 300px"
-                                ></Input>
+                                <Input type="text" class="searchInput"
+                                style="width: 300px"/>
                             </div>
                             <div class="row">
                                 <p class="flex">
@@ -277,20 +275,25 @@ export default {
                     method: "get",
                 })
                 .then((res) => {
-                    this.productionLine = res.data.data;
-                    // this.change(0);
-                    if (this.productionLine.length == 0) {
-                        this.$Message.error(this.$t(950057));
+                    if (res.data.ret == 1) {
+                        this.productionLine = res.data.data;
+                        // this.change(0);
+                        if (this.productionLine.length == 0) {
+                            this.$Message.error(this.$t(950057));
+                        }
                     }
                 });
         },
         getStations(id) {
+            let data = {
+                line: id,
+                type: 0,
+            };
             this.request(
-                "/qms/RepairPostionSetting/GetSettingByChanel?Id=" + id,
-                "",
+                "/acc/AutomationOperate/GetloadStation",
+                data,
                 "get"
             ).then((res) => {
-                // console.log(res.data.data);
                 if (res.data.ret == 1) {
                     this.stationList = res.data.data;
                 }
@@ -374,6 +377,18 @@ export default {
     margin-right: 50px;
     cursor: pointer;
 }
+.options2 {
+    font-size: 12px;
+    padding: 0 12px;
+    height: 50px;
+    line-height: 25px;
+    text-align: center;
+    border-radius: 5px;
+    background-color: #f2f2f2;
+    margin: 10px 0;
+    margin-right: 50px;
+    cursor: pointer;
+}
 .active {
     background-color: #2d8cf0;
     color: #fff;

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

@@ -44,11 +44,11 @@
                 </div>
                 <div class="filter">
                     <label>任务编号：</label>
-                    <Input type="text" class="searchInput"></Input>
+                    <Input type="text" class="searchInput" />
                 </div>
                 <div class="filter">
                     <label>工件编号：</label>
-                    <Input type="text" class="searchInput"></Input>
+                    <Input type="text" class="searchInput"/>
                 </div>
                 <div class="filter">
                     <label>状态：</label>
@@ -138,6 +138,8 @@
 </template>
 
 <script>
+import axios from "@/libs/api.request";
+
 export default {
     data() {
         return {
@@ -259,6 +261,23 @@ export default {
                     }
                 });
         },
+        exportExcel(){
+            let data = {};
+            this.axios
+                .request({
+                    url: "",
+                    data,
+                    method: "",
+                })
+                .then((res) => {
+                    if (res.data.ret === 1) {
+                        window.location.href =
+                            axios.publicPath + "" + res.data.data;
+                    } else {
+                        this.$Message.error(this.$t(res.data.msg));
+                    }
+                });
+        }
     },
 };
 </script>

Html/src/view/tlm/config/tool_boom.vue

@@ -722,7 +722,6 @@ export default {
                     alert(err.msg);
                 });
         },
-
         request(url, data, type) {
             if (type == "get") {
                 return this.axios