commit 20221121

package.json

@@ -15,6 +15,7 @@
   "dependencies": {
     "@xkeshi/vue-barcode": "^1.0.0",
     "axios": "0.18.0",
+    "dhtmlx-gantt": "^7.1.12",
     "docxtemplater": "^3.19.7",
     "echarts": "^4.2.0-rc.2",
     "element-ui": "^2.13.0",

src/views/BasicData/TimeLine/index.vue

@@ -1,80 +1,66 @@
 <template>
-  <div class="app-container">
+  <div style="padding: 10px;">
-    <el-card class="topCard">
+    <h2 style="text-align: center">Gantt echart</h2>
-      <div class="block">
+    <div class="app-container">
-        <el-timeline :reverse="reverse">
+      <div ref="gantt" class="left-container"/>
-          <el-timeline-item
+    </div>
-            v-for="(activity, index) in activities"
-            :key="index"
-            :timestamp="activity.timestamp">
-            {{ activity.content }}
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </el-card>
   </div>
 </template>
 
 <script>
+import gantt from 'dhtmlx-gantt' // 引入模块
+import 'dhtmlx-gantt/codebase/dhtmlxgantt.css'
+// import 'dhtmlx-gantt/codebase/locale/locale_cn'  // 本地化
 export default {
+  name: 'GanttEchart',
   data() {
     return {
-      reverse: true,
+      tasks: {
-      activities: [{
+        data: [
-        content: '活动按期开始',
+          { id: 1, text: 'Task #1', start_date: '2020-12-15', personName: '张总', duration: 3, progress: 0.6, color: '#6BC172' },
-        timestamp: '2018-04-15'
+          { id: 2, text: 'Task #2', start_date: '2020-12-18', personName: '李总', duration: 6, progress: 0.4, color: '#6BC172' },
-      }, {
+          { id: 3, text: 'Task #2-1', start_date: '2020-12-18', personName: '赵总', duration: 3, progress: 0.2, parent: 2 },
-        content: '通过审核',
+          { id: 4, text: 'Task #2-2', start_date: '2020-12-21', personName: '赵总', duration: 3, progress: 0, parent: 2 }
-        timestamp: '2018-04-13'
+        ],
-      }, {
+        links: [
-        content: '创建成功',
+          { id: 1, source: 1, target: 2, type: '0' }
-        timestamp: '2018-04-11'
+        ]
-      }]
+      }
     }
   },
-  watch: {
+  mounted() {
-  },
+    this.init()
-  created() {
   },
   methods: {
+    init() {
+      // gantt.config.order_branch = true;
+      gantt.i18n.setLocale('cn') // 国际化
+      gantt.config.autofit = true // 表格列宽自适应
+      gantt.config.autoscroll = true// 自动滚动
+      gantt.config.autoscroll_speed = 50 // 定义将任务或链接拖出当前浏览器屏幕时自动滚动的速度（以毫秒为单位）
+      gantt.config.autosize = true // 自适应甘特图的尺寸大小, 使得在不出现滚动条的情况下, 显示全部任务
+      // gantt.config.readonly = true // 只读模式
+      gantt.config.fit_tasks = true // 当task的长度改变时，自动调整图表坐标轴区间用于适配task的长度
+      gantt.config.round_dnd_dates = true // 将任务开始时间和结束时间自动“四舍五入”, 从而对齐坐标轴刻度
+      // gantt.config.select_task = false // 任务是否可以点击选中
+      gantt.config.smart_scales = true // 仅仅渲染在屏幕可见的那部分时间轴。在处理时间轴非常长的时候，可以提升性能
+      gantt.config.smart_rendering = true // 按需渲染, 仅仅渲染在屏幕可见的那部分任务和依赖线。这个在显示大量的任务时，性能比较高。
+
+      gantt.config.date_scale = '%Y-%m-%d' // 设置x轴的日期格式
+      gantt.config.xml_date = '%Y-%m-%d'
+      gantt.config.autofit = true
+      // 初始化
+      gantt.init(this.$refs.gantt)
+      // 数据解析
+      gantt.parse(this.tasks)
+    }
   }
 }
 </script>
 
 <style scoped>
-  .topCard{
+  .left-container {
-    margin: 5px;
+    height: 600px;
-    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>
 

src/views/ProcessManagement/MonitoringData/MeasurementDataEquipmentStatusLog.vue

@@ -0,0 +1,236 @@
+<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-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>
+

src/views/ProcessManagement/MonitoringData/index.vue

@@ -10,6 +10,7 @@
       <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-tab-pane label="测量数据设备状态日志" name="10"><MeasurementDataEquipmentStatusLog ref="fresh10"/></el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -24,6 +25,7 @@ import StationStatus from '@/views/ProcessManagement/MonitoringData/StationStatu
 import PalletNo from '@/views/ProcessManagement/MonitoringData/PalletNo.vue'
 import LineHeadStationInformation from '@/views/ProcessManagement/MonitoringData/LineHeadStationInformation.vue'
 import OfflineStation from '@/views/ProcessManagement/MonitoringData/OfflineStation.vue'
+import MeasurementDataEquipmentStatusLog from '@/views/ProcessManagement/MonitoringData/MeasurementDataEquipmentStatusLog.vue'
 export default {
   components: {
     'Operator': Operator,
@@ -34,7 +36,8 @@ export default {
     'StationStatus': StationStatus,
     'PalletNo': PalletNo,
     'LineHeadStationInformation': LineHeadStationInformation,
-    'OfflineStation': OfflineStation
+    'OfflineStation': OfflineStation,
+    'MeasurementDataEquipmentStatusLog': MeasurementDataEquipmentStatusLog
   },
   data() {
     return {

src/views/QualityAssurance/AssemblyQualitydataQuery/index.vue

@@ -52,7 +52,7 @@
               size="mini"/>
           </el-select>
           <span style="margin-left: 10px">总成编号：</span>
-          <el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" filterable clearable size="small" style="width: 240px;">
+          <el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" allow-create filterable clearable size="small" style="width: 240px;">
             <el-option
               v-for="item in assemblyNumber"
               :key="item.value"
@@ -73,6 +73,7 @@
           </el-select>
           <span style="margin-left: 10px">时间：</span>
           <el-date-picker
+            :clearable = "false"
             v-model="dateTime"
             size="small"
             type="daterange"

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: 240px; margin-left: 13px">
+          <el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" allow-create filterable clearable size="small" style="width: 240px; margin-left: 13px">
             <el-option
               v-for="item in assemblyNumber"
               :key="item.ID"
@@ -53,6 +53,7 @@
           </el-select>
           <span style="margin-left: 10px">时间：</span>
           <el-date-picker
+            :clearable = "false"
             v-model="dateTime"
             size="small"
             type="daterange"

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: 240px">
+          <el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" allow-create filterable clearable size="small" style="width: 240px">
             <el-option
               v-for="item in assemblyNumber"
               :key="item.value"
@@ -61,6 +61,7 @@
           </el-select>
           <span style="margin-left: 10px">时间：</span>
           <el-date-picker
+            :clearable = "false"
             v-model="dateTime"
             size="small"
             type="daterange"

src/views/QualityAssurance/LineQualityQuery/index.vue

@@ -38,7 +38,7 @@
               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-select v-model="assemblyNumberValue" placeholder="请选择总成编号" allow-create filterable clearable size="small" style="width: 240px; margin-left: 13px">
             <el-option
               v-for="item in assemblyNumber"
               :key="item.value"
@@ -70,6 +70,7 @@
           </el-select>
           <span style="margin-left: 10px">时间：</span>
           <el-date-picker
+            :clearable = "false"
             v-model="dateTime"
             size="small"
             type="daterange"

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: 240px">
+          <el-select v-model="assemblyNumberValue" placeholder="请选择总成编号" allow-create filterable clearable size="small" style="width: 240px">
             <el-option
               v-for="item in assemblyNumber"
               :key="item.value"
@@ -53,6 +53,7 @@
           </el-select>
           <span style="margin-left: 10px">时间：</span>
           <el-date-picker
+            :clearable = "false"
             v-model="dateTime"
             size="small"
             type="daterange"
@@ -308,6 +309,8 @@ 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]
@@ -332,6 +335,8 @@ 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]
@@ -352,6 +357,8 @@ 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 => {