Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

src/views/Assembly/QualityInspectionInformationInquiry/index.vue

@@ -576,6 +576,7 @@ export default {
       if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check7 = 1 } else { this.check7 = 0 }
       if (this.personNum !== '' && this.personNum !== null) { this.check8 = 1 } else { this.check8 = 0 }
       selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.check7, this.qualityInspectionValue, this.check8, this.personNum, this.pageCurrent, this.pageSize).then(response => {
+        console.log(response.data.rows, 111)
         this.tableData1 = response.data.rows
         this.loading = false
         this.total = response.data.total

src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue

@@ -129,7 +129,8 @@
   </div>
 </template>
 
-<script>import { getData, getData1, getData2, getMachine } from '@/api/ManufacturingCenter/EquipmentConditionAnalysis'
+<script>import { getData, getData1, getData2, getData3, getMachine } from '@/api/ManufacturingCenter/EquipmentConditionAnalysis'
+
 export default {
   data() {
     return {
@@ -137,6 +138,7 @@ export default {
       MachineValue: '',
       MachineValue1: '',
       Machine: [],
+      yAxisValue: [],
       Time: '',
       date1: '',
       date2: '',
@@ -180,6 +182,7 @@ export default {
         this.time2 = response.data.rows[0].等待持续时间
         this.time3 = response.data.rows[0].停机持续时间
       }).then(() => {
+        this.sendMessage()
         this.drawLine1()
       })
       getData1(this.Time).then(response => {
@@ -193,10 +196,40 @@ export default {
     searchData1() {
       getData2(this.MachineValue1, this.date1, this.date2).then(response => {
         this.table = response.data
-        console.log(this.table)
+        console.log(this.table, 222)
       }).then(() => {
         this.drawLine()
       })
+      if (this.date1 === null || this.date2 === null) {
+        this.$message.warning('请选择开始时间或结束时间')
+      } else {
+        const endYear = parseInt(this.date2.split('-')[0])
+        const startYear = parseInt(this.date1.split('-')[0])
+        const endMonth = parseInt(this.date2.split('-')[1])
+        const startMonth = parseInt(this.date1.split('-')[1])
+        const endDate = parseInt(this.date2.split('-')[2])
+        const startDate = parseInt(this.date1.split('-')[2])
+        let diff
+        if ((endMonth - startMonth) === 0) {
+          diff = endDate - startDate
+        }
+        if ((endMonth - startMonth) === 1) {
+          diff = endDate - startDate + 10
+        }
+        if ((endMonth - startMonth) > 1 || (endYear - startYear) !== 0) {
+          diff = 999
+        }
+        if (diff > 6) {
+          this.$message.warning('选择时间区间不得超过6天！')
+        } else {
+          getData3(this.MachineValue1, this.date1, this.date2).then(response => {
+            this.table1 = response.data
+            console.log(this.table1)
+          }).then(() => {
+            this.drawLine3()
+          })
+        }
+      }
     },
     //  绘制图形
     drawLine() {
@@ -204,6 +237,7 @@ export default {
       const xData = []
       const lineData = []
       for (let i = 0; i < this.table.length; i++) {
+        console.log(this.table[i].日期, 1111)
         xData.push(this.table[i].日期.split(' ')[0])
         lineData.push(this.table[i].利用率.toFixed(2))
       }
@@ -332,6 +366,137 @@ export default {
         ]
       })
     },
+    drawLine3() {
+      const _this = this
+      _this.data = []
+      _this.index = 0
+      _this.yAxisValue = []
+      for (let i = 0; i < _this.table1.length; i++) { // 取开始结束时间HH-mm，取状态日期yyyy-MM-dd，持续时间
+        _this.fixDate = _this.table1[0].日期.substr(0, 10)
+        _this.table1[i].开始时间 = _this.fixDate + ' ' + _this.table1[i].开始时间.substr(11, 5)
+        _this.table1[i].结束时间 = _this.fixDate + ' ' + _this.table1[i].结束时间.substr(11, 5)
+        _this.table1[i].日期 = _this.table1[i].日期.substr(0, 10)
+      }
+      if (_this.table1.length === 1) {
+        _this.data.push({
+          itemStyle: { normal: { color: _this.table1[0].颜色 }}, // 条形颜色
+          name: _this.table1[0].状态,
+          value: [0, _this.table1[0].开始时间, _this.table1[0].结束时间]
+        })
+      } else {
+        for (let i = 0; i < _this.table1.length; i++) {
+          if (i < _this.table1.length) {
+            if (i === 0) {
+              _this.index = 0
+              _this.yAxisValue.push(_this.table1[i].日期)
+            } else if (_this.table1[i].日期 !== _this.table1[i - 1].日期) {
+              _this.index++ // y轴索引
+              _this.yAxisValue.push(_this.table1[i].日期)
+            }
+          }
+          _this.data.push({
+            itemStyle: { normal: { color: _this.table1[i].颜色 }}, // 条形颜色
+            name: _this.table1[i].状态,
+            value: [parseInt(_this.index), _this.table1[i].开始时间, _this.table1[i].结束时间]
+          })
+        }
+      }
+      const myChart = _this.$echarts.init(document.getElementById('myChart3'))
+      myChart.clear()
+      myChart.setOption({
+        title: {
+          left: 'center',
+          text: '设备状态分布图'
+        },
+        color: _this.colors,
+        tooltip: { // 提示框
+          formatter(params) {
+            return params.value[1].substr(11, 5) + '~' + params.value[2].substr(11, 5)
+          } // 数据的值
+        },
+        legend: {
+          orient: 'vertical',
+          x: 'left',
+          data: ['运行', '停机', '等待']
+        },
+        dataZoom: [{
+          type: 'inside',
+          start: 0,
+          end: 100
+        }, { // X轴可调
+          xAxisIndex: 0,
+          start: 0,
+          end: 100,
+          handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
+          handleSize: '80%',
+          handleStyle: {
+            color: '#fff',
+            shadowBlur: 3,
+            shadowColor: 'rgba(0, 0, 0, 0.6)',
+            shadowOffsetX: 2,
+            shadowOffsetY: 2
+          }
+        }],
+        grid: { // 绘图网格
+          left: '3%',
+          right: '3%',
+          top: '10%',
+          bottom: '10%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'time',
+          interval: 1000 * 60 * 60 * 2,
+          axisLabel: {
+            formatter(value) {
+              var date = new Date(value)
+              return getzf(date.getHours()) + ':' + getzf(date.getMinutes())
+              function getzf(num) {
+                if (parseInt(num) < 10) {
+                  num = '0' + num
+                }
+                return num
+              }
+            }
+          }
+        },
+        yAxis: {
+          data: _this.yAxisValue
+        },
+        series: [
+          // 用空bar来显示几个图例
+          {
+            type: 'custom', renderItem(params, api) { // 开发者自定义的图形元素渲染逻辑，是通过书写 renderItem 函数实现的
+              var categoryIndex = api.value(0) // 这里使用 api.value(0) 取出当前 dataItem 中第一个维度的数值。
+              var start = api.coord([api.value(1), categoryIndex]) // 这里使用 api.coord(...) 将数值在当前坐标系中转换成为屏幕上的点的像素值。
+              var end = api.coord([api.value(2), categoryIndex])
+              var height = 24 // 柱体宽度
+
+              return {
+                type: 'rect', // 表示这个图形元素是矩形。还可以是 'circle', 'sector', 'polygon' 等等。
+                shape: _this.$echarts.graphic.clipRectByRect({ // 矩形的位置和大小。
+                  x: start[0],
+                  y: start[1] - height / 1,
+                  width: end[0] - start[0],
+                  height: height * 2
+                }, { // 当前坐标系的包围盒。
+                  x: params.coordSys.x,
+                  y: params.coordSys.y,
+                  width: params.coordSys.width,
+                  height: params.coordSys.height
+                }),
+                style: api.style()
+              }
+            },
+            encode: {
+              x: [1, 2], // data 中『维度1』和『维度2』对应到 X 轴
+              y: 0 // data 中『维度0』对应到 Y 轴
+            },
+            data: _this.data
+          }
+        ]
+      })
+    },
     handleSizeChange(val) {
       this.pageCurrent = 1
       this.pageSize = val

src/views/Outsourcing/OutsourcingQCSearch/index.vue

@@ -39,34 +39,49 @@
       </div>
       <el-table v-loading="" :data="tableData2" :summary-method="getSummaries" show-summary border style="width: 100%;min-height: 400px" height="400px" size="mini">
         <el-table-column label="序号" align="center" width="80" type="index"/>
-        <el-table-column label="零件名称" align="center" min-width="120">
+        <el-table-column label="零件名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" align="center" min-width="120">
+        <el-table-column label="零件图号" align="center">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件数量" align="center" width="100">
+        <el-table-column label="零件数量" align="center">
           <template slot-scope="scope">
             {{ scope.row.批次数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="检验数量" align="center" width="100">
+        <el-table-column label="质检人员" align="center">
           <template slot-scope="scope">
-            {{ scope.row.检验数量 || 0 }}
+            {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="不合格数量" align="center" width="100">
+        <el-table-column label="检验数量" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.数量 || 0 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="不合格数量" align="center">
           <template slot-scope="scope">
             {{ scope.row.不合格数量 || 0 }}
           </template>
         </el-table-column>
-        <el-table-column label="检验时间" align="center" min-width="100">
+        <el-table-column label="不合格原因" align="center" width="90px">
           <template slot-scope="scope">
-            {{ scope.row.检验时间 || '—' }}
+            {{ scope.row.不合格原因文本 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="处理结果" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.不合格处理文本 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="检验时间" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.操作时间 || '—' }}
           </template>
         </el-table-column>
         <el-table-column label="形位" align="center" width="100">
@@ -195,7 +210,7 @@ export default {
             sums[index] = 'N/A'
           }
         } else if (index === 4) {
-          const values = data.map(item => Number(item['检验数量']) || 0)
+          const values = data.map(item => Number(item['数量']) || 0)
           if (!values.every(value => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr)

src/views/PurchasingCenter/PurchaseContractReview/index.vue

@@ -28,6 +28,12 @@
         icon="el-icon-search"
         style="margin-left:10px"
         @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        icon="el-icon-search"
+        style="margin-left:10px"
+        @click="sendMessage()">通知</el-button>
     </el-card>
 
     <el-card>
@@ -142,6 +148,7 @@
 
 <script>
 import { initContract, initBuyer, searchTable1, searchTable2, submitApproval } from '@/api/PurchasingCenter/PurchaseContractReview'
+import axios from 'axios'
 
 export default {
   data() {
@@ -218,6 +225,15 @@ export default {
         }
       })
     },
+    // 发送短信
+    sendMessage() {
+      axios.get(`http://192.168.1.231:8411/submit/MESSendMessage.ashx?Uid=liuqinghua&Key=liuqinghua123456&smsMob=18340870479,15140619457&smsText=合同审批： 有合同需要您审批【meswork】`).then(data => {
+        if (data.data === 1) {
+          this.$message.success('通知成功')
+        }
+        console.log(data)
+      })
+    },
     searchTable1() {
       this.tableData2 = []
       this.textarea = ``