diff --git a/src/views/BasicData/TimeLine/index.vue b/src/views/BasicData/TimeLine/index.vue
new file mode 100644
index 0000000..d5745f5
--- /dev/null
+++ b/src/views/BasicData/TimeLine/index.vue
@@ -0,0 +1,80 @@
+<template>
+  <div class="app-container">
+    <el-card class="topCard">
+      <div class="block">
+        <el-timeline :reverse="reverse">
+          <el-timeline-item
+            v-for="(activity, index) in activities"
+            :key="index"
+            :timestamp="activity.timestamp">
+            {{ activity.content }}
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      reverse: true,
+      activities: [{
+        content: '活动按期开始',
+        timestamp: '2018-04-15'
+      }, {
+        content: '通过审核',
+        timestamp: '2018-04-13'
+      }, {
+        content: '创建成功',
+        timestamp: '2018-04-11'
+      }]
+    }
+  },
+  watch: {
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style scoped>
+  .topCard{
+    margin: 5px;
+    height: 840px;
+  }
+  .topDiv{
+    margin-bottom: 10px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  .text {
+    font-size: 14px;
+  }
+
+  .item {
+    padding: 18px 0;
+  }
+
+  .box-card {
+    position: absolute;
+    right: 6px;
+    top: 80px;
+    width: 300px;
+  }
+
+  /deep/.el-input.is-disabled .el-input__inner{
+    color: #606266!important;
+  }
+  /deep/.el-input.is-disabled .el-input__inner{
+    background-color: white!important;
+  }
+</style>
+
diff --git a/src/views/ProcessManagement/MonitoringData/EngineModel.vue b/src/views/ProcessManagement/MonitoringData/EngineModel.vue
new file mode 100644
index 0000000..5c8eebd
--- /dev/null
+++ b/src/views/ProcessManagement/MonitoringData/EngineModel.vue
@@ -0,0 +1,207 @@
+<!--操作者工号-->
+<template>
+  <div class="app-container">
+    <el-card class="topCard">
+      <div class="topDiv">
+        <span style="margin-left: 10px">时间：</span>
+        <el-date-picker
+          v-model="dateTime"
+          size="small"
+          type="daterange"
+          align="center"
+          style="width: 240px;"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <span style="margin-left: 10px">工位号：</span>
+        <el-select v-model="stationNumberValue" placeholder="请选择工位号" clearable filterable size="small" style="width: 200px; margin-left: 13px">
+          <el-option
+            v-for="item in stationNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+            size="mini"/>
+        </el-select>
+        <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageSize=30;pageCurrent=1;searchOrder()">查询</el-button>
+      </div>
+      <el-table
+        v-loading="loading"
+        ref="multipleTable"
+        :data="tableData"
+        :header-cell-style="{background:'#eef1f6',color:'#606266'}"
+        :cell-class-name="tableRowClassName"
+        element-loading-text="数据加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.2)"
+        class="main"
+        tooltip-effect="dark"
+        height="690px"
+        style="width: 100%;"
+        border
+        size="mini">
+        <el-table-column align="center" label="工位号">
+          <template slot-scope="scope">
+            {{ scope.row.工位号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="发动机型号">
+          <template slot-scope="scope">
+            {{ scope.row.发动机型号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作时间">
+          <template slot-scope="scope">
+            {{ scope.row.操作时间 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[15, 30, 40]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+  </div>
+</template>
+<!--<script src="../../../utils/setMethods.js"></script>-->
+<script>
+export default {
+  data() {
+    return {
+      number: [],
+      tableData: [], // 总数据数组
+      stationNumberValue: '', // 工位号
+      stationNumber: [], // 工位号
+      dateTime: '',
+      total: 0, // 总条数
+      pageList: 30, // 每页显示条数
+      pageSize: 30, // 每页显示条数
+      pageCurrent: 1, // 后台获取页
+      mid: [], // id
+      loading: false,
+      timer_1: null,
+      MIDGroup: []
+    }
+  },
+  created() {
+    var year, month, day, audiTime
+    this.date = new Date() // 修改数据date
+    year = new Date().getFullYear()
+    month = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
+    day = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
+    audiTime = year + '-' + month + '-' + day
+    console.log(audiTime, 'audiTime')
+    this.dateTime = [audiTime, audiTime]
+    this.getStationNumber()
+  },
+  mounted() {
+  },
+  methods: {
+    // 表格颜色变化
+    tableRowClassName({ row, rowIndex }) {
+      // console.log(row, rowIndex)
+      if (rowIndex % 2 === 0) {
+        return 'black'
+      } else {
+        return 'red'
+      }
+    },
+    // 工位号
+    getStationNumber() {
+      this.stationNumber = []
+      this.xData = []
+      var param = []
+      var Data = this.CreateData('11', 'MES_计划BOM_工位与名称_查询', param)
+      this.ExecDatabase(Data).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.stationNumber.push({
+            label: response.data[i].工位号,
+            value: response.data[i].工位号
+          })
+        }
+      })
+    },
+    // 查询订单
+    searchOrder() {
+      this.tableData = []
+      let stationNumberValue_check
+      // this.engineTypeValue ? engineTypeValue_check = 1 : (engineTypeValue_check = 0, this.engineTypeValue = '')
+      this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
+      // this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
+      var param = []
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      param[2] = ['工位号_ischeck', stationNumberValue_check]
+      param[3] = ['工位号', this.stationNumberValue]
+      param[4] = ['PageCurrent', this.pageCurrent]
+      param[5] = ['PageSize', this.pageSize]
+      param[6] = ['PageCount', '1111', 'int', '1']
+      param[7] = ['ItemCount', '1111', 'int', '1']
+      var Data = this.CreateData('11', '测量数据工位_监控系统_发动机型号查询_分页', param)
+      this.ExecDatabase(Data).then(response => {
+        console.log(response, 66)
+        if (response.data.result.length !== 0) {
+          this.tableData = response.data.result
+        }
+        this.total = parseInt(response.data.output[0].ItemCount)
+        this.loading = false
+      })
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchOrder()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchOrder()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .topCard{
+    margin: 5px;
+  }
+  .topDiv{
+    margin-bottom: 10px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  .text {
+    font-size: 14px;
+  }
+
+  .item {
+    padding: 18px 0;
+  }
+
+  .box-card {
+    position: absolute;
+    right: 6px;
+    top: 80px;
+    width: 300px;
+  }
+  .el-table .warning-row {
+    background: oldlace;
+  }
+
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+</style>
+
diff --git a/src/views/ProcessManagement/MonitoringData/EngineNumber.vue b/src/views/ProcessManagement/MonitoringData/EngineNumber.vue
new file mode 100644
index 0000000..fbb18fe
--- /dev/null
+++ b/src/views/ProcessManagement/MonitoringData/EngineNumber.vue
@@ -0,0 +1,207 @@
+<!--操作者工号-->
+<template>
+  <div class="app-container">
+    <el-card class="topCard">
+      <div class="topDiv">
+        <span style="margin-left: 10px">时间：</span>
+        <el-date-picker
+          v-model="dateTime"
+          size="small"
+          type="daterange"
+          align="center"
+          style="width: 240px;"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <span style="margin-left: 10px">工位号：</span>
+        <el-select v-model="stationNumberValue" placeholder="请选择工位号" clearable filterable size="small" style="width: 200px; margin-left: 13px">
+          <el-option
+            v-for="item in stationNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+            size="mini"/>
+        </el-select>
+        <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageSize=30;pageCurrent=1;searchOrder()">查询</el-button>
+      </div>
+      <el-table
+        v-loading="loading"
+        ref="multipleTable"
+        :data="tableData"
+        :header-cell-style="{background:'#eef1f6',color:'#606266'}"
+        :cell-class-name="tableRowClassName"
+        element-loading-text="数据加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.2)"
+        class="main"
+        tooltip-effect="dark"
+        height="690px"
+        style="width: 100%;"
+        border
+        size="mini">
+        <el-table-column align="center" label="工位号">
+          <template slot-scope="scope">
+            {{ scope.row.工位号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="发动机号">
+          <template slot-scope="scope">
+            {{ scope.row.发动机号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作时间">
+          <template slot-scope="scope">
+            {{ scope.row.操作时间 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[15, 30, 40]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+  </div>
+</template>
+<!--<script src="../../../utils/setMethods.js"></script>-->
+<script>
+export default {
+  data() {
+    return {
+      number: [],
+      tableData: [], // 总数据数组
+      stationNumberValue: '', // 工位号
+      stationNumber: [], // 工位号
+      dateTime: '',
+      total: 0, // 总条数
+      pageList: 30, // 每页显示条数
+      pageSize: 30, // 每页显示条数
+      pageCurrent: 1, // 后台获取页
+      mid: [], // id
+      loading: false,
+      timer_1: null,
+      MIDGroup: []
+    }
+  },
+  created() {
+    var year, month, day, audiTime
+    this.date = new Date() // 修改数据date
+    year = new Date().getFullYear()
+    month = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
+    day = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
+    audiTime = year + '-' + month + '-' + day
+    console.log(audiTime, 'audiTime')
+    this.dateTime = [audiTime, audiTime]
+    this.getStationNumber()
+  },
+  mounted() {
+  },
+  methods: {
+    // 表格颜色变化
+    tableRowClassName({ row, rowIndex }) {
+      // console.log(row, rowIndex)
+      if (rowIndex % 2 === 0) {
+        return 'black'
+      } else {
+        return 'red'
+      }
+    },
+    // 工位号
+    getStationNumber() {
+      this.stationNumber = []
+      this.xData = []
+      var param = []
+      var Data = this.CreateData('11', 'MES_计划BOM_工位与名称_查询', param)
+      this.ExecDatabase(Data).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.stationNumber.push({
+            label: response.data[i].工位号,
+            value: response.data[i].工位号
+          })
+        }
+      })
+    },
+    // 查询订单
+    searchOrder() {
+      this.tableData = []
+      let stationNumberValue_check
+      // this.engineTypeValue ? engineTypeValue_check = 1 : (engineTypeValue_check = 0, this.engineTypeValue = '')
+      this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
+      // this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
+      var param = []
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      param[2] = ['工位号_ischeck', stationNumberValue_check]
+      param[3] = ['工位号', this.stationNumberValue]
+      param[4] = ['PageCurrent', this.pageCurrent]
+      param[5] = ['PageSize', this.pageSize]
+      param[6] = ['PageCount', '1111', 'int', '1']
+      param[7] = ['ItemCount', '1111', 'int', '1']
+      var Data = this.CreateData('11', '测量数据工位_监控系统_发动机号查询_分页', param)
+      this.ExecDatabase(Data).then(response => {
+        console.log(response, 66)
+        if (response.data.result.length !== 0) {
+          this.tableData = response.data.result
+        }
+        this.total = parseInt(response.data.output[0].ItemCount)
+        this.loading = false
+      })
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchOrder()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchOrder()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .topCard{
+    margin: 5px;
+  }
+  .topDiv{
+    margin-bottom: 10px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  .text {
+    font-size: 14px;
+  }
+
+  .item {
+    padding: 18px 0;
+  }
+
+  .box-card {
+    position: absolute;
+    right: 6px;
+    top: 80px;
+    width: 300px;
+  }
+  .el-table .warning-row {
+    background: oldlace;
+  }
+
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+</style>
+
diff --git a/src/views/ProcessManagement/MonitoringData/LineHeadStationInformation.vue b/src/views/ProcessManagement/MonitoringData/LineHeadStationInformation.vue
new file mode 100644
index 0000000..f445128
--- /dev/null
+++ b/src/views/ProcessManagement/MonitoringData/LineHeadStationInformation.vue
@@ -0,0 +1,231 @@
+<template>
+  <div class="app-container">
+    <el-card class="topCard">
+      <div class="topDiv">
+        <span style="margin-left: 10px">时间：</span>
+        <el-date-picker
+          v-model="dateTime"
+          size="small"
+          type="daterange"
+          align="center"
+          style="width: 240px;"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <span style="margin-left: 10px">工位号：</span>
+        <el-select v-model="stationNumberValue" placeholder="请选择工位号" clearable filterable size="small" style="width: 200px; margin-left: 13px">
+          <el-option
+            v-for="item in stationNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+            size="mini"/>
+        </el-select>
+        <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageSize=30;pageCurrent=1;searchOrder()">查询</el-button>
+      </div>
+      <el-table
+        v-loading="loading"
+        ref="multipleTable"
+        :data="tableData"
+        :header-cell-style="{background:'#eef1f6',color:'#606266'}"
+        :cell-class-name="tableRowClassName"
+        element-loading-text="数据加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.2)"
+        class="main"
+        tooltip-effect="dark"
+        height="690px"
+        style="width: 100%;"
+        border
+        size="mini">
+        <el-table-column align="center" label="工位号">
+          <template slot-scope="scope">
+            {{ scope.row.工位号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="订单号">
+          <template slot-scope="scope">
+            {{ scope.row.订单号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="发动机号">
+          <template slot-scope="scope">
+            {{ scope.row.发动机号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="基本机型">
+          <template slot-scope="scope">
+            {{ scope.row.基本机型 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="发动机型号">
+          <template slot-scope="scope">
+            {{ scope.row.发动机型号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="托盘号">
+          <template slot-scope="scope">
+            {{ scope.row.托盘号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="离开时间">
+          <template slot-scope="scope">
+            {{ scope.row.离开时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作时间">
+          <template slot-scope="scope">
+            {{ scope.row.操作时间 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[15, 30, 40]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+  </div>
+</template>
+<!--<script src="../../../utils/setMethods.js"></script>-->
+<script>
+export default {
+  data() {
+    return {
+      number: [],
+      tableData: [], // 总数据数组
+      stationNumberValue: '', // 工位号
+      stationNumber: [], // 工位号
+      dateTime: '',
+      total: 0, // 总条数
+      pageList: 30, // 每页显示条数
+      pageSize: 30, // 每页显示条数
+      pageCurrent: 1, // 后台获取页
+      mid: [], // id
+      loading: false,
+      timer_1: null,
+      MIDGroup: []
+    }
+  },
+  created() {
+    var year, month, day, audiTime
+    this.date = new Date() // 修改数据date
+    year = new Date().getFullYear()
+    month = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
+    day = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
+    audiTime = year + '-' + month + '-' + day
+    console.log(audiTime, 'audiTime')
+    this.dateTime = [audiTime, audiTime]
+    this.getStationNumber()
+  },
+  mounted() {
+  },
+  methods: {
+    // 表格颜色变化
+    tableRowClassName({ row, rowIndex }) {
+      // console.log(row, rowIndex)
+      if (rowIndex % 2 === 0) {
+        return 'black'
+      } else {
+        return 'red'
+      }
+    },
+    // 工位号
+    getStationNumber() {
+      this.stationNumber = []
+      this.xData = []
+      var param = []
+      var Data = this.CreateData('11', 'MES_计划BOM_工位与名称_查询', param)
+      this.ExecDatabase(Data).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.stationNumber.push({
+            label: response.data[i].工位号,
+            value: response.data[i].工位号
+          })
+        }
+      })
+    },
+    // 查询订单
+    searchOrder() {
+      this.tableData = []
+      let stationNumberValue_check
+      // this.engineTypeValue ? engineTypeValue_check = 1 : (engineTypeValue_check = 0, this.engineTypeValue = '')
+      this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
+      // this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
+      var param = []
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      param[2] = ['工位号_ischeck', stationNumberValue_check]
+      param[3] = ['工位号', this.stationNumberValue]
+      param[4] = ['PageCurrent', this.pageCurrent]
+      param[5] = ['PageSize', this.pageSize]
+      param[6] = ['PageCount', '1111', 'int', '1']
+      param[7] = ['ItemCount', '1111', 'int', '1']
+      var Data = this.CreateData('11', '电子看板_发动机号_线首工位查询_分页', param)
+      this.ExecDatabase(Data).then(response => {
+        console.log(response, 66)
+        if (response.data.result.length !== 0) {
+          this.tableData = response.data.result
+        }
+        this.total = parseInt(response.data.output[0].ItemCount)
+        this.loading = false
+      })
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchOrder()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchOrder()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .topCard{
+    margin: 5px;
+  }
+  .topDiv{
+    margin-bottom: 10px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  .text {
+    font-size: 14px;
+  }
+
+  .item {
+    padding: 18px 0;
+  }
+
+  .box-card {
+    position: absolute;
+    right: 6px;
+    top: 80px;
+    width: 300px;
+  }
+  .el-table .warning-row {
+    background: oldlace;
+  }
+
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+</style>
+
diff --git a/src/views/ProcessManagement/MonitoringData/OfflineStation.vue b/src/views/ProcessManagement/MonitoringData/OfflineStation.vue
new file mode 100644
index 0000000..de91041
--- /dev/null
+++ b/src/views/ProcessManagement/MonitoringData/OfflineStation.vue
@@ -0,0 +1,221 @@
+<template>
+  <div class="app-container">
+    <el-card class="topCard">
+      <div class="topDiv">
+        <span style="margin-left: 10px">时间：</span>
+        <el-date-picker
+          v-model="dateTime"
+          size="small"
+          type="daterange"
+          align="center"
+          style="width: 240px;"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <span style="margin-left: 10px">工位号：</span>
+        <el-select v-model="stationNumberValue" placeholder="请选择工位号" clearable filterable size="small" style="width: 200px; margin-left: 13px">
+          <el-option
+            v-for="item in stationNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+            size="mini"/>
+        </el-select>
+        <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageSize=30;pageCurrent=1;searchOrder()">查询</el-button>
+      </div>
+      <el-table
+        v-loading="loading"
+        ref="multipleTable"
+        :data="tableData"
+        :header-cell-style="{background:'#eef1f6',color:'#606266'}"
+        :cell-class-name="tableRowClassName"
+        element-loading-text="数据加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.2)"
+        class="main"
+        tooltip-effect="dark"
+        height="690px"
+        style="width: 100%;"
+        border
+        size="mini">
+        <el-table-column align="center" label="工位号">
+          <template slot-scope="scope">
+            {{ scope.row.工位号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="订单号">
+          <template slot-scope="scope">
+            {{ scope.row.订单号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="发动机号">
+          <template slot-scope="scope">
+            {{ scope.row.发动机号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="机型">
+          <template slot-scope="scope">
+            {{ scope.row.机型 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="托盘号">
+          <template slot-scope="scope">
+            {{ scope.row.托盘编号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作时间">
+          <template slot-scope="scope">
+            {{ scope.row.操作时间 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[15, 30, 40]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+  </div>
+</template>
+<!--<script src="../../../utils/setMethods.js"></script>-->
+<script>
+export default {
+  data() {
+    return {
+      number: [],
+      tableData: [], // 总数据数组
+      stationNumberValue: '', // 工位号
+      stationNumber: [], // 工位号
+      dateTime: '',
+      total: 0, // 总条数
+      pageList: 30, // 每页显示条数
+      pageSize: 30, // 每页显示条数
+      pageCurrent: 1, // 后台获取页
+      mid: [], // id
+      loading: false,
+      timer_1: null,
+      MIDGroup: []
+    }
+  },
+  created() {
+    var year, month, day, audiTime
+    this.date = new Date() // 修改数据date
+    year = new Date().getFullYear()
+    month = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
+    day = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
+    audiTime = year + '-' + month + '-' + day
+    console.log(audiTime, 'audiTime')
+    this.dateTime = [audiTime, audiTime]
+    this.getStationNumber()
+  },
+  mounted() {
+  },
+  methods: {
+    // 表格颜色变化
+    tableRowClassName({ row, rowIndex }) {
+      // console.log(row, rowIndex)
+      if (rowIndex % 2 === 0) {
+        return 'black'
+      } else {
+        return 'red'
+      }
+    },
+    // 工位号
+    getStationNumber() {
+      this.stationNumber = []
+      this.xData = []
+      var param = []
+      var Data = this.CreateData('11', 'MES_计划BOM_工位与名称_查询', param)
+      this.ExecDatabase(Data).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.stationNumber.push({
+            label: response.data[i].工位号,
+            value: response.data[i].工位号
+          })
+        }
+      })
+    },
+    // 查询订单
+    searchOrder() {
+      this.tableData = []
+      let stationNumberValue_check
+      // this.engineTypeValue ? engineTypeValue_check = 1 : (engineTypeValue_check = 0, this.engineTypeValue = '')
+      this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
+      // this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
+      var param = []
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      param[2] = ['工位号_ischeck', stationNumberValue_check]
+      param[3] = ['工位号', this.stationNumberValue]
+      param[4] = ['PageCurrent', this.pageCurrent]
+      param[5] = ['PageSize', this.pageSize]
+      param[6] = ['PageCount', '1111', 'int', '1']
+      param[7] = ['ItemCount', '1111', 'int', '1']
+      var Data = this.CreateData('11', '测量数据发动机在线状态_下线工位查询_分页', param)
+      this.ExecDatabase(Data).then(response => {
+        console.log(response, 66)
+        if (response.data.result.length !== 0) {
+          this.tableData = response.data.result
+        }
+        this.total = parseInt(response.data.output[0].ItemCount)
+        this.loading = false
+      })
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchOrder()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchOrder()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .topCard{
+    margin: 5px;
+  }
+  .topDiv{
+    margin-bottom: 10px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  .text {
+    font-size: 14px;
+  }
+
+  .item {
+    padding: 18px 0;
+  }
+
+  .box-card {
+    position: absolute;
+    right: 6px;
+    top: 80px;
+    width: 300px;
+  }
+  .el-table .warning-row {
+    background: oldlace;
+  }
+
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+</style>
+
diff --git a/src/views/ProcessManagement/MonitoringData/Operator.vue b/src/views/ProcessManagement/MonitoringData/Operator.vue
new file mode 100644
index 0000000..00aa747
--- /dev/null
+++ b/src/views/ProcessManagement/MonitoringData/Operator.vue
@@ -0,0 +1,222 @@
+<!--操作者工号-->
+<template>
+  <div class="app-container">
+    <el-card class="topCard">
+      <div class="topDiv">
+        <span style="margin-left: 10px">时间：</span>
+        <el-date-picker
+          v-model="dateTime"
+          size="small"
+          type="daterange"
+          align="center"
+          style="width: 240px;"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <span style="margin-left: 10px">工位号：</span>
+        <el-select v-model="stationNumberValue" placeholder="请选择工位号" clearable filterable size="small" style="width: 200px; margin-left: 13px">
+          <el-option
+            v-for="item in stationNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+            size="mini"/>
+        </el-select>
+        <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageSize=30;pageCurrent=1;searchOrder()">查询</el-button>
+      </div>
+      <el-table
+        v-loading="loading"
+        ref="multipleTable"
+        :data="tableData"
+        :header-cell-style="{background:'#eef1f6',color:'#606266'}"
+        :cell-class-name="tableRowClassName"
+        element-loading-text="数据加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.2)"
+        class="main"
+        tooltip-effect="dark"
+        height="690px"
+        style="width: 100%;"
+        border
+        size="mini">
+        <el-table-column align="center" label="工位号">
+          <template slot-scope="scope">
+            {{ scope.row.工位号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作者工号">
+          <template slot-scope="scope">
+            {{ scope.row.操作者工号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作时间">
+          <template slot-scope="scope">
+            {{ scope.row.操作时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="员工姓名">
+          <template slot-scope="scope">
+            {{ scope.row.员工姓名 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="报工时间">
+          <template slot-scope="scope">
+            {{ scope.row.报工时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="班次代码">
+          <template slot-scope="scope">
+            {{ scope.row.班次代码 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[15, 30, 40]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+  </div>
+</template>
+<!--<script src="../../../utils/setMethods.js"></script>-->
+<script>
+export default {
+  data() {
+    return {
+      number: [],
+      tableData: [], // 总数据数组
+      stationNumberValue: '', // 工位号
+      stationNumber: [], // 工位号
+      dateTime: '',
+      total: 0, // 总条数
+      pageList: 30, // 每页显示条数
+      pageSize: 30, // 每页显示条数
+      pageCurrent: 1, // 后台获取页
+      mid: [], // id
+      loading: false,
+      timer_1: null,
+      MIDGroup: []
+    }
+  },
+  created() {
+    var year, month, day, audiTime
+    this.date = new Date() // 修改数据date
+    year = new Date().getFullYear()
+    month = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
+    day = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
+    audiTime = year + '-' + month + '-' + day
+    console.log(audiTime, 'audiTime')
+    this.dateTime = [audiTime, audiTime]
+    this.getStationNumber()
+  },
+  mounted() {
+  },
+  methods: {
+    // 表格颜色变化
+    tableRowClassName({ row, rowIndex }) {
+      // console.log(row, rowIndex)
+      if (rowIndex % 2 === 0) {
+        return 'black'
+      } else {
+        return 'red'
+      }
+    },
+    // 工位号
+    getStationNumber() {
+      this.stationNumber = []
+      this.xData = []
+      var param = []
+      var Data = this.CreateData('11', 'MES_计划BOM_工位与名称_查询', param)
+      this.ExecDatabase(Data).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.stationNumber.push({
+            label: response.data[i].工位号,
+            value: response.data[i].工位号
+          })
+        }
+      })
+    },
+    // 查询订单
+    searchOrder() {
+      this.tableData = []
+      let stationNumberValue_check
+      // this.engineTypeValue ? engineTypeValue_check = 1 : (engineTypeValue_check = 0, this.engineTypeValue = '')
+      this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
+      // this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
+      var param = []
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      param[2] = ['工位号_ischeck', stationNumberValue_check]
+      param[3] = ['工位号', this.stationNumberValue]
+      param[4] = ['PageCurrent', this.pageCurrent]
+      param[5] = ['PageSize', this.pageSize]
+      param[6] = ['PageCount', '1111', 'int', '1']
+      param[7] = ['ItemCount', '1111', 'int', '1']
+      var Data = this.CreateData('11', '测量数据工位_监控系统_操作者工号查询_分页', param)
+      this.ExecDatabase(Data).then(response => {
+        console.log(response, 66)
+        if (response.data.result.length !== 0) {
+          this.tableData = response.data.result
+        }
+        this.total = parseInt(response.data.output[0].ItemCount)
+        this.loading = false
+      })
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchOrder()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchOrder()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .topCard{
+    margin: 5px;
+  }
+  .topDiv{
+    margin-bottom: 10px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  .text {
+    font-size: 14px;
+  }
+
+  .item {
+    padding: 18px 0;
+  }
+
+  .box-card {
+    position: absolute;
+    right: 6px;
+    top: 80px;
+    width: 300px;
+  }
+  .el-table .warning-row {
+    background: oldlace;
+  }
+
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+</style>
+
diff --git a/src/views/ProcessManagement/MonitoringData/OrderNumber.vue b/src/views/ProcessManagement/MonitoringData/OrderNumber.vue
new file mode 100644
index 0000000..62c2759
--- /dev/null
+++ b/src/views/ProcessManagement/MonitoringData/OrderNumber.vue
@@ -0,0 +1,207 @@
+<!--操作者工号-->
+<template>
+  <div class="app-container">
+    <el-card class="topCard">
+      <div class="topDiv">
+        <span style="margin-left: 10px">时间：</span>
+        <el-date-picker
+          v-model="dateTime"
+          size="small"
+          type="daterange"
+          align="center"
+          style="width: 240px;"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <span style="margin-left: 10px">工位号：</span>
+        <el-select v-model="stationNumberValue" placeholder="请选择工位号" clearable filterable size="small" style="width: 200px; margin-left: 13px">
+          <el-option
+            v-for="item in stationNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+            size="mini"/>
+        </el-select>
+        <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageSize=30;pageCurrent=1;searchOrder()">查询</el-button>
+      </div>
+      <el-table
+        v-loading="loading"
+        ref="multipleTable"
+        :data="tableData"
+        :header-cell-style="{background:'#eef1f6',color:'#606266'}"
+        :cell-class-name="tableRowClassName"
+        element-loading-text="数据加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.2)"
+        class="main"
+        tooltip-effect="dark"
+        height="690px"
+        style="width: 100%;"
+        border
+        size="mini">
+        <el-table-column align="center" label="工位号">
+          <template slot-scope="scope">
+            {{ scope.row.工位号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="订单号">
+          <template slot-scope="scope">
+            {{ scope.row.订单号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作时间">
+          <template slot-scope="scope">
+            {{ scope.row.操作时间 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[15, 30, 40]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+  </div>
+</template>
+<!--<script src="../../../utils/setMethods.js"></script>-->
+<script>
+export default {
+  data() {
+    return {
+      number: [],
+      tableData: [], // 总数据数组
+      stationNumberValue: '', // 工位号
+      stationNumber: [], // 工位号
+      dateTime: '',
+      total: 0, // 总条数
+      pageList: 30, // 每页显示条数
+      pageSize: 30, // 每页显示条数
+      pageCurrent: 1, // 后台获取页
+      mid: [], // id
+      loading: false,
+      timer_1: null,
+      MIDGroup: []
+    }
+  },
+  created() {
+    var year, month, day, audiTime
+    this.date = new Date() // 修改数据date
+    year = new Date().getFullYear()
+    month = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
+    day = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
+    audiTime = year + '-' + month + '-' + day
+    console.log(audiTime, 'audiTime')
+    this.dateTime = [audiTime, audiTime]
+    this.getStationNumber()
+  },
+  mounted() {
+  },
+  methods: {
+    // 表格颜色变化
+    tableRowClassName({ row, rowIndex }) {
+      // console.log(row, rowIndex)
+      if (rowIndex % 2 === 0) {
+        return 'black'
+      } else {
+        return 'red'
+      }
+    },
+    // 工位号
+    getStationNumber() {
+      this.stationNumber = []
+      this.xData = []
+      var param = []
+      var Data = this.CreateData('11', 'MES_计划BOM_工位与名称_查询', param)
+      this.ExecDatabase(Data).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.stationNumber.push({
+            label: response.data[i].工位号,
+            value: response.data[i].工位号
+          })
+        }
+      })
+    },
+    // 查询订单
+    searchOrder() {
+      this.tableData = []
+      let stationNumberValue_check
+      // this.engineTypeValue ? engineTypeValue_check = 1 : (engineTypeValue_check = 0, this.engineTypeValue = '')
+      this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
+      // this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
+      var param = []
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      param[2] = ['工位号_ischeck', stationNumberValue_check]
+      param[3] = ['工位号', this.stationNumberValue]
+      param[4] = ['PageCurrent', this.pageCurrent]
+      param[5] = ['PageSize', this.pageSize]
+      param[6] = ['PageCount', '1111', 'int', '1']
+      param[7] = ['ItemCount', '1111', 'int', '1']
+      var Data = this.CreateData('11', '测量数据工位_监控系统_订单号查询_分页', param)
+      this.ExecDatabase(Data).then(response => {
+        console.log(response, 66)
+        if (response.data.result.length !== 0) {
+          this.tableData = response.data.result
+        }
+        this.total = parseInt(response.data.output[0].ItemCount)
+        this.loading = false
+      })
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchOrder()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchOrder()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .topCard{
+    margin: 5px;
+  }
+  .topDiv{
+    margin-bottom: 10px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  .text {
+    font-size: 14px;
+  }
+
+  .item {
+    padding: 18px 0;
+  }
+
+  .box-card {
+    position: absolute;
+    right: 6px;
+    top: 80px;
+    width: 300px;
+  }
+  .el-table .warning-row {
+    background: oldlace;
+  }
+
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+</style>
+
diff --git a/src/views/ProcessManagement/MonitoringData/PalletNo.vue b/src/views/ProcessManagement/MonitoringData/PalletNo.vue
new file mode 100644
index 0000000..9a57468
--- /dev/null
+++ b/src/views/ProcessManagement/MonitoringData/PalletNo.vue
@@ -0,0 +1,207 @@
+<!--操作者工号-->
+<template>
+  <div class="app-container">
+    <el-card class="topCard">
+      <div class="topDiv">
+        <span style="margin-left: 10px">时间：</span>
+        <el-date-picker
+          v-model="dateTime"
+          size="small"
+          type="daterange"
+          align="center"
+          style="width: 240px;"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <span style="margin-left: 10px">工位号：</span>
+        <el-select v-model="stationNumberValue" placeholder="请选择工位号" clearable filterable size="small" style="width: 200px; margin-left: 13px">
+          <el-option
+            v-for="item in stationNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+            size="mini"/>
+        </el-select>
+        <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageSize=30;pageCurrent=1;searchOrder()">查询</el-button>
+      </div>
+      <el-table
+        v-loading="loading"
+        ref="multipleTable"
+        :data="tableData"
+        :header-cell-style="{background:'#eef1f6',color:'#606266'}"
+        :cell-class-name="tableRowClassName"
+        element-loading-text="数据加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.2)"
+        class="main"
+        tooltip-effect="dark"
+        height="690px"
+        style="width: 100%;"
+        border
+        size="mini">
+        <el-table-column align="center" label="工位号">
+          <template slot-scope="scope">
+            {{ scope.row.工位号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="托盘号">
+          <template slot-scope="scope">
+            {{ scope.row.托盘号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作时间">
+          <template slot-scope="scope">
+            {{ scope.row.操作时间 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[15, 30, 40]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+  </div>
+</template>
+<!--<script src="../../../utils/setMethods.js"></script>-->
+<script>
+export default {
+  data() {
+    return {
+      number: [],
+      tableData: [], // 总数据数组
+      stationNumberValue: '', // 工位号
+      stationNumber: [], // 工位号
+      dateTime: '',
+      total: 0, // 总条数
+      pageList: 30, // 每页显示条数
+      pageSize: 30, // 每页显示条数
+      pageCurrent: 1, // 后台获取页
+      mid: [], // id
+      loading: false,
+      timer_1: null,
+      MIDGroup: []
+    }
+  },
+  created() {
+    var year, month, day, audiTime
+    this.date = new Date() // 修改数据date
+    year = new Date().getFullYear()
+    month = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
+    day = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
+    audiTime = year + '-' + month + '-' + day
+    console.log(audiTime, 'audiTime')
+    this.dateTime = [audiTime, audiTime]
+    this.getStationNumber()
+  },
+  mounted() {
+  },
+  methods: {
+    // 表格颜色变化
+    tableRowClassName({ row, rowIndex }) {
+      // console.log(row, rowIndex)
+      if (rowIndex % 2 === 0) {
+        return 'black'
+      } else {
+        return 'red'
+      }
+    },
+    // 工位号
+    getStationNumber() {
+      this.stationNumber = []
+      this.xData = []
+      var param = []
+      var Data = this.CreateData('11', 'MES_计划BOM_工位与名称_查询', param)
+      this.ExecDatabase(Data).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.stationNumber.push({
+            label: response.data[i].工位号,
+            value: response.data[i].工位号
+          })
+        }
+      })
+    },
+    // 查询订单
+    searchOrder() {
+      this.tableData = []
+      let stationNumberValue_check
+      // this.engineTypeValue ? engineTypeValue_check = 1 : (engineTypeValue_check = 0, this.engineTypeValue = '')
+      this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
+      // this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
+      var param = []
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      param[2] = ['工位号_ischeck', stationNumberValue_check]
+      param[3] = ['工位号', this.stationNumberValue]
+      param[4] = ['PageCurrent', this.pageCurrent]
+      param[5] = ['PageSize', this.pageSize]
+      param[6] = ['PageCount', '1111', 'int', '1']
+      param[7] = ['ItemCount', '1111', 'int', '1']
+      var Data = this.CreateData('11', '测量数据工位_监控系统_托盘号查询_分页', param)
+      this.ExecDatabase(Data).then(response => {
+        console.log(response, 66)
+        if (response.data.result.length !== 0) {
+          this.tableData = response.data.result
+        }
+        this.total = parseInt(response.data.output[0].ItemCount)
+        this.loading = false
+      })
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchOrder()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchOrder()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .topCard{
+    margin: 5px;
+  }
+  .topDiv{
+    margin-bottom: 10px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  .text {
+    font-size: 14px;
+  }
+
+  .item {
+    padding: 18px 0;
+  }
+
+  .box-card {
+    position: absolute;
+    right: 6px;
+    top: 80px;
+    width: 300px;
+  }
+  .el-table .warning-row {
+    background: oldlace;
+  }
+
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+</style>
+
diff --git a/src/views/ProcessManagement/MonitoringData/StationStatus.vue b/src/views/ProcessManagement/MonitoringData/StationStatus.vue
new file mode 100644
index 0000000..976006c
--- /dev/null
+++ b/src/views/ProcessManagement/MonitoringData/StationStatus.vue
@@ -0,0 +1,222 @@
+<!--操作者工号-->
+<template>
+  <div class="app-container">
+    <el-card class="topCard">
+      <div class="topDiv">
+        <span style="margin-left: 10px">时间：</span>
+        <el-date-picker
+          v-model="dateTime"
+          size="small"
+          type="daterange"
+          align="center"
+          style="width: 240px;"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <span style="margin-left: 10px">工位号：</span>
+        <el-select v-model="stationNumberValue" placeholder="请选择工位号" clearable filterable size="small" style="width: 200px; margin-left: 13px">
+          <el-option
+            v-for="item in stationNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+            size="mini"/>
+        </el-select>
+        <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageSize=30;pageCurrent=1;searchOrder()">查询</el-button>
+      </div>
+      <el-table
+        v-loading="loading"
+        ref="multipleTable"
+        :data="tableData"
+        :header-cell-style="{background:'#eef1f6',color:'#606266'}"
+        :cell-class-name="tableRowClassName"
+        element-loading-text="数据加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.2)"
+        class="main"
+        tooltip-effect="dark"
+        height="690px"
+        style="width: 100%;"
+        border
+        size="mini">
+        <el-table-column align="center" label="工位号">
+          <template slot-scope="scope">
+            {{ scope.row.工位号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="正产上线">
+          <template slot-scope="scope">
+            {{ scope.row.正产上线 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="返修上线">
+          <template slot-scope="scope">
+            {{ scope.row.返修上线 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="在线返修">
+          <template slot-scope="scope">
+            {{ scope.row.在线返修 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="离线返修">
+          <template slot-scope="scope">
+            {{ scope.row.离线返修 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作时间">
+          <template slot-scope="scope">
+            {{ scope.row.操作时间 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[15, 30, 40]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+  </div>
+</template>
+<!--<script src="../../../utils/setMethods.js"></script>-->
+<script>
+export default {
+  data() {
+    return {
+      number: [],
+      tableData: [], // 总数据数组
+      stationNumberValue: '', // 工位号
+      stationNumber: [], // 工位号
+      dateTime: '',
+      total: 0, // 总条数
+      pageList: 30, // 每页显示条数
+      pageSize: 30, // 每页显示条数
+      pageCurrent: 1, // 后台获取页
+      mid: [], // id
+      loading: false,
+      timer_1: null,
+      MIDGroup: []
+    }
+  },
+  created() {
+    var year, month, day, audiTime
+    this.date = new Date() // 修改数据date
+    year = new Date().getFullYear()
+    month = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
+    day = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
+    audiTime = year + '-' + month + '-' + day
+    console.log(audiTime, 'audiTime')
+    this.dateTime = [audiTime, audiTime]
+    this.getStationNumber()
+  },
+  mounted() {
+  },
+  methods: {
+    // 表格颜色变化
+    tableRowClassName({ row, rowIndex }) {
+      // console.log(row, rowIndex)
+      if (rowIndex % 2 === 0) {
+        return 'black'
+      } else {
+        return 'red'
+      }
+    },
+    // 工位号
+    getStationNumber() {
+      this.stationNumber = []
+      this.xData = []
+      var param = []
+      var Data = this.CreateData('11', 'MES_计划BOM_工位与名称_查询', param)
+      this.ExecDatabase(Data).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.stationNumber.push({
+            label: response.data[i].工位号,
+            value: response.data[i].工位号
+          })
+        }
+      })
+    },
+    // 查询订单
+    searchOrder() {
+      this.tableData = []
+      let stationNumberValue_check
+      // this.engineTypeValue ? engineTypeValue_check = 1 : (engineTypeValue_check = 0, this.engineTypeValue = '')
+      this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
+      // this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
+      var param = []
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      param[2] = ['工位号_ischeck', stationNumberValue_check]
+      param[3] = ['工位号', this.stationNumberValue]
+      param[4] = ['PageCurrent', this.pageCurrent]
+      param[5] = ['PageSize', this.pageSize]
+      param[6] = ['PageCount', '1111', 'int', '1']
+      param[7] = ['ItemCount', '1111', 'int', '1']
+      var Data = this.CreateData('11', '测量数据工位_监控系统_工位状态查询_分页', param)
+      this.ExecDatabase(Data).then(response => {
+        console.log(response, 66)
+        if (response.data.result.length !== 0) {
+          this.tableData = response.data.result
+        }
+        this.total = parseInt(response.data.output[0].ItemCount)
+        this.loading = false
+      })
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchOrder()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchOrder()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .topCard{
+    margin: 5px;
+  }
+  .topDiv{
+    margin-bottom: 10px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  .text {
+    font-size: 14px;
+  }
+
+  .item {
+    padding: 18px 0;
+  }
+
+  .box-card {
+    position: absolute;
+    right: 6px;
+    top: 80px;
+    width: 300px;
+  }
+  .el-table .warning-row {
+    background: oldlace;
+  }
+
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+</style>
+
diff --git a/src/views/ProcessManagement/MonitoringData/TransferModel.vue b/src/views/ProcessManagement/MonitoringData/TransferModel.vue
new file mode 100644
index 0000000..e04a94e
--- /dev/null
+++ b/src/views/ProcessManagement/MonitoringData/TransferModel.vue
@@ -0,0 +1,207 @@
+<!--操作者工号-->
+<template>
+  <div class="app-container">
+    <el-card class="topCard">
+      <div class="topDiv">
+        <span style="margin-left: 10px">时间：</span>
+        <el-date-picker
+          v-model="dateTime"
+          size="small"
+          type="daterange"
+          align="center"
+          style="width: 240px;"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <span style="margin-left: 10px">工位号：</span>
+        <el-select v-model="stationNumberValue" placeholder="请选择工位号" clearable filterable size="small" style="width: 200px; margin-left: 13px">
+          <el-option
+            v-for="item in stationNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+            size="mini"/>
+        </el-select>
+        <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageSize=30;pageCurrent=1;searchOrder()">查询</el-button>
+      </div>
+      <el-table
+        v-loading="loading"
+        ref="multipleTable"
+        :data="tableData"
+        :header-cell-style="{background:'#eef1f6',color:'#606266'}"
+        :cell-class-name="tableRowClassName"
+        element-loading-text="数据加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.2)"
+        class="main"
+        tooltip-effect="dark"
+        height="690px"
+        style="width: 100%;"
+        border
+        size="mini">
+        <el-table-column align="center" label="工位号">
+          <template slot-scope="scope">
+            {{ scope.row.工位号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="传递机型">
+          <template slot-scope="scope">
+            {{ scope.row.传递机型 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作时间">
+          <template slot-scope="scope">
+            {{ scope.row.操作时间 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[15, 30, 40]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+  </div>
+</template>
+<!--<script src="../../../utils/setMethods.js"></script>-->
+<script>
+export default {
+  data() {
+    return {
+      number: [],
+      tableData: [], // 总数据数组
+      stationNumberValue: '', // 工位号
+      stationNumber: [], // 工位号
+      dateTime: '',
+      total: 0, // 总条数
+      pageList: 30, // 每页显示条数
+      pageSize: 30, // 每页显示条数
+      pageCurrent: 1, // 后台获取页
+      mid: [], // id
+      loading: false,
+      timer_1: null,
+      MIDGroup: []
+    }
+  },
+  created() {
+    var year, month, day, audiTime
+    this.date = new Date() // 修改数据date
+    year = new Date().getFullYear()
+    month = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
+    day = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
+    audiTime = year + '-' + month + '-' + day
+    console.log(audiTime, 'audiTime')
+    this.dateTime = [audiTime, audiTime]
+    this.getStationNumber()
+  },
+  mounted() {
+  },
+  methods: {
+    // 表格颜色变化
+    tableRowClassName({ row, rowIndex }) {
+      // console.log(row, rowIndex)
+      if (rowIndex % 2 === 0) {
+        return 'black'
+      } else {
+        return 'red'
+      }
+    },
+    // 工位号
+    getStationNumber() {
+      this.stationNumber = []
+      this.xData = []
+      var param = []
+      var Data = this.CreateData('11', 'MES_计划BOM_工位与名称_查询', param)
+      this.ExecDatabase(Data).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.stationNumber.push({
+            label: response.data[i].工位号,
+            value: response.data[i].工位号
+          })
+        }
+      })
+    },
+    // 查询订单
+    searchOrder() {
+      this.tableData = []
+      let stationNumberValue_check
+      // this.engineTypeValue ? engineTypeValue_check = 1 : (engineTypeValue_check = 0, this.engineTypeValue = '')
+      this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
+      // this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
+      var param = []
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      param[2] = ['工位号_ischeck', stationNumberValue_check]
+      param[3] = ['工位号', this.stationNumberValue]
+      param[4] = ['PageCurrent', this.pageCurrent]
+      param[5] = ['PageSize', this.pageSize]
+      param[6] = ['PageCount', '1111', 'int', '1']
+      param[7] = ['ItemCount', '1111', 'int', '1']
+      var Data = this.CreateData('11', '测量数据工位_监控系统_传递机型', param)
+      this.ExecDatabase(Data).then(response => {
+        console.log(response, 66)
+        if (response.data.result.length !== 0) {
+          this.tableData = response.data.result
+        }
+        this.total = parseInt(response.data.output[0].ItemCount)
+        this.loading = false
+      })
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchOrder()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchOrder()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .topCard{
+    margin: 5px;
+  }
+  .topDiv{
+    margin-bottom: 10px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  .text {
+    font-size: 14px;
+  }
+
+  .item {
+    padding: 18px 0;
+  }
+
+  .box-card {
+    position: absolute;
+    right: 6px;
+    top: 80px;
+    width: 300px;
+  }
+  .el-table .warning-row {
+    background: oldlace;
+  }
+
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+</style>
+
diff --git a/src/views/ProcessManagement/MonitoringData/index.vue b/src/views/ProcessManagement/MonitoringData/index.vue
new file mode 100644
index 0000000..9574c27
--- /dev/null
+++ b/src/views/ProcessManagement/MonitoringData/index.vue
@@ -0,0 +1,49 @@
+<template>
+  <div>
+    <el-tabs v-model="activeName" type="border-card">
+      <el-tab-pane label="操作者" name="1"><Operator ref="fresh1"/></el-tab-pane>
+      <el-tab-pane label="传递机型" name="2"><TransferModel ref="fresh3"/></el-tab-pane>
+      <el-tab-pane label="订单号" name="3"><OrderNumber ref="fresh2"/></el-tab-pane>
+      <el-tab-pane label="发动机号" name="4"><EngineNumber ref="fresh4"/></el-tab-pane>
+      <el-tab-pane label="发动机型号" name="5"><EngineModel ref="fresh5"/></el-tab-pane>
+      <el-tab-pane label="工位状态" name="6"><StationStatus ref="fresh6"/></el-tab-pane>
+      <el-tab-pane label="托盘号" name="7"><PalletNo ref="fresh7"/></el-tab-pane>
+      <el-tab-pane label="线首工位信息" name="8"><LineHeadStationInformation ref="fresh8"/></el-tab-pane>
+      <el-tab-pane label="下线工位信息" name="9"><OfflineStation ref="fresh9"/></el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import Operator from '@/views/ProcessManagement/MonitoringData/Operator.vue'
+import TransferModel from '@/views/ProcessManagement/MonitoringData/TransferModel.vue'
+import OrderNumber from '@/views/ProcessManagement/MonitoringData/OrderNumber.vue'
+import EngineNumber from '@/views/ProcessManagement/MonitoringData/EngineNumber.vue'
+import EngineModel from '@/views/ProcessManagement/MonitoringData/EngineModel.vue'
+import StationStatus from '@/views/ProcessManagement/MonitoringData/StationStatus.vue'
+import PalletNo from '@/views/ProcessManagement/MonitoringData/PalletNo.vue'
+import LineHeadStationInformation from '@/views/ProcessManagement/MonitoringData/LineHeadStationInformation.vue'
+import OfflineStation from '@/views/ProcessManagement/MonitoringData/OfflineStation.vue'
+export default {
+  components: {
+    'Operator': Operator,
+    'TransferModel': TransferModel,
+    'OrderNumber': OrderNumber,
+    'EngineNumber': EngineNumber,
+    'EngineModel': EngineModel,
+    'StationStatus': StationStatus,
+    'PalletNo': PalletNo,
+    'LineHeadStationInformation': LineHeadStationInformation,
+    'OfflineStation': OfflineStation
+  },
+  data() {
+    return {
+      activeName: '1'
+    }
+  },
+  methods: {}
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/ProcessManagement/WarehouseLocation/index.vue b/src/views/ProcessManagement/WarehouseLocation/index.vue
new file mode 100644
index 0000000..7235a71
--- /dev/null
+++ b/src/views/ProcessManagement/WarehouseLocation/index.vue
@@ -0,0 +1,179 @@
+<template>
+  <div class="app-container">
+    <el-card class="topCard">
+      <div class="topDiv">
+        <el-button type="primary" plain size="small" icon="el-icon-refresh" @click="searchOrder()">刷新</el-button>
+      </div>
+      <el-table
+        v-loading="loading"
+        ref="multipleTable"
+        :data="tableData"
+        :header-cell-style="{background:'#eef1f6',color:'#606266'}"
+        :cell-class-name="tableRowClassName"
+        element-loading-text="数据加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.2)"
+        class="main"
+        tooltip-effect="dark"
+        height="720px"
+        style="width: 100%;"
+        border
+        size="mini">
+        <el-table-column align="center" label="工位号">
+          <template slot-scope="scope">
+            {{ scope.row.工位号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="库位号">
+          <template slot-scope="scope">
+            {{ scope.row.库位号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="条码">
+          <template slot-scope="scope">
+            {{ scope.row.条码 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="订单号">
+          <template slot-scope="scope">
+            {{ scope.row.订单号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="发动机号">
+          <template slot-scope="scope">
+            {{ scope.row.发动机号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="发动机型号">
+          <template slot-scope="scope">
+            {{ scope.row.发动机型号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="机型代码">
+          <template slot-scope="scope">
+            {{ scope.row.机型代码 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="是否有件">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.是否有件" filterable size="small" style="width: 90%;" @change="ModifyData(scope.row)">
+              <el-option
+                v-for="item in stationNumber"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+                size="mini"/>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作时间">
+          <template slot-scope="scope">
+            {{ scope.row.操作时间 }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+<!--<script src="../../../utils/setMethods.js"></script>-->
+<script>
+export default {
+  data() {
+    return {
+      loading: true,
+      tableData: [], // 总数据数组
+      stationNumber: [{
+        value: 0,
+        label: '否'
+      }, {
+        value: 1,
+        label: '是'
+      }]
+    }
+  },
+  created() {
+    this.searchOrder()
+  },
+  mounted() {
+  },
+  methods: {
+    // 表格颜色变化
+    tableRowClassName({ row, rowIndex }) {
+      // console.log(row, rowIndex)
+      if (rowIndex % 2 === 0) {
+        return 'black'
+      } else {
+        return 'red'
+      }
+    },
+    // 查询订单
+    searchOrder() {
+      this.loading = true
+      this.tableData = []
+      var param = []
+      var Data = this.CreateData('11', '思源库位管理_管理软件查询', param)
+      this.ExecDatabase(Data).then(response => {
+        console.log(response, 66)
+        if (response.data.length !== 0) {
+          this.tableData = response.data
+        }
+        this.loading = false
+      })
+    },
+    ModifyData(row) {
+      var param = []
+      param[0] = ['ID', row.ID]
+      param[1] = ['是否有件', row.是否有件]
+      console.log(param, '思源库位管理_管理软件修改param')
+      var Data = this.CreateData('12', '思源库位管理_管理软件修改', param)
+      this.ExecDatabase(Data).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message({
+            message: '状态修改成功',
+            type: 'success'
+          })
+        } else {
+          this.$message.error('状态修改失败！')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .topCard{
+    margin: 5px;
+  }
+  .topDiv{
+    margin-bottom: 10px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  .text {
+    font-size: 14px;
+  }
+
+  .item {
+    padding: 18px 0;
+  }
+
+  .box-card {
+    position: absolute;
+    right: 6px;
+    top: 80px;
+    width: 300px;
+  }
+  .el-table .warning-row {
+    background: oldlace;
+  }
+
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+</style>
+
diff --git a/src/views/QualityAssurance/AssemblyQualitydataQuery/index.vue b/src/views/QualityAssurance/AssemblyQualitydataQuery/index.vue
index 9566d2f..ec5448f 100644
--- a/src/views/QualityAssurance/AssemblyQualitydataQuery/index.vue
+++ b/src/views/QualityAssurance/AssemblyQualitydataQuery/index.vue
@@ -40,15 +40,6 @@
           <!--              :value="item.value"-->
           <!--              size="mini"/>-->
           <!--          </el-select>-->
-          <span style="margin-left: 10px">总成编号：</span>
-          <el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" filterable clearable size="small" style="width: 200px;">
-            <el-option
-              v-for="item in assemblyNumber"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-              size="mini"/>
-          </el-select>
           <!--          <span style="margin-left: 10px">总成编号：</span>-->
           <!--          <el-input v-model="assemblyNumber" style="width:150px;" placeholder="总成编号" size="small" clearable/>-->
           <span style="margin-left: 10px">测量位置：</span>
@@ -60,6 +51,15 @@
               :value="item.value"
               size="mini"/>
           </el-select>
+          <span style="margin-left: 10px">总成编号：</span>
+          <el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" filterable clearable size="small" style="width: 240px;">
+            <el-option
+              v-for="item in assemblyNumber"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+              size="mini"/>
+          </el-select>
         </div>
         <div style="margin-top: 10px">
           <span style="margin-left: 10px">订单号：</span>
@@ -112,7 +112,7 @@
           </el-select>
         </div>
         <div style="margin: 10px 0 0 89%">
-          <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageCurrent = 1,pageSize = 30,selectDate()">查询</el-button>
+          <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="selectDate()">查询</el-button>
           <el-button type="info" size="small" icon="el-icon-download" @click="exportExcel()">Excel</el-button>
         </div>
         <el-table
diff --git a/src/views/QualityAssurance/InquiryTransitInformation/index.vue b/src/views/QualityAssurance/InquiryTransitInformation/index.vue
index 2c9a4ab..d589e39 100644
--- a/src/views/QualityAssurance/InquiryTransitInformation/index.vue
+++ b/src/views/QualityAssurance/InquiryTransitInformation/index.vue
@@ -34,7 +34,7 @@
               size="mini"/>
           </el-select>
           <span style="margin-left: 10px">总成编号：</span>
-          <el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" filterable clearable size="small" style="width: 200px; margin-left: 13px">
+          <el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" filterable clearable size="small" style="width: 240px; margin-left: 13px">
             <el-option
               v-for="item in assemblyNumber"
               :key="item.ID"
diff --git a/src/views/QualityAssurance/LineItemQuery/index.vue b/src/views/QualityAssurance/LineItemQuery/index.vue
index 34bc881..f531be6 100644
--- a/src/views/QualityAssurance/LineItemQuery/index.vue
+++ b/src/views/QualityAssurance/LineItemQuery/index.vue
@@ -40,7 +40,7 @@
           <!--              size="mini"/>-->
           <!--          </el-select>-->
           <span style="margin-left: 10px">分总成编号：</span>
-          <el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" filterable clearable size="small" style="width: 200px">
+          <el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" filterable clearable size="small" style="width: 240px">
             <el-option
               v-for="item in assemblyNumber"
               :key="item.value"
@@ -314,8 +314,10 @@ export default {
       this.engineTypeValue ? engineTypeValue_check = 1 : engineTypeValue_check = 0
       this.stationNumberValue ? stationNumberValue_check = 1 : stationNumberValue_check = 0
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['发动机型号_ischeck', engineTypeValue_check]
       param[3] = ['发动机型号', this.engineTypeValue]
       param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -338,8 +340,8 @@ export default {
       this.engineTypeValue ? engineTypeValue_check = 1 : engineTypeValue_check = 0
       this.stationNumberValue ? stationNumberValue_check = 1 : stationNumberValue_check = 0
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
       param[2] = ['发动机型号_ischeck', engineTypeValue_check]
       param[3] = ['发动机型号', this.engineTypeValue]
       param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -358,8 +360,8 @@ export default {
     getBatchBarcode() {
       this.batchBarcode = []
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
       param[2] = ['工位号', this.stationNumberValue]
       console.log(param, 'param')
       var Data = this.CreateData('11', '物料数据分线_视图_物料条码批次号_查询 ', param)
@@ -397,8 +399,8 @@ export default {
       this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
       this.batchBarcodeValue ? batchBarcodeValue_check = 1 : (batchBarcodeValue_check = 0, this.batchBarcodeValue = '')
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
       param[2] = ['发动机型号_ischeck', engineTypeValue_check]
       param[3] = ['发动机型号', this.engineTypeValue]
       param[4] = ['发动机号_ischeck', assemblyNumberValue_check]
@@ -435,8 +437,8 @@ export default {
         this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
         this.batchBarcodeValue ? batchBarcodeValue_check = 1 : (batchBarcodeValue_check = 0, this.batchBarcodeValue = '')
         var param = []
-        param[0] = ['开始时间', this.dateTime[0]]
-        param[1] = ['结束时间', this.dateTime[1]]
+        param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+        param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
         param[2] = ['发动机型号_ischeck', engineTypeValue_check]
         param[3] = ['发动机型号', this.engineTypeValue]
         param[4] = ['发动机号_ischeck', assemblyNumberValue_check]
diff --git a/src/views/QualityAssurance/LineQualityQuery/index.vue b/src/views/QualityAssurance/LineQualityQuery/index.vue
index d01dc80..df58e77 100644
--- a/src/views/QualityAssurance/LineQualityQuery/index.vue
+++ b/src/views/QualityAssurance/LineQualityQuery/index.vue
@@ -10,8 +10,8 @@
             filterable
             clearable
             size="small"
-            style="width: 200px; margin-left: 13px"
-            @change="getPartName();getBatchBarcode();getAssemblyNumber();getTraceabilityCode()">
+            style="width: 200px"
+            @change="getMeasuringPosition();getTraceabilityCode();getBatchBarcode();getAssemblyNumber()">
             <el-option
               v-for="item in stationNumber"
               :key="item.value"
@@ -20,7 +20,7 @@
               size="mini"/>
           </el-select>
           <span style="margin-left: 10px">机型：</span>
-          <el-select v-model="engineTypeValue" placeholder="请选择机型" filterable clearable size="small" style="width: 240px" @change="getPartName();getAssemblyNumber">
+          <el-select v-model="engineTypeValue" placeholder="请选择机型" filterable clearable size="small" style="width: 240px" @change="getAssemblyNumber()">
             <el-option
               v-for="item in engineType"
               :key="item.value"
@@ -29,18 +29,16 @@
               size="mini"/>
           </el-select>
           <span style="margin-left: 10px">精确追溯码：</span>
-          <el-input v-model="traceabilityCode" placeholder="请输入精确追溯码" clearable size="small" style="width: 200px;"/>
-          <!--          <span style="margin-left: 10px">精确追溯码：</span>-->
-          <!--          <el-select v-model="traceabilityCode" placeholder="请选择精确追溯码" filterable clearable size="small" style="width: 200px">-->
-          <!--            <el-option-->
-          <!--              v-for="item in traceabilityCodeArr"-->
-          <!--              :key="item.ID"-->
-          <!--              :label="item.label"-->
-          <!--              :value="item.value"-->
-          <!--              size="mini"/>-->
-          <!--          </el-select>-->
-          <span style="margin-left: 10px">分总成编号：</span>
-          <el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" filterable clearable size="small" style="width: 200px">
+          <el-select v-model="traceabilityCode" placeholder="请选择精确追溯码" filterable clearable size="small" style="width: 200px">
+            <el-option
+              v-for="item in traceabilityCodeArr"
+              :key="item.ID"
+              :label="item.label"
+              :value="item.value"
+              size="mini"/>
+          </el-select>
+          <span style="margin-left: 10px">总成编号：</span>
+          <el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" filterable clearable size="small" style="width: 240px; margin-left: 13px">
             <el-option
               v-for="item in assemblyNumber"
               :key="item.value"
@@ -48,13 +46,24 @@
               :value="item.value"
               size="mini"/>
           </el-select>
+          <!--          <span style="margin-left: 10px">总成编号：</span>-->
+          <!--          <el-input v-model="assemblyNumber" style="width:150px;" placeholder="总成编号" size="small" clearable/>-->
+          <span style="margin-left: 10px">测量位置：</span>
+          <el-select v-model="measuringPositionValue" placeholder="请选择测量位置" filterable clearable size="small" style="width: 200px" @change="getMeasuringProject()">
+            <el-option
+              v-for="item in measuringPosition"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+              size="mini"/>
+          </el-select>
         </div>
         <div style="margin-top: 10px">
-          <span style="margin-left: 10px">零件名称：</span>
-          <el-select v-model="partNameValue" placeholder="请选择零件名称" filterable clearable size="small" style="width: 200px;">
+          <span style="margin-left: 10px">订单号：</span>
+          <el-select v-model="orderNumberValue" placeholder="请选择订单" clearable filterable size="small" style="width: 200px">
             <el-option
-              v-for="item in partName"
-              :key="item.ID"
+              v-for="item in orderNumber"
+              :key="item.value"
               :label="item.label"
               :value="item.value"
               size="mini"/>
@@ -71,21 +80,37 @@
             range-separator="～"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
-            @change="getTraceabilityCode();getBatchBarcode();getAssemblyNumber()"/>
+            @change="getOrderNumber();getTraceabilityCode();getBatchBarcode();getAssemblyNumber()"/>
           <span style="margin-left: 10px">批次条码：</span>
-          <el-input v-model="batchBarcodeValue" placeholder="请输入批次条码" clearable size="small" style="width: 200px; margin-left: 13px"/>
-          <!--          <span style="margin-left: 10px">批次条码：</span>-->
-          <!--          <el-select v-model="batchBarcodeValue" placeholder="请选择批次条码" clearable filterable size="small" style="width: 200px;margin-left: 13px">-->
-          <!--            <el-option-->
-          <!--              v-for="item in batchBarcode"-->
-          <!--              :key="item.value"-->
-          <!--              :label="item.label"-->
-          <!--              :value="item.value"-->
-          <!--              size="mini"/>-->
-          <!--          </el-select>-->
+          <el-select v-model="batchBarcodeValue" placeholder="请选择批次条码" clearable filterable size="small" style="width: 200px; margin-left: 13px">
+            <el-option
+              v-for="item in batchBarcode"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+              size="mini"/>
+          </el-select>
+          <span style="margin-left: 10px">是否合格：</span>
+          <el-select v-model="isQualifiedValue" placeholder="请选择是否合格" clearable size="small" style="width: 240px; margin-left: 13px">
+            <el-option
+              v-for="item in isQualified"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+              size="mini"/>
+          </el-select>
+          <span style="margin-left: 10px">测量项目：</span>
+          <el-select v-model="measuringProjectValue" placeholder="请选择测量项目" filterable clearable size="small" style="width: 200px">
+            <el-option
+              v-for="item in measuringProject"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+              size="mini"/>
+          </el-select>
         </div>
         <div style="margin: 10px 0 0 89%">
-          <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageCurrent = 1,pageSize = 30,selectDate()">查询</el-button>
+          <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="selectDate()">查询</el-button>
           <el-button type="info" size="small" icon="el-icon-download" @click="exportExcel()">Excel</el-button>
         </div>
         <el-table
@@ -97,6 +122,7 @@
           element-loading-text="数据加载中"
           element-loading-spinner="el-icon-loading"
           element-loading-background="rgba(0, 0, 0, 0.2)"
+          stripe
           class="main"
           tooltip-effect="dark"
           height="660px"
@@ -115,7 +141,7 @@
               {{ scope.row.发动机型号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="分总成编号">
+          <el-table-column align="center" label="总成编号">
             <template slot-scope="scope">
               {{ scope.row.发动机号 }}
             </template>
@@ -130,44 +156,49 @@
               {{ scope.row.工序名称 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="零件数量">
+          <el-table-column align="center" label="测量位置">
             <template slot-scope="scope">
-              {{ scope.row.零件数量 }}
+              {{ scope.row.测量位置 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="零件名称">
+          <el-table-column align="center" label="测量项目">
             <template slot-scope="scope">
-              {{ scope.row.零件名称 }}
+              {{ scope.row.测量项目 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="零件图号">
+          <el-table-column align="center" label="测量值" width="80px">
             <template slot-scope="scope">
-              {{ scope.row.零件图号 }}
+              {{ scope.row.测量值 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="物料号">
+          <el-table-column align="center" label="测量单位" width="80px">
             <template slot-scope="scope">
-              {{ scope.row.物料号 }}
+              {{ scope.row.测量单位 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="生产厂家">
+          <el-table-column align="center" label="理论值" width="80px">
             <template slot-scope="scope">
-              {{ scope.row.生产厂家 }}
+              {{ scope.row.理论值 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="物料条码">
+          <el-table-column align="center" label="值上限" width="80px">
             <template slot-scope="scope">
-              {{ scope.row.物料条码 }}
+              {{ scope.row.上限值 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="物料条码批次">
+          <el-table-column align="center" label="值下限" width="80px">
             <template slot-scope="scope">
-              {{ scope.row.物料条码批次 }}
+              {{ scope.row.下限值 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="操作时间">
+          <el-table-column align="center" label="生产日期">
             <template slot-scope="scope">
-              {{ scope.row.操作时间 }}
+              {{ scope.row.生产日期 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="合格标志" width="80px">
+            <template slot-scope="scope">
+              {{ scope.row.合格标志 }}
             </template>
           </el-table-column>
         </el-table>
@@ -207,21 +238,19 @@ export default {
       engineType: [], // 机型
       batchBarcode: [], // 批次条码
       batchBarcodeValue: '', // 批次条码
-      partName: [], // 零件名称
-      partNameValue: '', // 零件名称
       isQualified: [
         {
           label: '合格',
           value: 1
         }, {
           label: '不合格',
-          value: 2
+          value: 0
         }, {
           label: '全部',
-          value: 0
+          value: 2
         }
       ], // 是否合格
-      isQualifiedValue: 1, // 是否合格
+      isQualifiedValue: 2, // 是否合格
       dateTime: '', // 时间
       loading: false, // 时间
       tableData: [], // 时间
@@ -246,9 +275,9 @@ export default {
     this.getEngineType()
   },
   mounted() {
+    this.getOrderNumber()
     this.getTraceabilityCode()
     this.getAssemblyNumber()
-    setTimeout(() => { this.getPartName() }, 200)
   },
   methods: {
     // 表格颜色变化
@@ -274,6 +303,7 @@ export default {
         }
       }).then(() => {
         this.getBatchBarcode()
+        this.getMeasuringPosition()
       })
     },
     // 机型
@@ -290,19 +320,18 @@ export default {
         }
       })
     },
-    // 零件名称
-    getPartName() {
-      this.partName = []
+    // 订单号
+    getOrderNumber() {
+      this.orderNumber = []
       var param = []
-      param[0] = ['发动机型号', this.engineTypeValue]
-      param[1] = ['工位号', this.stationNumberValue]
-      var Data = this.CreateData('11', '电子看板装配零件_零件名称_初始化查询 ', param)
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      var Data = this.CreateData('11', '测量数据发动机在线状态_订单号_查询 ', param)
       this.ExecDatabase(Data).then(response => {
         for (let i = 0; i < response.data.length; i++) {
-          this.partName.push({
-            label: response.data[i].零件名称,
-            value: response.data[i].零件名称,
-            ID: response.data[i].ID
+          this.orderNumber.push({
+            label: response.data[i].订单号,
+            value: response.data[i].订单号
           })
         }
       })
@@ -316,8 +345,6 @@ export default {
       var param = []
       param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
       param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
-      // param[0] = ['开始时间', this.dateTime[0]]
-      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['发动机型号_ischeck', engineTypeValue_check]
       param[3] = ['发动机型号', this.engineTypeValue]
       param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -342,8 +369,6 @@ export default {
       var param = []
       param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
       param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
-      // param[0] = ['开始时间', this.dateTime[0]]
-      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['发动机型号_ischeck', engineTypeValue_check]
       param[3] = ['发动机型号', this.engineTypeValue]
       param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -364,10 +389,7 @@ export default {
       var param = []
       param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
       param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
-      // param[0] = ['开始时间', this.dateTime[0]]
-      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['工位号', this.stationNumberValue]
-      console.log(param, 'param')
       var Data = this.CreateData('11', '物料数据分线_视图_物料条码批次号_查询 ', param)
       this.ExecDatabase(Data).then(response => {
         for (let i = 0; i < response.data.length; i++) {
@@ -378,6 +400,22 @@ export default {
         }
       })
     },
+    getMeasuringPosition() {
+      this.measuringPosition = []
+      var param = []
+      param[0] = ['工位号', this.stationNumberValue]
+      var Data = this.CreateData('11', '质量数据查询_测量位置 ', param)
+      this.ExecDatabase(Data).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.measuringPosition.push({
+            label: response.data[i].测量位置,
+            value: response.data[i].测量位置
+          })
+        }
+      }).then(() => {
+        this.getMeasuringProject()
+      })
+    },
     getMeasuringProject() {
       this.measuringProject = []
       var param = []
@@ -395,35 +433,37 @@ export default {
     },
     selectDate() {
       this.tableData = []
-      let engineTypeValue_check, assemblyNumberValue_check, stationNumberValue_check, partNameValue_check, traceabilityCode_check, batchBarcodeValue_check
+      let engineTypeValue_check, assemblyNumberValue_check, stationNumberValue_check, measuringPositionValue_check, measuringProjectValue_check, traceabilityCode_check, orderNumberValue_check
       this.engineTypeValue ? engineTypeValue_check = 1 : (engineTypeValue_check = 0, this.engineTypeValue = '')
       this.assemblyNumberValue ? assemblyNumberValue_check = 1 : (assemblyNumberValue_check = 0, this.assemblyNumberValue = '')
       this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
-      this.partNameValue ? partNameValue_check = 1 : (partNameValue_check = 0, this.partNameValue = '')
+      this.measuringPositionValue ? measuringPositionValue_check = 1 : (measuringPositionValue_check = 0, this.measuringPositionValue = '')
+      this.measuringProjectValue ? measuringProjectValue_check = 1 : (measuringProjectValue_check = 0, this.measuringProjectValue = '')
       this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
-      this.batchBarcodeValue ? batchBarcodeValue_check = 1 : (batchBarcodeValue_check = 0, this.batchBarcodeValue = '')
+      this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
       var param = []
       param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
       param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
-      // param[0] = ['开始时间', this.dateTime[0]]
-      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['发动机型号_ischeck', engineTypeValue_check]
       param[3] = ['发动机型号', this.engineTypeValue]
       param[4] = ['发动机号_ischeck', assemblyNumberValue_check]
       param[5] = ['发动机号', this.assemblyNumberValue]
       param[6] = ['工位号_ischeck', stationNumberValue_check]
       param[7] = ['工位号', this.stationNumberValue]
-      param[8] = ['零件名称_ischeck', partNameValue_check]
-      param[9] = ['零件名称', this.partNameValue]
-      param[10] = ['二维码_ischeck', traceabilityCode_check]
-      param[11] = ['二维码', this.traceabilityCode]
-      param[12] = ['物料条码批次_ischeck', batchBarcodeValue_check]
-      param[13] = ['物料条码批次', this.batchBarcodeValue]
-      param[14] = ['PageCurrent', this.pageCurrent]
-      param[15] = ['PageSize', this.pageSize]
-      param[16] = ['PageCount', '1111', 'int', '1']
-      param[17] = ['ItemCount', '1111', 'int', '1']
-      var Data = this.CreateData('11', '物料数据分线_视图_查询', param)
+      param[8] = ['测量位置_ischeck', measuringPositionValue_check]
+      param[9] = ['测量位置', this.measuringPositionValue]
+      param[10] = ['测量项目_ischeck', measuringProjectValue_check]
+      param[11] = ['测量项目', this.measuringProjectValue]
+      param[12] = ['订单号_ischeck', orderNumberValue_check]
+      param[13] = ['订单号', this.orderNumberValue]
+      param[14] = ['批次条码_ischeck', traceabilityCode_check]
+      param[15] = ['批次条码', this.traceabilityCode]
+      param[16] = ['合格标志', this.isQualifiedValue]
+      param[17] = ['PageCurrent', this.pageCurrent]
+      param[18] = ['PageSize', this.pageSize]
+      param[19] = ['PageCount', '1111', 'int', '1']
+      param[20] = ['ItemCount', '1111', 'int', '1']
+      var Data = this.CreateData('11', '质量数据_发动机分线质量数据_综合查询', param)
       this.ExecDatabase(Data).then(response => {
         console.log(response, 66)
         if (response.data.result.length !== 0) {
@@ -435,31 +475,33 @@ export default {
     },
     exportExcel() {
       if (this.tableData.length !== 0) {
-        let engineTypeValue_check, assemblyNumberValue_check, stationNumberValue_check, partNameValue_check, traceabilityCode_check, batchBarcodeValue_check
+        let engineTypeValue_check, assemblyNumberValue_check, stationNumberValue_check, measuringPositionValue_check, measuringProjectValue_check, traceabilityCode_check, orderNumberValue_check
         this.engineTypeValue ? engineTypeValue_check = 1 : (engineTypeValue_check = 0, this.engineTypeValue = '')
         this.assemblyNumberValue ? assemblyNumberValue_check = 1 : (assemblyNumberValue_check = 0, this.assemblyNumberValue = '')
         this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
-        this.partNameValue ? partNameValue_check = 1 : (partNameValue_check = 0, this.partNameValue = '')
+        this.measuringPositionValue ? measuringPositionValue_check = 1 : (measuringPositionValue_check = 0, this.measuringPositionValue = '')
+        this.measuringProjectValue ? measuringProjectValue_check = 1 : (measuringProjectValue_check = 0, this.measuringProjectValue = '')
         this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
-        this.batchBarcodeValue ? batchBarcodeValue_check = 1 : (batchBarcodeValue_check = 0, this.batchBarcodeValue = '')
+        this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
         var param = []
         param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
         param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
-        // param[0] = ['开始时间', this.dateTime[0]]
-        // param[1] = ['结束时间', this.dateTime[1]]
         param[2] = ['发动机型号_ischeck', engineTypeValue_check]
         param[3] = ['发动机型号', this.engineTypeValue]
         param[4] = ['发动机号_ischeck', assemblyNumberValue_check]
         param[5] = ['发动机号', this.assemblyNumberValue]
         param[6] = ['工位号_ischeck', stationNumberValue_check]
         param[7] = ['工位号', this.stationNumberValue]
-        param[8] = ['零件名称_ischeck', partNameValue_check]
-        param[9] = ['零件名称', this.partNameValue]
-        param[10] = ['二维码_ischeck', traceabilityCode_check]
-        param[11] = ['二维码', this.traceabilityCode]
-        param[12] = ['物料条码批次_ischeck', batchBarcodeValue_check]
-        param[13] = ['物料条码批次', this.batchBarcodeValue]
-        var Data = this.CreateData('2001', '物料数据分线查询_报表新', param)
+        param[8] = ['测量位置_ischeck', measuringPositionValue_check]
+        param[9] = ['测量位置', this.measuringPositionValue]
+        param[10] = ['测量项目_ischeck', measuringProjectValue_check]
+        param[11] = ['测量项目', this.measuringProjectValue]
+        param[12] = ['订单号_ischeck', orderNumberValue_check]
+        param[13] = ['订单号', this.orderNumberValue]
+        param[14] = ['批次条码_ischeck', traceabilityCode_check]
+        param[15] = ['批次条码', this.traceabilityCode]
+        param[16] = ['合格标志', this.isQualifiedValue]
+        var Data = this.CreateData('2001', '质量数据分线_导出新', param)
         this.exportExcel_NPOI(Data)
       } else {
         this.$message.warning('暂无数据')
diff --git a/src/views/QualityAssurance/MaterialDataQuery/index.vue b/src/views/QualityAssurance/MaterialDataQuery/index.vue
index 74269ba..c95ea72 100644
--- a/src/views/QualityAssurance/MaterialDataQuery/index.vue
+++ b/src/views/QualityAssurance/MaterialDataQuery/index.vue
@@ -32,7 +32,7 @@
           <!--              size="mini"/>-->
           <!--          </el-select>-->
           <span style="margin-left: 10px">总成编号：</span>
-          <el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" filterable clearable size="small" style="width: 200px">
+          <el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" filterable clearable size="small" style="width: 240px">
             <el-option
               v-for="item in assemblyNumber"
               :key="item.value"
@@ -308,8 +308,6 @@ export default {
       var param = []
       param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
       param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
-      // param[0] = ['开始时间', this.dateTime[0]]
-      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['发动机型号_ischeck', engineTypeValue_check]
       param[3] = ['发动机型号', this.engineTypeValue]
       param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -334,8 +332,6 @@ export default {
       var param = []
       param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
       param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
-      // param[0] = ['开始时间', this.dateTime[0]]
-      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['发动机型号_ischeck', engineTypeValue_check]
       param[3] = ['发动机型号', this.engineTypeValue]
       param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -356,8 +352,6 @@ export default {
       var param = []
       param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
       param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
-      // param[0] = ['开始时间', this.dateTime[0]]
-      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['工位号', this.stationNumberValue]
       var Data = this.CreateData('11', '物料数据_视图_物料条码批次号_查询 ', param)
       this.ExecDatabase(Data).then(response => {
diff --git a/src/views/QualityAssurance/ProductionPlanOrderCompletion/index.vue b/src/views/QualityAssurance/ProductionPlanOrderCompletion/index.vue
index f7188cc..182a16b 100644
--- a/src/views/QualityAssurance/ProductionPlanOrderCompletion/index.vue
+++ b/src/views/QualityAssurance/ProductionPlanOrderCompletion/index.vue
@@ -256,7 +256,7 @@ export default {
         series: [
           {
             name: 'PASS',
-            data: this.number,
+            data: this.yData,
             type: 'bar',
             showBackground: true,
             backgroundStyle: {
@@ -277,7 +277,7 @@ export default {
           },
           {
             name: 'NO',
-            data: this.yData,
+            data: this.number,
             type: 'bar',
             showBackground: true,
             backgroundStyle: {
@@ -311,8 +311,10 @@ export default {
       this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
       this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['工位号_ischeck', stationNumberValue_check]
       param[3] = ['工位号', this.stationNumberValue]
       param[4] = ['订单号_ischeck', orderNumberValue_check]
@@ -349,8 +351,10 @@ export default {
       this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
       this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
       var param = []
-      param[0] = ['开始时间', this.dateTime[0]]
-      param[1] = ['结束时间', this.dateTime[1]]
+      param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+      param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+      // param[0] = ['开始时间', this.dateTime[0]]
+      // param[1] = ['结束时间', this.dateTime[1]]
       param[2] = ['工位号_ischeck', stationNumberValue_check]
       param[3] = ['工位号', this.stationNumberValue]
       param[4] = ['订单号_ischeck', orderNumberValue_check]
@@ -389,8 +393,10 @@ export default {
         this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '')
         this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
         var param = []
-        param[0] = ['开始时间', this.dateTime[0]]
-        param[1] = ['结束时间', this.dateTime[1]]
+        param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+        param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+        // param[0] = ['开始时间', this.dateTime[0]]
+        // param[1] = ['结束时间', this.dateTime[1]]
         param[2] = ['工位号_ischeck', stationNumberValue_check]
         param[3] = ['工位号', this.stationNumberValue]
         param[4] = ['订单号_ischeck', orderNumberValue_check]