From 12334194705079b65b3529b13cdd8b6522af5fcb Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期六, 27 四月 2024 18:00:21 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/mdc/processParam/index.vue | 470 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 277 insertions(+), 193 deletions(-)
diff --git a/src/views/mdc/processParam/index.vue b/src/views/mdc/processParam/index.vue
index 344ed62..912adf6 100644
--- a/src/views/mdc/processParam/index.vue
+++ b/src/views/mdc/processParam/index.vue
@@ -1,7 +1,57 @@
<!--
+ * ......................................&&.........................
+ * ....................................&&&..........................
+ * .................................&&&&............................
+ * ...............................&&&&..............................
+ * .............................&&&&&&..............................
+ * ...........................&&&&&&....&&&..&&&&&&&&&&&&&&&........
+ * ..................&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&..............
+ * ................&...&&&&&&&&&&&&&&&&&&&&&&&&&&&&.................
+ * .......................&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&.........
+ * ...................&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&...............
+ * ..................&&& &&&&&&&&&&&&&&&&&&&&&&&&&&&&&............
+ * ...............&&&&&@ &&&&&&&&&&..&&&&&&&&&&&&&&&&&&&...........
+ * ..............&&&&&&&&&&&&&&&.&&....&&&&&&&&&&&&&..&&&&&.........
+ * ..........&&&&&&&&&&&&&&&&&&...&.....&&&&&&&&&&&&&...&&&&........
+ * ........&&&&&&&&&&&&&&&&&&&.........&&&&&&&&&&&&&&&....&&&.......
+ * .......&&&&&&&&.....................&&&&&&&&&&&&&&&&.....&&......
+ * ........&&&&&.....................&&&&&&&&&&&&&&&&&&.............
+ * ..........&...................&&&&&&&&&&&&&&&&&&&&&&&............
+ * ................&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&............
+ * ..................&&&&&&&&&&&&&&&&&&&&&&&&&&&&..&&&&&............
+ * ..............&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&....&&&&&............
+ * ...........&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&......&&&&............
+ * .........&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&.........&&&&............
+ * .......&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&...........&&&&............
+ * ......&&&&&&&&&&&&&&&&&&&...&&&&&&...............&&&.............
+ * .....&&&&&&&&&&&&&&&&............................&&..............
+ * ....&&&&&&&&&&&&&&&.................&&...........................
+ * ...&&&&&&&&&&&&&&&.....................&&&&......................
+ * ...&&&&&&&&&&.&&&........................&&&&&...................
+ * ..&&&&&&&&&&&..&&..........................&&&&&&&...............
+ * ..&&&&&&&&&&&&...&............&&&.....&&&&...&&&&&&&.............
+ * ..&&&&&&&&&&&&&.................&&&.....&&&&&&&&&&&&&&...........
+ * ..&&&&&&&&&&&&&&&&..............&&&&&&&&&&&&&&&&&&&&&&&&.........
+ * ..&&.&&&&&&&&&&&&&&&&&.........&&&&&&&&&&&&&&&&&&&&&&&&&&&.......
+ * ...&&..&&&&&&&&&&&&.........&&&&&&&&&&&&&&&&...&&&&&&&&&&&&......
+ * ....&..&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&...........&&&&&&&&.....
+ * .......&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&..............&&&&&&&....
+ * .......&&&&&.&&&&&&&&&&&&&&&&&&..&&&&&&&&...&..........&&&&&&....
+ * ........&&&.....&&&&&&&&&&&&&.....&&&&&&&&&&...........&..&&&&...
+ * .......&&&........&&&.&&&&&&&&&.....&&&&&.................&&&&...
+ * .......&&&...............&&&&&&&.......&&&&&&&&............&&&...
+ * ........&&...................&&&&&&.........................&&&..
+ * .........&.....................&&&&........................&&....
+ * ...............................&&&.......................&&......
+ * ................................&&......................&&.......
+ * .................................&&..............................
+ * ..................................&..............................
+ -->
+
+<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-24 23:41:35
+ * @LastEditTime: 2024-04-26 21:23:30
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/processParam/index.vue
瀹炴椂鐪嬫澘
-->
@@ -23,7 +73,7 @@
<el-main v-show="list.length > 0">
<el-row>
<el-col :span="4">
- <el-switch v-model="isShowTable" class="mb-2" active-text="鏁版嵁琛�" inactive-text="缁熻鍥�" />
+ <!-- <el-switch v-model="isShowTable" class="mb-2" active-text="鏁版嵁琛�" inactive-text="缁熻鍥�" /> -->
</el-col>
<el-col :span="20" style='text-align: right;'>
<el-date-picker :max-range="3" :clearable="false" value-format="YYYY-MM-DD"
@@ -33,31 +83,37 @@
</el-col>
</el-row>
<TimeLine v-model="timeRange" ref="timeLine"></TimeLine>
- <el-collapse v-model="activeList" accordion>
+ <el-collapse v-model="activeList">
<el-collapse-item :title="item.description" :name="index" v-for="(item, index) in list"
:key="index">
- <div>
- <el-button>鏌ョ湅鏁版嵁</el-button>
+ <div
+ v-if="(['DeviceStatus', 'ProcessProgram'].includes(item.name) && item?.dayCharts?.series?.length > 1) || (!['DeviceStatus', 'ProcessProgram'].includes(item.name) && item?.dayCharts?.series?.length > 0) && activeList.indexOf(index) > -1">
+ <div>
+ <el-button size="small" @click="viewData(item)">鏌ョ湅鏁版嵁</el-button>
+ </div>
+ <scEcharts style="width:100%" height="200px" :option="item?.dayCharts">
+ </scEcharts>
</div>
- <scEcharts style="width:100%" height="300px" :option="dayCharts">
- </scEcharts>
- <!-- <scTable v-show="isShowTable" ref="table0" row-key="id" border :apiObj="item.apiObj"
- stripe>
- <el-table-column prop="alarmCode" label="鎶ヨ浠ｇ爜" />
- <el-table-column prop="alarmMsg" label="鎶ヨ淇℃伅" />
- <el-table-column prop="count" label="鎶ヨ娆℃暟" />
- </scTable> -->
+ <el-empty v-else description="鏆傛棤鏁版嵁" />
</el-collapse-item>
</el-collapse>
</el-main>
<el-main v-show="list.length == 0">
- <!-- <el-empty description="鏆傛棤鏁版嵁" /> -->
- <scEcharts style="width:100%" height="300px" :option="dayCharts">
- </scEcharts>
+ <el-empty description="鏆傛棤鏁版嵁" />
</el-main>
</el-container>
</el-container>
</el-card>
+ <el-drawer v-model="drawer" direction="rtl">
+ <template #default>
+ <div>
+ <el-table :data="tableData" v-if="drawer" border stripe>
+ <el-table-column prop="time" label="鏃堕棿" />
+ <el-table-column prop="value" :label="drawerName" />
+ </el-table>
+ </div>
+ </template>
+ </el-drawer>
</el-main>
</template>
@@ -66,94 +122,7 @@
import scEcharts from '@/components/scEcharts';
import TimeLine from './TimeLine.vue'
import MYTree from '../MYTree.vue'
-const rawData = [
- [100],
- [320],
- [220],
- [150],
- [820]
-]
-const totalData = [];
-for (let i = 0; i < rawData[0].length; ++i) {
- let sum = 0;
- for (let j = 0; j < rawData.length; ++j) {
- sum += rawData[j][i];
- }
- totalData.push(sum);
-}
-const series = [
- '杩愯',
- '杩愯',
- '杩愯',
- '寰呮満',
- '杩愯'
-].map((name, sid) => {
- return {
- name,
- type: 'bar',
- stack: 'total',
- barWidth: '20px',
- label: {
- show: true,
- formatter: (params) => Math.round(params.value * 1000) / 10 + '%'
- },
- data: rawData[sid].map((d, did) =>
- totalData[did] <= 0 ? 0 : d / totalData[did]
- )
- };
-});
-// let data = {
-// "collectItem": "璁惧鐘舵��",
-// "collectRealItem": "DeviceStatus",
-// "data": [
-// {
-// "time": "2024-04-24 10:00:00",
-// "name": "杩愯",
-// "color": "#73D13D",
-// "value": "2"
-// },
-// {
-// "time": "2024-04-24 10:30:00",
-// "name": "杩愯",
-// "color": "#73D13D",
-// "value": "2"
-// },
-// {
-// "time": "2024-04-24 11:00:00",
-// "name": "杩愯",
-// "color": "#73D13D",
-// "value": "2"
-// },
-// {
-// "time": "2024-04-24 11:30:00",
-// "name": "寰呮満",
-// "color": "#FFC53D",
-// "value": "3"
-// },
-// {
-// "time": "2024-04-24 12:00:00",
-// "name": "寰呮満",
-// "color": "#FFC53D",
-// "value": "3"
-// }
-// ]
-// }
-// const series = data.data.map(item => ({
-// name: item.name,
-// label: {
-// show: true,
-// },
-// barWidth: '20px',
-// type: 'bar',
-// stack: 'duration',
-// itemStyle: {
-// color: item.color,
-// borderColor: item.color,
-// },
-// zlevel: -1,
-// data: [item.time]
-// }))
-console.log('>>>>>>>>????', series)
+
export default {
components: {
TimeLine,
@@ -168,14 +137,20 @@
this.query()
},
timeRange(val) {
- console.log(val, '>>>>>>>???/')
+ this.queryChart()
}
},
data() {
return {
+ legend: [],
+ drawer: false,
+ drawerName: '',
+ tableData: [],
+ tableCol: [
+ ],
isShowTable: false,
list: [],
- activeList: [0],
+ activeList: [0, 1, 2, 3, 4, 5, 6, 7, 8],
timeRange: '',
treeChecked: [],
timeStart: moment().format('YYYY-MM-DD'),
@@ -185,33 +160,51 @@
let min = moment(this.timeStart, 'YYYY-MM-DD').subtract(3, 'd').format('YYYY-MM-DD')
return !moment(Date).isBetween(min, max);
},
- dayCharts: {
- legend: [
- ],
- title: {
- text: '璁惧鐘舵�佺粺璁″浘',
- subtext: '',
- },
- yAxis: {
- type: 'category',
- data: ['']
- },
- xAxis: {
- type: 'value',
- },
- series
- }
}
},
created() {
- console.log('---------')
- console.log(series)
+ // console.log(series)
+ this.init()
},
methods: {
init() {
this.$HTTP.get('/api/blade-mdc/process-parameter').then(res => {
if (res.code === 200) {
this.legend = res.data
+ }
+ })
+ },
+ viewData(item) {
+ let data = {
+ FeedOverride: '杩涚粰鍊嶇巼',
+ FeedSpeed: '杩涚粰閫熷害',
+ SpindleOverride: '涓昏酱鍊嶇巼',
+ SpindleSpeed: '涓昏酱杞��',
+ Output: '浜ч噺',
+ ProcessProgram: '绋嬪簭鍚�',
+ DeviceStatus: '璁惧鐘舵��',
+ }
+ this.drawerName = data[item.name]
+
+ this.$HTTP.post('/api/blade-mdc/process-parameter/item?current=1&size=1500', {
+ endTime: this.timeRange.endTime,
+ startTime: this.timeRange.startTime,
+ item: item.name,
+ methodEnum: "HOUR",
+ workstationId: this.treeChecked.toString(),
+ workstationName: ''
+ }).then(res => {
+ if (res.code === 200) {
+ if (item.name !== 'DeviceStatus') {
+ this.tableData = res.data.records
+ }
+ this.tableData = res.data.records.map(item => {
+ return {
+ ...item,
+ value: this.legend.find(v => v.code === item.value)?.name
+ }
+ })
+ this.drawer = true
}
})
},
@@ -223,81 +216,172 @@
this.$HTTP.get('/api/blade-mdc/process-parameter/param', { workstationId: this.treeChecked.toString() }).then(res => {
if (res.code === 200) {
this.list = res.data
- // this.queryChart(res.data[0])
+ this.queryChart()
}
})
},
- queryChart(dmpDTO) {
- // this.$HTTP.post('/api/blade-mdc/process-parameter/chart/dmp-item', {
- // methodEnum: "HOUR",
- // startTime: this.timeRange.startTime,
- // endTime: this.timeRange.endTime,
- // workstationId: this.treeChecked.toString(),
- // dmpDTO
- // })
- let data = {
- "collectItem": "璁惧鐘舵��",
- "collectRealItem": "DeviceStatus",
- "data": [
+ queryChart() {
+ this.list.forEach(item => {
+ this.queryChart1(item)
+ })
+ },
+ queryChart1(item) {
+ let index = this.list.findIndex(item => item.name === 'DeviceStatus')
+ this.list[index] = Object.assign({
+ ...this.list[index],
+ dayCharts: {}
+ })
+ this.$HTTP.post('/api/blade-mdc/process-parameter/chart/dmp-item', {
+ methodEnum: "HOUR",
+ startTime: this.timeRange.startTime,
+ endTime: this.timeRange.endTime,
+ workstationId: this.treeChecked.toString(),
+ workstationName: '',
+ dmpDTO: {
+ id: this.treeChecked.toString(),
+ dmpDeviced: item.dmpDeviceId,
+ name: item.name,
+ description: item.description,
+ dataType: item.dataType,
+ wcsDataType: item.wcsDataType,
+ processParameter: item.processParameter
+ }
+ }).then(res => {
+ if (['DeviceStatus', 'ProcessProgram'].includes(item.name)) {
+ this.setDeviceStatusOptions(res.data, item.name)
+ } else {
+ this.setLineOptions(res.data.data, item.name)
+ }
+ })
+ },
+ setLineOptions(data, myname) {
+ console.log(data, myname)
+ let xAxis = data.map(item => {
+ return item.time
+ })
+ let yAxisData = data.map(item => {
+ return item.value
+ })
+ let dayCharts = {
+ tooltip: {
+ position: ['50%', '50%']
+ },
+ legend: [
+ ],
+ title: {
+ text: '',
+ subtext: '',
+ },
+ yAxis: {
+ type: 'value',
+ },
+ series: [
{
- "time": "2024-04-24 10:00:00",
- "name": "杩愯",
- "color": "#73D13D",
- "value": "2"
- },
- {
- "time": "2024-04-24 10:30:00",
- "name": "杩愯",
- "color": "#73D13D",
- "value": "2"
- },
- {
- "time": "2024-04-24 11:30:00",
- "name": "杩愯",
- "color": "#73D13D",
- "value": "2"
- },
- {
- "time": "2024-04-24 11:40:00",
- "name": "寰呮満",
- "color": "#FFC53D",
- "value": "3"
- },
- {
- "time": "2024-04-24 12:00:00",
- "name": "寰呮満",
- "color": "#FFC53D",
- "value": "3"
- },
- {
- "time": "2024-04-24 12:00:00",
- "name": "杩愯",
- "color": "#73D13D",
- "value": "2"
+ data: yAxisData,
+ type: 'line',
+
}
- ]
+ ],
+ xAxis: {
+ type: 'category',
+ data: xAxis
+ },
}
- // {
- // name: '杩愯',
- // type: 'bar',
- // stack: 'duration',
- // itemStyle: {
- // color: '#007acc',
- // borderColor: '#fff',
- // borderWidth: 1
- // },
- // zlevel: -1,
- // data: ['2024-04-24 10:00:00'] // 缁撴潫鏃堕棿
- // }
- // this.dayCharts.series = [...data.data.map(item => ({
- // name: item.name,
- // stack: 'duration',
- // itemStyle: {
- // color: item.color,
- // },
- // zlevel: -1,
- // data: [item.time]
- // }))]
+ if (yAxisData?.length == 0) {
+ let index = this.list.findIndex(item => item.name === myname)
+ this.list[index] = Object.assign({
+ ...this.list[index],
+ dayCharts: {}
+ })
+ } else {
+ console.log(myname, '>>>>>>???????????>>>>>>', yAxisData)
+ let index = this.list.findIndex(item => item.name === myname)
+ this.list[index] = Object.assign({
+ ...this.list[index],
+ dayCharts
+ })
+ }
+
+ },
+ setDeviceStatusOptions(data, myname) {
+ let total = Math.abs(moment(this.timeRange.startTime).diff(moment(this.timeRange.endTime)))
+ let start = this.timeRange.startTime
+ let len = data.data.length
+ if (moment(data.data[len - 1].time).unix() < moment(this.timeRange.endTime).unix()) {
+ let addItem = {
+ time: this.timeRange.endTime,
+ value: data.data[len - 1].value
+ }
+ data.data.push(addItem)
+ }
+ let series = data.data.map((item, i) => {
+ let current = Math.abs(moment(start).diff(moment(item.time)))
+ start = item.time
+ let name = i === 0 ? '' : data.data[i - 1].name
+ if (myname === 'ProcessProgram') {
+ name = item.value
+ }
+ // let color = !name ? 'transparent' : data.data[i - 1].color
+ return {
+ name,
+ type: 'bar',
+ stack: 'total',
+ barWidth: '20px',
+ data: [current / total],
+ label: {
+ show: true,
+ position: 'insideLeft',
+ color: '#FFF',
+ formatter: params => {
+ if (i == 0 || current === 0) return ''
+ return `${name}:寮�濮嬫椂闂�${moment(data.data[i - 1].time).format('HH:mm')}-${moment(item.time).format('HH:mm')}`
+ }
+ },
+ itemStyle: {
+ // color, // 杩欎竴琛屽浐瀹氱殑棰滆壊鍊奸渶瑕佸垹闄ゆ垨娉ㄩ噴
+ borderColor: '#FFF',
+ borderWidth: 1
+ },
+ }
+ })
+ let dayCharts = {
+ // tooltip: {
+ // position: ['50%', '50%'],
+ // formatter: (value, ticket) => {
+ // console.log('>>>>>>>>>>>>____________', value, ticket)
+ // let add = Math.abs(moment(this.timeRange.startTime).diff(moment(this.timeRange.endTime))) * value
+ // let current = moment(this.timeRange.startTime).add(add, 'ms')
+ // return current.format('HH:mm')
+ // }
+ // },
+ legend: [
+ ],
+ title: {
+ text: '',
+ subtext: '',
+ },
+ yAxis: {
+ type: 'category',
+ data: ['']
+ },
+ series,
+ xAxis: {
+ type: 'value',
+ interval: 0.05,
+ axisLabel: {
+ formatter: (value, index) => {
+ let add = Math.abs(moment(this.timeRange.startTime).diff(moment(this.timeRange.endTime))) * value
+ let current = moment(this.timeRange.startTime).add(add, 'ms')
+ return current.format('HH:mm')
+ }
+ },
+ },
+ }
+ let index = this.list.findIndex(item => item.name === myname)
+ this.list[index] = Object.assign({
+ ...this.list[index],
+ dayCharts
+ })
},
change(e) {
this.timeStart = e[0] || moment().format('YYYY-MM-DD')
--
Gitblit v1.9.3