新增行李接口

src/api/request.js

@@ -53,7 +53,7 @@ export function getLocalisation() {//获取站点
 }
 export function ordersTemplate(data) {//通过模板下单
   return Service({
-    url: '/orderstemplate',
+    url: '/Framework/IDSInfo/TemplatesSendMission',
     method: 'post',
     data: data
   })
@@ -366,6 +366,27 @@ export function carUPlist(data) {//车辆接口
     data: data
   })
 }
+export function TemplateOrder() {//地图模板下单
+  return Service({
+    url: '/Framework/IDSInfo/TemplatesInfo?page=1',
+    method: 'get',
+  })
+}
+
+export function GetAmrUpperPlcList(data) {//获取车载状态
+  return Service({
+    url: '/Framework/AmrPlc/GetAmrUpperPlcList',
+    method: 'post',
+    data: data
+  })
+}
+export function BaggageInquiry(data) {//行李查询
+  return Service({
+    url: '/Framework/BagTrack/GetAllList?PageIndex=' + data.page + "&PageSize=" + data.PageSize,
+    method: 'get',
+    data: data
+  })
+}
 // export function getAllAndroidPlugins() {
 //   return Service({
 //     url: '/manager/getAndroidPlugin ',

src/pages/Alarm/History/index.vue

@@ -1,309 +1,336 @@
 <template>
-	<div class="logBox">
-		<div class="border_left_top border"></div>
-		<div class="border_top border"></div>
-		<div class="border_right_top border"></div>
-		<div class="border_left border"></div>
-		<div class="border_right border"></div>
-		<div class="border_left_bottom border"></div>
-		<div class="border_bottom border"></div>
-		<div class="border_right_bottom border"></div>
-		<el-button-group id="topButton2">
-			<el-button type="primary" @click="goTo">当前</el-button>
-			<el-button type="primary" class="active">历史</el-button>
-		</el-button-group>
-		<div class="downlodTable" @click="downlodTable">导出</div>
-		<el-table :data="tableData" style="width: 100%;color: #2DAFF5;height: 720px;overflow-y: auto;">
-			<el-table-column prop="error_code" align="center" label="Alarm ID" width="180">
-			</el-table-column>
-			<el-table-column prop="error_reason" align="center" label="报警内容">
-			</el-table-column>
-			<el-table-column prop="equ_name" align="center" label="报警模块">
-			</el-table-column>
-			<el-table-column prop="alarm_date" align="center" label="报警时间">
-			</el-table-column>
-			<el-table-column prop="deal_date" align="center" label="恢复时间">
-			</el-table-column>
-		</el-table>
-	</div>
+  <div class="logBox">
+    <div class="border_left_top border"></div>
+    <div class="border_top border"></div>
+    <div class="border_right_top border"></div>
+    <div class="border_left border"></div>
+    <div class="border_right border"></div>
+    <div class="border_left_bottom border"></div>
+    <div class="border_bottom border"></div>
+    <div class="border_right_bottom border"></div>
+    <el-button-group id="topButton2">
+      <el-button type="primary" @click="goTo">当前</el-button>
+      <el-button type="primary" class="active">历史</el-button>
+    </el-button-group>
+    <div class="downlodTable" @click="downlodTable">导出</div>
+    <el-table
+      :data="tableData"
+      style="width: 100%; color: #2daff5; height: 720px; overflow-y: auto"
+    >
+      <el-table-column
+        prop="error_code"
+        align="center"
+        label="Alarm ID"
+        width="180"
+      >
+      </el-table-column>
+      <el-table-column prop="error_reason" align="center" label="报警内容">
+      </el-table-column>
+      <el-table-column prop="equ_name" align="center" label="报警模块">
+      </el-table-column>
+      <el-table-column prop="alarm_date" align="center" label="报警时间">
+      </el-table-column>
+      <el-table-column prop="deal_date" align="center" label="恢复时间">
+      </el-table-column>
+    </el-table>
+  </div>
 </template>
 
 <script>
-	import {
-		Dbalarm
-	} from '../../../api/request.js'
-	import FileSaver from "file-saver";
-	import XLSX from "xlsx";
-	export default {
-		name: "History",
-		data() {
-			return {
-				sj: null,
-				reqData: {
-					ctg: "his",
-					opt: 'nonexcel'
-				},
-				tableData: [{
-					"id": 7,
-					"error_code": "C04",
-					"equ_name": "输送机",
-					"error_name": "C04_Status.Emergency_Stop",
-					"error_reason": "C04急停",
-					"error_solve": "检查电控柜急停按钮",
-					"alarm_date": "/Date(1603778585000)/",
-					"if_deal": 1,
-					"deal_man": "系统",
-					"deal_date": "/Date(1603848495000)/"
-				}]
-			}
-		},
-		created() {
-			this.getData()
-		},
-		mounted(){
-			clearInterval(this.sj)
-			let that = this;
-			this.sj = setInterval(function() {
-				that.getData()
-			}, 3000)
-		},
-		beforeRouteLeave(to, from, next){
-			next();
-			if (this.sj) {
-			  clearInterval(this.sj)
-			  this.sj = null;
-			}
-		},
-		methods: {
-			getData() {
-				Dbalarm(this.reqData).then(res => {
-					console.log(res.AlarmInfo)
-					this.tableData = res.AlarmInfo
-					// console.log(this.timeFor(this.tableData[0].alarm_date))
-					for (let index in this.tableData) {
-						this.tableData[index].alarm_date = this.timeFor(this.tableData[index].alarm_date)
-						this.tableData[index].deal_date = this.timeFor(this.tableData[index].deal_date)
-					}
-				})
-			},
-			timeFor(dateA) { //转换时间戳
-				var timestamp = dateA;
-				var date = new Date(parseInt(timestamp.replace("/Date(", "").replace(")/", ""), 10));
-				let Y = date.getFullYear() + '-';
-				let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
-				let D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + ' ';
-				let h = (date.getHours() < 10 ? '0' + (date.getHours()) : date.getHours()) + ':';
-				let m = (date.getMinutes() < 10 ? '0' + (date.getMinutes()) : date.getMinutes()) + ':';
-				let s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds());
-				var NewDtime = Y + M + D + h + m + s;
-				return NewDtime;
-			},
-			downlodTable() {
-				this.$confirm('是否需要导出xlsx文档, 是否继续?', '提示', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-					type: 'warning'
-				}).then(() => {
-					this.downFile();
-					this.$message({
-						type: 'success',
-						message: '导出成功!'
-					});
-				}).catch(() => {
-					this.$message({
-						type: 'info',
-						message: '已取消导出'
-					});
-				});
-
-			},
-			downFile() {
-				var wb = XLSX.utils.table_to_book(document.querySelector("#userTableData"));
-				var wbout = XLSX.write(wb, {
-					bookType: "xlsx",
-					bookSST: true,
-					type: "array"
-				});
-				try {
-					FileSaver.saveAs(
-						new Blob([wbout], {
-							type: "application/octet-stream"
-						}),
-						"报警统计.xlsx"
-					);
-				} catch (e) {
-					if (typeof console !== "undefined") console.log(e, wbout);
-				}
-				return wbout;
-			},
-			goTo() {
-				this.$router.push("/Alarm/RealTime");
-			},
-			//设置指定行、列、具体单元格颜色
-			cellStyle({
-				row,
-				column,
-				rowIndex,
-				columnIndex
-			}) {
-				if (columnIndex === 0) { //指定坐标rowIndex ：行，columnIndex ：列
-					return 'background:#103366' //rgb(105,0,7)
-				} else {
-					return ''
-				}
-			}
-		}
-	}
+import { Dbalarm } from "../../../api/request.js";
+import FileSaver from "file-saver";
+import XLSX from "xlsx";
+export default {
+  name: "History",
+  data() {
+    return {
+      sj: null,
+      reqData: {
+        ctg: "his",
+        opt: "nonexcel",
+      },
+      tableData: [
+        {
+          id: 7,
+          error_code: "C04",
+          equ_name: "输送机",
+          error_name: "C04_Status.Emergency_Stop",
+          error_reason: "C04急停",
+          error_solve: "检查电控柜急停按钮",
+          alarm_date: "/Date(1603778585000)/",
+          if_deal: 1,
+          deal_man: "系统",
+          deal_date: "/Date(1603848495000)/",
+        },
+      ],
+    };
+  },
+  created() {
+    this.getData();
+  },
+  mounted() {
+    clearInterval(this.sj);
+    let that = this;
+    this.sj = setInterval(function () {
+      that.getData();
+    }, 3000);
+  },
+  beforeRouteLeave(to, from, next) {
+    next();
+    if (this.sj) {
+      clearInterval(this.sj);
+      this.sj = null;
+    }
+  },
+  methods: {
+    getData() {
+      Dbalarm(this.reqData).then((res) => {
+        console.log(res.AlarmInfo);
+        this.tableData = res.AlarmInfo;
+        // console.log(this.timeFor(this.tableData[0].alarm_date))
+        for (let index in this.tableData) {
+          this.tableData[index].alarm_date = this.timeFor(
+            this.tableData[index].alarm_date
+          );
+          this.tableData[index].deal_date = this.timeFor(
+            this.tableData[index].deal_date
+          );
+        }
+      });
+    },
+    timeFor(dateA) {
+      //转换时间戳
+      var timestamp = dateA;
+      var date = new Date(
+        parseInt(timestamp.replace("/Date(", "").replace(")/", ""), 10)
+      );
+      let Y = date.getFullYear() + "-";
+      let M =
+        (date.getMonth() + 1 < 10
+          ? "0" + (date.getMonth() + 1)
+          : date.getMonth() + 1) + "-";
+      let D =
+        (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
+      let h =
+        (date.getHours() < 10 ? "0" + date.getHours() : date.getHours()) + ":";
+      let m =
+        (date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes()) +
+        ":";
+      let s =
+        date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+      var NewDtime = Y + M + D + h + m + s;
+      return NewDtime;
+    },
+    downlodTable() {
+      this.$confirm("是否需要导出xlsx文档, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.downFile();
+          this.$message({
+            type: "success",
+            message: "导出成功!",
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消导出",
+          });
+        });
+    },
+    downFile() {
+      var wb = XLSX.utils.table_to_book(
+        document.querySelector("#userTableData")
+      );
+      var wbout = XLSX.write(wb, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array",
+      });
+      try {
+        FileSaver.saveAs(
+          new Blob([wbout], {
+            type: "application/octet-stream",
+          }),
+          "报警统计.xlsx"
+        );
+      } catch (e) {
+        if (typeof console !== "undefined") console.log(e, wbout);
+      }
+      return wbout;
+    },
+    goTo() {
+      this.$router.push("/Alarm/RealTime");
+    },
+    //设置指定行、列、具体单元格颜色
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        //指定坐标rowIndex ：行，columnIndex ：列
+        return "background:#103366"; //rgb(105,0,7)
+      } else {
+        return "";
+      }
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>
-	.logBox {
-		width: 100%;
-		height: 100%;
-		overflow: hidden;
-		position: relative;
-		padding: 4.0625rem 1.5rem 4.0625rem 2.5rem;
-		box-sizing: border-box;
-
-		// background: url(../../assets/img/border.png) no-repeat center center;
-		// background-size: 100% 100%;
-		.border {
-			position: absolute;
-		}
-
-		.border_left_top {
-			width: 12.625rem;
-			height: 5.875rem;
-			background: url(../../../assets/img/border.png);
-			left: 1px;
-			top: 1px;
-		}
-
-		.border_top {
-			width: calc(100% - 12.625rem - 4.9375rem);
-			height: 1.5rem;
-			background: url(../../../assets/img/border_top.png) no-repeat center center;
-			background-size: 100% 100%;
-			left: 12.625rem;
-			top: 0;
-		}
+.logBox {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  position: relative;
+  padding: 4.0625rem 1.5rem 4.0625rem 2.5rem;
+  box-sizing: border-box;
+  /deep/.el-table {
+    background-color: rgba(0, 0, 0, 0) !important;
+  }
+  // background: url(../../assets/img/border.png) no-repeat center center;
+  // background-size: 100% 100%;
+  .border {
+    position: absolute;
+  }
 
-		.border_right_top {
-			width: 4.9375rem;
-			height: 5.875rem;
-			background: url(../../../assets/img/border_right_top.png) no-repeat center center;
-			background-size: 100% 100%;
-			right: 0.0625rem;
-			top: 0;
-		}
+  .border_left_top {
+    width: 12.625rem;
+    height: 5.875rem;
+    background: url(../../../assets/img/border.png);
+    left: 1px;
+    top: 1px;
+  }
 
-		.border_left {
-			width: 1.375rem;
-			height: calc(100% - 5.875rem - 7.625rem);
-			background: url(../../../assets/img/border_left.png) no-repeat center center;
-			background-size: 100% 100%;
-			left: 0;
-			top: 5.875rem;
-		}
+  .border_top {
+    width: calc(100% - 12.625rem - 4.9375rem);
+    height: 1.5rem;
+    background: url(../../../assets/img/border_top.png) no-repeat center center;
+    background-size: 100% 100%;
+    left: 12.625rem;
+    top: 0;
+  }
+  .border_right_top {
+    width: 4.9375rem;
+    height: 5.875rem;
+    background: url(../../../assets/img/border_right_top.png) no-repeat center
+      center;
+    background-size: 100% 100%;
+    right: 0.0625rem;
+    top: 0;
+  }
 
-		.border_right {
-			width: 0.1875rem;
-			height: calc(100% - 5.875rem - 7.6875rem);
-			background: url(../../../assets/img/border_right.png) no-repeat center center;
-			background-size: 100% 100%;
-			right: 0;
-			top: 5.875rem;
-		}
+  .border_left {
+    width: 1.375rem;
+    height: calc(100% - 5.875rem - 7.625rem);
+    background: url(../../../assets/img/border_left.png) no-repeat center center;
+    background-size: 100% 100%;
+    left: 0;
+    top: 5.875rem;
+  }
 
-		.border_left_bottom {
-			width: 11.625rem;
-			height: 7.625rem;
-			background: url(../../../assets/img/border_left_bottom.png) no-repeat center center;
-			background-size: 100% 100%;
-			left: 0;
-			bottom: 0;
-		}
+  .border_right {
+    width: 0.1875rem;
+    height: calc(100% - 5.875rem - 7.6875rem);
+    background: url(../../../assets/img/border_right.png) no-repeat center
+      center;
+    background-size: 100% 100%;
+    right: 0;
+    top: 5.875rem;
+  }
 
-		.border_bottom {
-			width: calc(100% - 11.625rem - 4.9375rem);
-			height: 0.1875rem;
-			background: url(../../../assets/img/border_bottom.png) no-repeat center center;
-			background-size: 100% 100%;
-			left: 11.625rem;
-			bottom: 0;
-		}
+  .border_left_bottom {
+    width: 11.625rem;
+    height: 7.625rem;
+    background: url(../../../assets/img/border_left_bottom.png) no-repeat center
+      center;
+    background-size: 100% 100%;
+    left: 0;
+    bottom: 0;
+  }
 
-		.border_right_bottom {
-			width: 4.9375rem;
-			height: 7.6875rem;
-			background: url(../../../assets/img/border_right_bottom.png) no-repeat center center;
-			background-size: 100% 100%;
-			right: 0;
-			bottom: 0;
-		}
+  .border_bottom {
+    width: calc(100% - 11.625rem - 4.9375rem);
+    height: 0.1875rem;
+    background: url(../../../assets/img/border_bottom.png) no-repeat center
+      center;
+    background-size: 100% 100%;
+    left: 11.625rem;
+    bottom: 0;
+  }
 
-		#topButton2 {
-			position: absolute;
-			top: 8px;
-			left: 8px;
-			z-index: 1;
+  .border_right_bottom {
+    width: 4.9375rem;
+    height: 7.6875rem;
+    background: url(../../../assets/img/border_right_bottom.png) no-repeat
+      center center;
+    background-size: 100% 100%;
+    right: 0;
+    bottom: 0;
+  }
 
-			button:first-child {
-				border: none;
-				background: url(../../../assets/img/uncheck1.png) no-repeat center center;
-				background-size: 100% 100%;
-				padding: 12px 50px 12px 35px;
-				position: absolute;
-				font-weight: bold;
-				font-style: italic;
-				color: #76899D;
-			}
+  #topButton2 {
+    position: absolute;
+    top: 8px;
+    left: 8px;
+    z-index: 1;
 
-			button:last-child {
-				border: none;
-				background: url(../../../assets/img/check2.png) no-repeat center center;
-				background-size: 100% 100%;
-				padding: 12px 55px;
-				position: absolute;
-				left: 78px;
-				font-weight: bold;
-				font-style: italic;
-				color: #76899D;
-			}
+    button:first-child {
+      border: none;
+      background: url(../../../assets/img/uncheck1.png) no-repeat center center;
+      background-size: 100% 100%;
+      padding: 12px 50px 12px 35px;
+      position: absolute;
+      font-weight: bold;
+      font-style: italic;
+      color: #76899d;
+    }
 
-			.active {
-				color: #fff !important;
-			}
-		}
+    button:last-child {
+      border: none;
+      background: url(../../../assets/img/check2.png) no-repeat center center;
+      background-size: 100% 100%;
+      padding: 12px 55px;
+      position: absolute;
+      left: 78px;
+      font-weight: bold;
+      font-style: italic;
+      color: #76899d;
+    }
 
-		.el-table::before {
-			height: 0;
-		}
+    .active {
+      color: #fff !important;
+    }
+  }
 
-	}
+  .el-table::before {
+    height: 0;
+  }
+}
 
-	.downlodTable {
-		width: 50px;
-		height: 30px;
-		box-shadow: inset 0px 1px 38px 0px rgba(0, 162, 253, 0.4) !important;
-		border: 1px solid rgba(1, 148, 228, 0.34) !important;
-		background: none !important;
-		float: right;
-		position: absolute;
-		top: 30px;
-		right: 25px;
-		color: #ddd;
-		text-align: center;
-		line-height: 30px;
-		cursor: pointer;
-	}
+.downlodTable {
+  width: 50px;
+  height: 30px;
+  box-shadow: inset 0px 1px 38px 0px rgba(0, 162, 253, 0.4) !important;
+  border: 1px solid rgba(1, 148, 228, 0.34) !important;
+  background: none !important;
+  float: right;
+  position: absolute;
+  top: 30px;
+  right: 25px;
+  color: #ddd;
+  text-align: center;
+  line-height: 30px;
+  cursor: pointer;
+}
 </style>
 <style>
-	.logBox .el-table th {
-		background: #103366 !important;
-	}
+.logBox .el-table th {
+  background: #103366 !important;
+}
 
-	.logBox .el-table th>.cell {
-		color: #0194E4 !important;
-	}
+.logBox .el-table th > .cell {
+  color: #0194e4 !important;
+}
 </style>

src/pages/ArmManage/index.vue

@@ -352,6 +352,7 @@ import {
   GetTemplateslist,
   getVehicleStatus,
   carUPlist,
+  GetAmrUpperPlcList,
 } from "../../api/request.js";
 export default {
   data() {
@@ -809,6 +810,15 @@ export default {
           arr = res;
         }
       });
+      // GetAmrUpperPlcList(data).then((res) => {
+      //   if (res.ResultCode ==1){
+      //     res.ResultData.forEach(rel => {
+      //       if (rel.) {
+
+      //       }
+      //     });
+      //   }
+      // });
       let data = {
         adress: arr.adress,
         tagname: "UI_BeltRun_L",

src/pages/Baggage/index/index.vue

@@ -1,210 +1,251 @@
 <template>
-    <div class="bag_box">
-        <div class="border_left_top border"></div>
-        <div class="border_top border"></div>
-        <div class="border_right_top border"></div>
-        <div class="border_left border"></div>
-        <div class="border_right border"></div>
-        <div class="border_left_bottom border"></div>
-        <div class="border_bottom border"></div>
-        <div class="border_right_bottom border"></div>
-        <el-button-group id="topButton2">
-        <el-button type="primary" class="active">行李查询</el-button>
-        </el-button-group>
-        <div class="bag_box_header">
-            <div class="bag_box_header_left">
-                <el-input v-model="input" placeholder="请输入id"></el-input>
-                <el-button class="custom_btn Colorbutton_blue">搜索</el-button>
-            </div>
-            <div class="bag_box_header_right">
-                <div class="downlodTable">导出</div>
-            </div>
-        </div>
-        <el-table :data="tableData" id="userTableData" style="width: 100%;color: #2DAFF5;;">
-			<el-table-column prop="nickname" align="center" label="行李ID" width="200px">
-			</el-table-column>
-			<el-table-column prop="work_order_count" align="center" label="接收时间">
-			</el-table-column>
-			<el-table-column prop="avg_execution_time" align="center" label="入口">
-			</el-table-column>
-			<el-table-column prop="avg_response_time" align="center" label="运输车辆">
-			</el-table-column>
-			<el-table-column prop="failure_count" align="center" label="运输单号">
-			</el-table-column>
-			<el-table-column prop="free_seconds" align="center" label="运输状态">
-			</el-table-column>
-			<el-table-column prop="battery_use_cycles" align="center" label="完成时间">
-			</el-table-column>
-            <el-table-column prop="battery_use_cycles" align="center" label="出口">
-			</el-table-column>
-		</el-table>
+  <div class="bag_box">
+    <div class="border_left_top border"></div>
+    <div class="border_top border"></div>
+    <div class="border_right_top border"></div>
+    <div class="border_left border"></div>
+    <div class="border_right border"></div>
+    <div class="border_left_bottom border"></div>
+    <div class="border_bottom border"></div>
+    <div class="border_right_bottom border"></div>
+    <el-button-group id="topButton2">
+      <el-button type="primary" class="active">行李查询</el-button>
+    </el-button-group>
+    <div class="bag_box_header">
+      <div class="bag_box_header_left">
+        <el-input v-model="input" placeholder="请输入id"></el-input>
+        <el-button class="custom_btn Colorbutton_blue">搜索</el-button>
+      </div>
+      <div class="bag_box_header_right">
+        <div class="downlodTable">导出</div>
+      </div>
     </div>
+    <el-table
+      :data="tableData"
+      id="userTableData"
+      style="width: 100%; color: #2daff5"
+    >
+      <el-table-column prop="id" align="center" label="行李ID" width="200px">
+      </el-table-column>
+      <el-table-column prop="reciveTime" align="center" label="接收时间">
+      </el-table-column>
+      <el-table-column prop="carID" align="center" label="入口">
+      </el-table-column>
+      <el-table-column prop="transport_State" align="center" label="运输车辆">
+      </el-table-column>
+      <el-table-column prop="order_ID" align="center" label="运输单号">
+      </el-table-column>
+      <el-table-column prop="tranportstat" align="center" label="运输状态">
+      </el-table-column>
+      <el-table-column prop="fini_Time" align="center" label="完成时间">
+      </el-table-column>
+      <el-table-column prop="sorti" align="center" label="出口">
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      background
+      layout="prev, pager, next, jumper"
+      :current-page.sync="currentPage3"
+      :total="totalPages"
+    >
+    </el-pagination>
+  </div>
 </template>
 <script>
+import { BaggageInquiry } from "@/api/request.js";
 export default {
-    data () {
-        return {
-            input: '',
-            tableData:[]
+  data() {
+    return {
+      input: "",
+      tableData: [],
+      currentPage3: 1,
+      totalPages: 0,
+    };
+  },
+  created() {
+    this.BaggageInquiryList();
+  },
+  methods: {
+    //获取行李查询列表
+    BaggageInquiryList() {
+      let params = {
+        page: 1,
+        PageSize: 10,
+      };
+      BaggageInquiry(params).then((res) => {
+        if (res.resultCode == 1) {
+          this.tableData = res.resultData;
+          this.totalPages = res.pageNumber * 10;
         }
-    }
-}
+      });
+    },
+  },
+};
 </script>
 <style lang="less">
-.bag_box{
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-    position: relative;
-    padding: 4.0625rem 1.5rem 4.0625rem 2.5rem;
-    box-sizing: border-box;
-    .border {
-        position: absolute;
-    }
+.bag_box {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  position: relative;
+  padding: 4.0625rem 1.5rem 4.0625rem 2.5rem;
+  box-sizing: border-box;
+  .border {
+    position: absolute;
+  }
+  .el-pagination {
+    margin-left: 40%;
+    position: absolute;
+    bottom: 0;
+  }
+  .border_left_top {
+    width: 11.625rem;
+    height: 5.875rem;
+    background: url(../../../assets/img/border_left_top.png);
+    left: 0;
+    top: 0;
+  }
 
-    .border_left_top {
-        width: 11.625rem;
-        height: 5.875rem;
-        background: url(../../../assets/img/border_left_top.png);
-        left: 0;
-        top: 0;
-    }
+  .border_top {
+    width: calc(100% - 11.625rem - 4.9375rem);
+    height: 1.5rem;
+    background: url(../../../assets/img/border_top.png) no-repeat center center;
+    background-size: 100% 100%;
+    left: 11.625rem;
+    top: 0;
+  }
 
-    .border_top {
-        width: calc(100% - 11.625rem - 4.9375rem);
-        height: 1.5rem;
-        background: url(../../../assets/img/border_top.png) no-repeat center center;
-        background-size: 100% 100%;
-        left: 11.625rem;
-        top: 0;
-    }
+  .border_right_top {
+    width: 4.9375rem;
+    height: 5.875rem;
+    background: url(../../../assets/img/border_right_top.png) no-repeat center
+      center;
+    background-size: 100% 100%;
+    right: 0.0625rem;
+    top: 0;
+  }
 
-    .border_right_top {
-        width: 4.9375rem;
-        height: 5.875rem;
-        background: url(../../../assets/img/border_right_top.png) no-repeat center center;
-        background-size: 100% 100%;
-        right: 0.0625rem;
-        top: 0;
-    }
+  .border_left {
+    width: 1.375rem;
+    height: calc(100% - 5.875rem - 7.625rem);
+    background: url(../../../assets/img/border_left.png) no-repeat center center;
+    background-size: 100% 100%;
+    left: 0;
+    top: 5.875rem;
+  }
 
-    .border_left {
-        width: 1.375rem;
-        height: calc(100% - 5.875rem - 7.625rem);
-        background: url(../../../assets/img/border_left.png) no-repeat center center;
-        background-size: 100% 100%;
-        left: 0;
-        top: 5.875rem;
-    }
+  .border_right {
+    width: 0.1875rem;
+    height: calc(100% - 5.875rem - 7.6875rem);
+    background: url(../../../assets/img/border_right.png) no-repeat center
+      center;
+    background-size: 100% 100%;
+    right: 0;
+    top: 5.875rem;
+  }
 
-    .border_right {
-        width: 0.1875rem;
-        height: calc(100% - 5.875rem - 7.6875rem);
-        background: url(../../../assets/img/border_right.png) no-repeat center center;
-        background-size: 100% 100%;
-        right: 0;
-        top: 5.875rem;
-    }
+  .border_left_bottom {
+    width: 11.625rem;
+    height: 7.625rem;
+    background: url(../../../assets/img/border_left_bottom.png) no-repeat center
+      center;
+    background-size: 100% 100%;
+    left: 0;
+    bottom: 0;
+  }
 
-    .border_left_bottom {
-        width: 11.625rem;
-        height: 7.625rem;
-        background: url(../../../assets/img/border_left_bottom.png) no-repeat center center;
-        background-size: 100% 100%;
-        left: 0;
-        bottom: 0;
-    }
+  .border_bottom {
+    width: calc(100% - 11.625rem - 4.9375rem);
+    height: 0.1875rem;
+    background: url(../../../assets/img/border_bottom.png) no-repeat center
+      center;
+    background-size: 100% 100%;
+    left: 11.625rem;
+    bottom: 0;
+  }
 
-    .border_bottom {
-        width: calc(100% - 11.625rem - 4.9375rem);
-        height: 0.1875rem;
-        background: url(../../../assets/img/border_bottom.png) no-repeat center center;
-        background-size: 100% 100%;
-        left: 11.625rem;
-        bottom: 0;
-    }
+  .border_right_bottom {
+    width: 4.9375rem;
+    height: 7.6875rem;
+    background: url(../../../assets/img/border_right_bottom.png) no-repeat
+      center center;
+    background-size: 100% 100%;
+    right: 0;
+    bottom: 0;
+  }
+  #topButton2 {
+    position: absolute;
+    top: 8px;
+    left: 8px;
+    z-index: 1;
 
-    .border_right_bottom {
-        width: 4.9375rem;
-        height: 7.6875rem;
-        background: url(../../../assets/img/border_right_bottom.png) no-repeat center center;
-        background-size: 100% 100%;
-        right: 0;
-        bottom: 0;
+    button:first-child {
+      border: none;
+      background: url(../../../assets/img/check1.png) no-repeat center center;
+      background-size: 100% 100%;
+      padding: 12px 80px 12px 40px;
+      position: absolute;
+      font-weight: bold;
+      font-style: italic;
+      color: #76899d;
     }
-    #topButton2 {
-        position: absolute;
-        top: 8px;
-        left: 8px;
-        z-index: 1;
 
-        button:first-child {
-            border: none;
-            background: url(../../../assets/img/check1.png) no-repeat center center;
-            background-size: 100% 100%;
-            padding: 12px 80px 12px 40px;
-            position: absolute;
-            font-weight: bold;
-            font-style: italic;
-            color: #76899D;
-        }
+    .active {
+      color: #fff !important;
+    }
+  }
 
-        .active {
-            color: #fff !important;
-        }
+  .el-table::before {
+    height: 0;
+  }
+  .bag_box_header {
+    width: 100%;
+    height: 38px;
+    margin-bottom: 10px;
+    .bag_box_header_left {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      .el-input {
+        width: 230px;
+        height: 100%;
+        margin-right: 24px;
+        box-shadow: inset 0px 1px 38px 0px rgb(0 162 253 / 40%) !important;
+        // border: 1px solid rgba(1, 148, 228, 0.34) !important;
+        // background: none !important;
+        // border-radius: 0 !important;
+        .el-input__inner {
+          width: 100%;
+          height: 100%;
+          border: 1px solid rgba(1, 148, 228, 0.34) !important;
+          background: none !important;
+          border-radius: 0 !important;
         }
-
-        .el-table::before {
-        height: 0;
+      }
     }
-    .bag_box_header{
-        width: 100%;
-        height: 38px;
-        margin-bottom: 10px;
-        .bag_box_header_left{
-            width: 50%;
-            height: 100%;
-            display: flex;
-            align-items: center;
-            .el-input{
-                width: 230px;
-                height: 100%;
-                margin-right: 24px;
-                box-shadow: inset 0px 1px 38px 0px rgb(0 162 253 / 40%) !important;
-                // border: 1px solid rgba(1, 148, 228, 0.34) !important;
-                // background: none !important;
-                // border-radius: 0 !important;
-                .el-input__inner{
-                    width: 100%;
-                    height: 100%;
-                    border: 1px solid rgba(1, 148, 228, 0.34) !important;
-                    background: none !important;
-                    border-radius: 0 !important;
-                }
-            }
-        }
-        .bag_box_header_right{
-            width: 50%;
-            height: 100%;
-            display: flex;
-            align-items: center;
-            justify-content: flex-end;
-            .downlodTable {
-                width: 50px;
-                height: 30px;
-                box-shadow: inset 0px 1px 38px 0px rgba(0, 162, 253, 0.4) !important;
-                border: 1px solid rgba(1, 148, 228, 0.34) !important;
-                background: none !important;
-                float: right;
-                position: absolute;
-                top: 66px;
-                right: 25px;
-                color: #ddd;
-                text-align: center;
-                line-height: 30px;
-                cursor: pointer;
-            }
-        }
+    .bag_box_header_right {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+      .downlodTable {
+        width: 50px;
+        height: 30px;
+        box-shadow: inset 0px 1px 38px 0px rgba(0, 162, 253, 0.4) !important;
+        border: 1px solid rgba(1, 148, 228, 0.34) !important;
+        background: none !important;
+        float: right;
+        position: absolute;
+        top: 66px;
+        right: 25px;
+        color: #ddd;
+        text-align: center;
+        line-height: 30px;
+        cursor: pointer;
+      }
     }
+  }
 }
 </style>

src/pages/Common/home.vue

@@ -33,10 +33,10 @@
                 placeholder=""
               >
                 <el-option
-                  v-for="item in tempalteMode"
-                  :key="item.template_name"
+                  v-for="item in tempalteoeder"
+                  :key="item.id"
                   :label="item.template_name"
-                  :value="item.template_name"
+                  :value="item.id"
                 >
                 </el-option>
               </el-select>
@@ -88,8 +88,8 @@
               </el-select>
               <el-select
                 class="maskright_select"
-                v-model="addOrdersB"
-                @change="addOrders(addOrdersB)"
+                v-model="addOrdersC"
+                @change="addOrders(addOrdersC)"
                 placeholder=""
               >
                 <el-option
@@ -454,6 +454,8 @@ import {
   getbuttonstat,
   alarmInformation,
   mapIp,
+  TemplateOrder,
+  deliveryUP,
 } from "@/api/request.js";
 import OrdersInfo from "../../components/OrdersInfo.vue";
 export default {
@@ -738,6 +740,7 @@ export default {
           width: "",
         },
       ],
+      tempalteoeder: [], //模板下单
       tableData: [],
       menuList: [
         {
@@ -829,6 +832,7 @@ export default {
   },
   mounted() {
     clearInterval(this.sj);
+    this.TemplateOrderList();
     let that = this;
     this.js = setInterval(() => {
       //实时更新数据
@@ -849,6 +853,16 @@ export default {
     }
   },
   methods: {
+    //模板下单列表获取
+    TemplateOrderList() {
+      TemplateOrder().then((res) => {
+        if (res.resultCode == 1) {
+          this.tempalteoeder = JSON.parse(
+            JSON.parse(JSON.stringify(res.resultData))
+          ).templates;
+        }
+      });
+    },
     //地图地址获取
     getmapurl() {
       mapIp().then((res) => {
@@ -1029,7 +1043,7 @@ export default {
       })
         .then(() => {
           let data = {
-            template_name: name,
+            templateid: name,
           };
           ordersTemplate(data).then((res) => {
             console.log(res);

static/serve.js

@@ -1,5 +1,5 @@
 window.g = {
-  url: `http://192.168.30.249:3420`,// 配置服务器地址
-  // url: `http://139.198.181.133:5000` ,// 配置服务器地址
+  // url: `http://192.168.30.249:3420`,// 配置服务器地址
+  url: `http://139.198.181.133:5000`,// 配置服务器地址
   mapURL: `http://192.168.30.250:3420/api` // 地图地址
 }