From b4d09a09d2a8ffc939e97f8b400ff94a64d13eb7 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 04 三月 2024 17:46:01 +0800
Subject: [PATCH] 优化用户管理页面表单填写界面选择设备功能，车间重新选择后重置选择设备
---
src/views/WorkshopSignage.vue | 602 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 436 insertions(+), 166 deletions(-)
diff --git a/src/views/WorkshopSignage.vue b/src/views/WorkshopSignage.vue
index fc8a61f..c803017 100644
--- a/src/views/WorkshopSignage.vue
+++ b/src/views/WorkshopSignage.vue
@@ -1,210 +1,451 @@
<template>
<dv-full-screen-container class="full-screen-container">
- <header class="page-header">
- {{getWorkshopName}}
- <div class="header-right">
- <a-button type="primary" icon="save" size="large" @click="saveDevicePositionAndSizeByApi"
- v-has="'home:saveDevicePositionAndSize'">淇濆瓨浣嶇疆
- </a-button>
- </div>
- </header>
+ <div>
+ <!--椤靛ご鍖哄煙-->
+ <header class="page-header" :style="{height: pageHeaderHeight+'px'}">
+ <a-row style="height: 100%">
+ <a-col :span="7" class="header-left">
+ <a-space>
+ <span v-if="!isSwitchChecked">寮�鍚姛鑳�</span>
+ <span v-else>鍏抽棴鍔熻兘</span>
+ <a-switch
+ checked-children="寮�"
+ un-checked-children="鍏�"
+ @change="handleSwitchChange"
+ v-model="isSwitchChecked"
+ :disabled="isSwitchChecked"
+ />
+ <a-button type="primary" icon="save" size="large" @click="saveDevicePositionAndSizeByApi">淇濆瓨浣嶇疆</a-button>
+ </a-space>
+ </a-col>
- <dv-border-box-8 class="content-container">
- <VueDragResize v-for="(item,index) in deviceList" :key="item.equipmentId" :w="item.vw"
- :h="item.vh" :x="item.left" :y="item.top"
- v-on:resizing="resize($event,index)"
- v-on:dragging="resize($event,index)"
- :parentLimitation="true"
- :minw="100"
- :minh="100"
- :id="item.equipmentId"
- :stickSize="6"
- >
- <div class="single-device"
- :style="{width: item.vw+ 'px',height:item.vh+'px'}">
- <div class="device-status">
- <div v-if="item.status==0"
- :style="{backgroundImage:`url(${require('@/assets/yellow.png')})`}" class="status-image"></div>
- <div v-if="item.status==1" :style="{backgroundImage:`url(${require('@/assets/red.png')})`}"
- class="status-image"></div>
- <div v-if="item.status==2" :style="{backgroundImage:`url(${require('@/assets/gray.png')})`}"
- class="status-image"></div>
- <div v-if="item.status==3" :style="{backgroundImage:`url(${require('@/assets/green.png')})`}"
- class="status-image"></div>
- <div
- :style="{backgroundImage:`url(${item.equipmentImageUrl})`}" class="device-image"></div>
+ <a-col :span="10" class="workshop-name">{{ workshopDetails.workshopName }}</a-col>
+
+ <a-col :span="7" class="device-status-info">
+ <!--<a-space v-for="item in deviceStatusList" :key="item.value" class="single-status-info"-->
+ <!--@click="handleScreenDevive(item)">-->
+ <!--<div :style="{color:item.checked?'#1890FF':'#fff'}">{{ item.label }}</div>-->
+ <!--<div class="status-square" :style="{ backgroundColor: item.color }"></div>-->
+ <!--<!–<a-checkbox :checked="item.checked" @change="checkboxChange(item)"></a-checkbox>–>-->
+ <!--<div>{{getDeviceNumberByStatus(item.value) }}</div>-->
+ <!--</a-space>-->
+ <a-space v-for="item in deviceStatusList" :key="item.value" class="single-status-info">
+ <div :style="{color:item.checked?'#1890FF':'#fff'}">{{ item.label }}</div>
+ <div class="status-square" :style="{ backgroundColor: item.color }"></div>
+ <!--<a-checkbox :checked="item.checked" @change="checkboxChange(item)"></a-checkbox>-->
+ <div>{{getDeviceNumberByStatus(item.value) }}</div>
+ </a-space>
+ </a-col>
+ </a-row>
+ </header>
+
+ <!--鎷栨嫿璁惧鍖哄煙-->
+ <div class="content-container" ref="deviceContainerRef" style="overflow: auto">
+ <img :src="imgSrc" width="1920" height="900">
+ <div class="guideline guidelineX" :style="{top:guidelineXTop+'px',display:showGuideline}"></div>
+ <div class="guideline guidelineY" :style="{left:guidelineYLeft+'px',display:showGuideline}"></div>
+ <VueDragResize
+ v-for="(item, index) in deviceList"
+ :key="item.equipmentId"
+ :w="item.vw"
+ :h="item.vh"
+ :x="item.coordinateLeft"
+ :y="item.coordinateTop"
+ v-on:resizing="resize($event, index)"
+ v-on:dragging="resize($event, index)"
+ :parentLimitation="parentLimitation"
+ :parentH="parentH"
+ :parentW="parentW"
+ :minw="70"
+ :minh="70"
+ :isDraggable="isDraggable"
+ :isResizable="isResizable"
+ :stickSize="6"
+ @deactivated="showGuideline = 'none'"
+ >
+ <div class="single-device" :style="{ width: item.vw + 'px', height: item.vh + 'px' }"
+ @click="openDetail(item)">
+ <div class="device-status">
+ <div
+ v-if="item.equipmentStatus == 2 || item.equipmentStatus == 1"
+ :style="{ backgroundImage: `url(${require('@/assets/yellow.png')})` }"
+ class="status-image"
+ ></div>
+ <div
+ v-if="item.equipmentStatus == 22"
+ :style="{ backgroundImage: `url(${require('@/assets/red.png')})` }"
+ class="status-image"
+ ></div>
+ <div
+ v-if="item.equipmentStatus == 0"
+ :style="{ backgroundImage: `url(${require('@/assets/gray.png')})` }"
+ class="status-image"
+ ></div>
+ <div
+ v-if="item.equipmentStatus == 3"
+ :style="{ backgroundImage: `url(${require('@/assets/green.png')})` }"
+ class="status-image"
+ ></div>
+ <div
+ :style="{ backgroundImage: `url(${getImgView(item.equipmentImage) || require('@/assets/8.png')})` }"
+ class="device-image"
+ ></div>
+ </div>
+ <div class="device-id" id="deviceId"
+ :style="{ color:workshopDetails.equipmentIdColor }">
+ {{ item.equipmentId }}
+ </div>
</div>
- <div class="device-id" :style="{fontSize: item.fontSize+'px'}">
- {{item.equipmentId}}
- </div>
- </div>
- </VueDragResize>
- <div class="device-status-info">
- <div v-for="item in deviceStatusList" :key="item.value" class="single-status-info">
- <div>{{item.label}}</div>
- <div class="status-square" :style="{backgroundColor:item.color}"></div>
- <div>{{getDeviceNumberByStatus(item.value)}}</div>
- </div>
+ </VueDragResize>
</div>
- </dv-border-box-8>
+
+ <EquipmentDetailModal ref="EquipmentDetailModal"></EquipmentDetailModal>
+ </div>
</dv-full-screen-container>
</template>
<script>
import VueDragResize from 'vue-drag-resize'
+ import api from '@/api/mdc'
+ import { getFileAccessHttpUrl } from '@/api/manage'
+ import EquipmentDetailModal from './mdc/base/modules/WorkshopSignage/EquipmentDetailModal'
+ import { message } from 'ant-design-vue'
+
+ message.config({
+ maxCount: 3
+ })
export default {
components: {
- VueDragResize
+ VueDragResize,
+ EquipmentDetailModal
},
data() {
return {
- // 璁惧淇℃伅鍒楄〃
+ pageHeaderHeight: 80,// 椤靛ご楂樺害
+ workshopDetails: {}, // 杞﹂棿璇︾粏淇℃伅,
+ isDraggable: false, // 鏄惁寮�鍚嫋鎷�
+ isResizable: false, // 鏄惁寮�鍚缉鏀�
+ isSwitchChecked: false, // 鏄惁寮�鍚姛鑳�
+ timingAcquisition: null, // 瀹氭椂鍒锋柊鏄惁寮�鍚�
+ parentH: 5000,//鐖剁骇楂樺害
+ parentW: 1920,//鐖剁骇瀹藉害
+ showGuideline: 'none',
+ guidelineXTop: 0,
+ guidelineYLeft: 0,
deviceList: [
- {
- equipmentId: '123213213123232',// 璁惧ID
- equipmentImageUrl: require('@/assets/8.png'), // 璁惧鍥剧墖
- top: 200, // 鎷栨嫿鍏冪礌璺濈洅瀛愰《璺濈
- left: 100, // 鎷栨嫿鍏冪礌璺濈洅瀛愬乏渚ц窛绂�
- vw: 100, // 缂╂斁鍏冪礌瀹藉害
- vh: 100, // 缂╂斁鍏冪礌楂樺害
- fontSize: 12, // 缂╂斁鍏冪礌瀛椾綋澶у皬
- status: 1 // 璁惧鐘舵�� 0:寰呮満 1:鎶ヨ 2:鍏虫満 3:杩愯
- },
- {
- equipmentId: '512346789561232',
- equipmentImageUrl: require('@/assets/8.png'),
- top: 500,
- left: 753,
- vw: 100,
- vh: 100,
- fontSize: 12,
- status: 0
- },
- {
- equipmentId: '64746965647653',
- equipmentImageUrl: require('@/assets/8.png'),
- top: 300,
- left: 860,
- vw: 100,
- vh: 100,
- fontSize: 12,
- status: 2
- },
- {
- equipmentId: '33548976965462',
- equipmentImageUrl: require('@/assets/8.png'),
- top: 100,
- left: 380,
- vw: 100,
- vh: 100,
- fontSize: 12,
- status: 3
- },
- {
- equipmentId: '85484913549253',
- equipmentImageUrl: require('@/assets/8.png'),
- top: 200,
- left: 1500,
- vw: 100,
- vh: 100,
- fontSize: 12,
- status: 2
- }
- ],
- // 璁惧鐘舵�佹寚绀虹伅鍒楄〃
+ // {
+ // equipmentId: '123213213123232',// 璁惧ID
+ // equipmentImage: require('@/assets/8.png'), // 璁惧鍥剧墖
+ // coordinateTop: 200, // 鎷栨嫿鍏冪礌璺濈洅瀛愰《璺濈
+ // coordinateLeft: 100, // 鎷栨嫿鍏冪礌璺濈洅瀛愬乏渚ц窛绂�
+ // vw: 100, // 缂╂斁鍏冪礌瀹藉害
+ // vh: 100, // 缂╂斁鍏冪礌楂樺害
+ // equipmentStatus: 1 // 璁惧鐘舵�� 0:鍏虫満 22:鎶ヨ 2:寰呮満 3:杩愯 寮�鏈�:1锛堟病鏈夊洓鑹茬伅鏍囪瘑褰掍负寰呮満锛�
+ // }
+ ], // 璁惧淇℃伅鍒楄〃
+ deviceList_copy: [],
deviceStatusList: [
+ // {
+ // label: '鍏ㄩ儴',
+ // value: 99,
+ // color: '#fff',
+ // checked: true
+ // },
{
label: '鍏虫満',
- value: 2,
- color: '#A8A8A8'
+ value: 0,
+ color: '#A8A8A8',
+ checked: false
},
{
label: '寰呮満',
- value: 0,
- color: '#FFFF00'
+ value: 2,
+ color: '#FFFF00',
+ checked: false
},
{
label: '杩愯',
value: 3,
- color: '#00EE00'
+ color: '#00EE00',
+ checked: false
},
{
label: '鎶ヨ',
- value: 1,
- color: '#FF0000'
+ value: 22,
+ color: '#FF0000',
+ checked: false
}
- ]
+ ],// 璁惧鐘舵�佹寚绀虹伅鍒楄〃锛�
+ windowHeight: null,// 褰撳墠娴忚鍣ㄥ彲瑙嗗尯鍩熼珮搴︼紙锛堜笉鍖呮嫭宸ュ叿鏍忋�佷功绛俱�佸簳閮ㄤ换鍔℃爮锛�
+ isFullScreen: false,// 杩涘叆鐪嬫澘椤甸潰鏃舵槸鍚︿负鍏ㄥ睆妯″紡锛屼笉鍖呮嫭姝ｅ父妯″紡杩涘叆鍚庡垏鎹负鍏ㄥ睆妯″紡
+ parentLimitation: false,// 鎷栨嫿鍖哄煙鏄惁闄愬埗鍦ㄧ埗鍏冪礌鍖哄煙鍐�,
+ checkedStatusCount: null,// 宸插嬀閫夌瓫閫夌姸鎬佷釜鏁�
+ imgSrc: ''// 杞﹂棿鍥剧焊鍦板潃
}
},
- computed: {
- getWorkshopName() {
- switch (this.$route.params.workshopId) {
- case '5321':
- return '闀挎矙杞﹂棿'
- case '6312':
- return '澶╂触杞﹂棿'
- case '3463':
- return '姝︽眽杞﹂棿'
- case '8421':
- return '鍖椾含杞﹂棿'
- default:
- return '娴嬭瘯杞﹂棿'
- }
+ watch: {
+ isSwitchChecked: {
+ handler(newVal) {
+ if (!newVal) {
+ console.log('瀹氭椂鍣ㄥ紑鍚腑')
+ this.timingAcquisition = setInterval(() => {
+ this.getDeviceListByApi(this.$route.params.id)
+ }, 2000)
+ } else {
+ console.log('鍏抽棴瀹氭椂鍣�')
+ clearInterval(this.timingAcquisition)
+ this.timingAcquisition = null
+ }
+ },
+ immediate: true
}
},
methods: {
/**
* 閫氳繃杞﹂棿Id璋冪敤鎺ュ彛鑾峰彇璁惧淇℃伅鍒楄〃
- * @param workshopId 杞﹂棿Id
+ * @param id 杞﹂棿Id
*/
- getDeviceListByApi(workshopId) {
- console.log('杞﹂棿Id', workshopId)
+ getDeviceListByApi(id) {
+ console.log('閲嶆柊鍒锋柊')
+ api.getDeviceListInWorkshopSignagePageApi(id).then((res) => {
+ if (res.result && res.result.length > 0) {
+ this.deviceList = res.result
+ this.deviceList_copy = res.result
+ }
+ })
},
+
+ /**
+ * 閫氳繃杞﹂棿Id璋冪敤鎺ュ彛鑾峰彇杞﹂棿璇︾粏淇℃伅
+ * @param id 杞﹂棿Id
+ */
+ getWorkshopDetailsByApi(id) {
+ api.getWorkshopDetailByWorkshopIdApi(id).then((res) => {
+ this.workshopDetails = res.result
+ // this.$refs.deviceContainerRef.style.backgroundImage = `url(${this.getImgView(
+ // this.workshopDetails.backgroundImage
+ // )})`
+ this.imgSrc = this.getImgView(this.workshopDetails.backgroundImage)
+ this.$refs.deviceContainerRef.style.height = (this.windowHeight - this.pageHeaderHeight) + 'px'
+ // this.parentH = this.windowHeight - this.pageHeaderHeight
+ this.parentH = 900
+ this.parentLimitation = true // 鍦ㄧ埗鍏冪礌楂樺害璁剧疆鍚庡啀璁剧疆闄愬埗鎷栨嫿鍖哄煙锛屼笉杩欐牱鏈夋鐜囧鑷寸埗鍏冪礌楂樺害鏈缃氨闄愬埗鎷栨嫿
+ })
+ },
+
+ /**
+ * 鍥剧墖棰勮
+ * @param text 鍥剧墖鍦板潃
+ */
+ getImgView(text) {
+ if (text && text.indexOf(',') > 0) {
+ text = text.substring(0, text.indexOf(','))
+ }
+ return getFileAccessHttpUrl(text)
+ },
+
/**
* 鐐瑰嚮淇濆瓨鎸夐挳璋冪敤鎺ュ彛淇濆瓨鎷栨嫿鍚庣殑浣嶇疆涓庤澶囧浘鏍囧昂瀵�
*/
saveDevicePositionAndSizeByApi() {
- console.log('淇濆瓨浣嶇疆')
+ console.log('瑙﹀彂淇濆瓨')
+ if (this.isOperatingDevice) {
+ api.saveDevicePositionAndSizeApi(this.deviceList).then((res) => {
+ if (res.code === 200) {
+ this.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ this.isOperatingDevice = false
+ if (this.isSwitchChecked) {
+ this.isSwitchChecked = false
+ this.isResizable = !this.isResizable
+ this.isDraggable = !this.isDraggable
+ }
+ this.getDeviceListByApi(this.$route.params.id)
+ }
+ })
+ } else {
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: '璇峰紑鍚姛鑳藉悗鍐嶈繘琛屼繚瀛�'
+ })
+ }
},
+
/**
* 璁惧鎷栨嫿鎴栫缉鏀炬椂瑙﹀彂浜嬩欢
* @param newRect 鎷栨嫿鎴栫缉鏀惧悗鐨勫昂瀵稿強璺濈
* @param index 鎷栨嫿璁惧鍦ㄦ暟缁勪腑鐨勪笅鏍�
*/
resize(newRect, index) {
- console.log('newRect', newRect)
- if (newRect.width > 100) {
- if (newRect.width / newRect.height < 2) {
- this.deviceList[index].fontSize = newRect.width / 10
- } else {
- this.deviceList[index].fontSize = newRect.height / 5
- }
- } else {
- this.deviceList[index].fontSize = 12
- }
+ // if (newRect.width > 100) {
+ // if (newRect.width / newRect.height < 2) {
+ // this.deviceList[index].fontSize = newRect.width / 10
+ // } else {
+ // this.deviceList[index].fontSize = newRect.height / 5
+ // }
+ // } else {
+ // this.deviceList[index].fontSize = 12
+ // }
+ this.showGuideline = 'block'
this.deviceList[index].vw = newRect.width
this.deviceList[index].vh = newRect.height
- this.deviceList[index].top = newRect.top
- this.deviceList[index].left = newRect.left
+ this.deviceList[index].coordinateTop = newRect.top
+ this.deviceList[index].coordinateLeft = newRect.left
+ this.guidelineXTop = newRect.top + newRect.height / 2
+ this.guidelineYLeft = newRect.left + newRect.width / 2
},
+
/**
* 鏍规嵁璁惧鐘舵�佸�艰幏鍙栧搴旇澶囨暟閲�
* @param value 璁惧鐘舵�佸��
* @returns {number} 璁惧鏁伴噺
*/
getDeviceNumberByStatus(value) {
- return this.deviceList.filter(item => item.status === value).length
+ if (value === 99) return this.deviceList_copy.length
+ return this.deviceList_copy.filter((item) => item.equipmentStatus === value).length
+ },
+
+ /**
+ * 寮�鍚姛鑳借Е鍙戜簨浠�
+ * @param checked 褰撳墠switch鐘舵�侊紝鏄惁寮�鍚紝鍒濆涓篺alse
+ */
+ handleSwitchChange(checked) {
+ this.isOperatingDevice = true
+ this.isResizable = !this.isResizable
+ this.isDraggable = !this.isDraggable
+ },
+
+ openDetail(item) {
+ if (!this.isSwitchChecked) {
+ if (item.equipmentStatus == 0) {
+ this.$message.warning('璁惧澶勪簬鍏虫満鐘舵�侊紒')
+ return false
+ }
+ console.log(item)
+ console.log(this.$refs.EquipmentDetailModal)
+ this.$refs.EquipmentDetailModal.initData(item.equId)
+ this.$refs.EquipmentDetailModal.timerModel(item.equId)
+ // this.equipMessageTimer = setInterval(() => {
+ // setTimeout( this.$refs.equmentDetaiModel.initData(item.equipmentId),0)
+ // },1000*10)
+ }
+ },
+
+ /**
+ * 娴忚鍣ㄥ昂瀵稿彂鐢熸敼鍙樻椂瑙﹀彂
+ */
+ handleWindowSizeChange() {
+ // this.isFullScreen = !this.isFullScreen
+ // if (!this.isFullScreen) location.reload() // 濡傛灉涓哄叏灞忔ā寮忥紝鍒欏湪鍒囨崲妯″紡鏃堕噸鏂板姞杞介〉闈互閲嶆柊鑾峰彇娴忚鍣ㄥ彲瑙嗗尯鍩熼珮搴�
+ const windowHeight =
+ window.innerHeight ||
+ document.documentElement.clientHeight ||
+ document.body.clientHeight
+ // this.parentH = 99999
+ // const scaleRate = windowHeight / this.windowHeight
+ // this.windowHeight = windowHeight
+ this.$refs.deviceContainerRef.style.height = (windowHeight - this.pageHeaderHeight) + 'px'
+ // const timer = setTimeout(() => {
+ // this.deviceList.forEach(item => {
+ // item.coordinateTop = item.coordinateTop * scaleRate
+ // item.vh = item.vh * scaleRate
+ // console.log('vh', item.vh)
+ // })
+ // this.parentH = windowHeight - this.pageHeaderHeight
+ // console.log('changeDeviceList', this.deviceList)
+ // }, 500)
+ // console.log('scaleRate', scaleRate)
+ },
+
+ checkboxChange(obj) {
+ //闇�瑕佸垽鏂槸鍚﹀紑鍚姛鑳斤紝鐩殑鏄负浜嗗叧闂畾鏃跺櫒閬垮厤绛涢�夊悗璁惧琚畾鏃跺埛鏂扮殑鏂拌澶囪鐩�
+ if (this.isOperatingDevice) {
+ obj.checked = !obj.checked
+ if (obj.value !== 99) {
+ if (obj.checked) this.checkedStatusCount++
+ else this.checkedStatusCount--
+ }
+
+ if (obj.value == 99) {
+ this.deviceStatusList.forEach(item => {
+ if (item.value !== obj.value) item.checked = obj.checked
+ })
+ if (obj.checked) {
+ this.deviceList = this.deviceList_copy
+ this.checkedStatusCount = this.deviceStatusList.length - 1
+ } else {
+ this.deviceList = []
+ this.checkedStatusCount = 0
+ }
+ } else {
+ this.deviceStatusList.forEach(item => {
+ if (item.value === 99) {
+ if (this.checkedStatusCount !== this.deviceStatusList.length - 1 || this.checkedStatusCount === 0) item.checked = false
+ if (this.checkedStatusCount === this.deviceStatusList.length - 1) item.checked = true
+ }
+ })
+ if (obj.checked) {
+ this.deviceList.push(...this.deviceList_copy.filter(item => item.equipmentStatus === obj.value))
+ } else {
+ this.deviceList = this.deviceList.filter(item => item.equipmentStatus !== obj.value)
+ }
+ }
+ } else {
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: '璇峰紑鍚姛鑳藉悗鍐嶈繘琛岀瓫閫�'
+ })
+ }
+ },
+
+ handleScreenDevive(obj) {
+ //闇�瑕佸垽鏂槸鍚﹀紑鍚姛鑳斤紝鐩殑鏄负浜嗗叧闂畾鏃跺櫒閬垮厤绛涢�夊悗璁惧琚畾鏃跺埛鏂扮殑鏂拌澶囪鐩�
+ if (this.isOperatingDevice) {
+ obj.checked = true
+ this.deviceList = this.deviceList_copy
+ this.deviceStatusList.forEach(item => {
+ if (item.value !== obj.value) item.checked = false
+ })
+
+ if (obj.value == 99) this.deviceList = this.deviceList_copy
+ else this.deviceList = this.deviceList.filter(item => item.equipmentStatus === obj.value)
+
+ } else {
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: '璇峰紑鍚姛鑳藉悗鍐嶈繘琛岀瓫閫�'
+ })
+ }
}
+ },
+ created() {
+ if (this.$route.params.id) {
+ this.getDeviceListByApi(this.$route.params.id)
+ this.getWorkshopDetailsByApi(this.$route.params.id)
+ }
+ this.checkedStatusCount = this.deviceStatusList.length - 1
},
mounted() {
// 绂佹鐢ㄦ埛閫変腑鍐呭
document.onselectstart = () => false
+
+ this.windowHeight =
+ window.innerHeight ||
+ document.documentElement.clientHeight ||
+ document.body.clientHeight
+
+ // 鍒ゆ柇娴忚鍣ㄥ彲瑙嗗尯鍩熼珮搴︽槸鍚︾瓑浜庡垎杈ㄧ巼锛岃嫢鐩哥瓑鍒欒〃绀鸿繘鍏ユ椂娴忚鍣ㄤ负鍏ㄥ睆妯″紡
+ // if (this.windowHeight === screen.height) this.isFullScreen = true
+
+ window.addEventListener('resize', this.handleWindowSizeChange)
},
- created() {
- if (this.$route.params.workshopId) {
- this.getDeviceListByApi(this.$route.params.workshopId)
- }
+ beforeDestroy() {
+ // 纭繚閿�姣佸畾鏃跺櫒銆佷簨浠跺強鍥炴敹璧勬簮
+ clearInterval(this.timingAcquisition)
+ this.timingAcquisition = null
}
}
</script>
@@ -216,43 +457,65 @@
color: #fff;
.page-header {
- height: 80px;
- font-size: 50px;
- text-align: center;
- position: relative;
+ /*font-size: 50px;*/
+ /*text-align: center;*/
+ /*position: relative;*/
- .header-right {
- position: absolute;
- right: 200px;
- top: 0;
+ .header-left {
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding-top: 20px;
}
- }
- .content-container {
- position: relative;
+ .workshop-name {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 50px;
+ }
.device-status-info {
- width: 400px;
- position: absolute;
- top: 5px;
- right: 5px;
+ height: 100%;
display: flex;
+ justify-content: flex-end;
align-items: center;
- justify-content: space-between;
+ padding-top: 20px;
.single-status-info {
- width: 60px;
- display: flex;
- align-items: center;
- justify-content: space-between;
+ margin: 10px;
+ cursor: pointer;
.status-square {
width: 14px;
height: 14px;
border: 1px solid #fff;
- border-radius: 2px;
+ border-radius: 3px;
}
}
+ }
+ }
+
+ .content-container {
+ width: 100%;
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ position: relative;
+
+ .guideline{
+ position: absolute;
+ border: 1px dashed #ccc;
+ }
+
+ .guidelineX {
+ width: 1920px;
+ left: 0;
+ }
+
+ .guidelineY {
+ top: 0;
+ height: 900px;
}
.single-device {
@@ -273,13 +536,16 @@
width: 100%;
height: 100%;
display: flex;
- justify-content: space-between;
+ -webkit-align-items: flex-end;
+ -moz-align-items: flex-end;
+ -ms-align-items: flex-end;
.status-image {
background-size: 100% 100%;
background-repeat: no-repeat;
- width: 45px;
- margin-right: 10px;
+ width: 10px;
+ height: 60%;
+ margin-right: 5px;
}
.device-image {
@@ -290,7 +556,11 @@
}
}
}
-
}
}
+
+ /deep/ .ant-checkbox-inner {
+ background-color: transparent;
+ border-color: #fff;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3