看板修改

master
suixy 1 week ago
parent aef86505f3
commit 24d9e4fecb

@ -1,35 +0,0 @@
const { run } = require('runjs')
const chalk = require('chalk')
const config = require('../vue.config.js')
const rawArgv = process.argv.slice(2)
const args = rawArgv.join(' ')
if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
const report = rawArgv.includes('--report')
run(`vue-cli-service build ${args}`)
const port = 9526
const publicPath = config.publicPath
var connect = require('connect')
var serveStatic = require('serve-static')
const app = connect()
app.use(
publicPath,
serveStatic('./dist', {
index: ['index.html', '/']
})
)
app.listen(port, function () {
console.log(chalk.green(`> Preview at http://localhost:${port}${publicPath}`))
if (report) {
console.log(chalk.green(`> Report at http://localhost:${port}${publicPath}report.html`))
}
})
} else {
run(`vue-cli-service build ${args}`)
}

@ -39,7 +39,7 @@
<div class="topNum standbyNum"> <div class="topNum standbyNum">
<span class="text">报警</span> <span class="text">报警</span>
<span></span> <span></span>
<span class="num">{{ runningData.STANDBYCOUNT }}</span> <span class="num">{{ runningData.ALARMCOUNT }}</span>
<span class="unit"></span> <span class="unit"></span>
</div> </div>
<!-- <div class="topNum waitMaterials">--> <!-- <div class="topNum waitMaterials">-->
@ -122,12 +122,12 @@
<div class="itemText">待机时长</div> <div class="itemText">待机时长</div>
</div> </div>
</div> </div>
<div class="oee"> <!-- <div class="oee">-->
<Chart ref="chart1"></Chart> <!-- <Chart ref="chart1"></Chart>-->
</div> <!-- </div>-->
<div class="energy"> <!-- <div class="energy">-->
<Chart ref="chart2"></Chart> <!-- <Chart ref="chart2"></Chart>-->
</div> <!-- </div>-->
<div class="config"> <div class="config">
<el-button class="btn" @click="configDialogVisible = true">配置</el-button> <el-button class="btn" @click="configDialogVisible = true">配置</el-button>
</div> </div>
@ -379,7 +379,7 @@ export default {
}) })
timer = setInterval(() => { timer = setInterval(() => {
this.getData() this.getData()
}, 1000 * 60 * 3) }, 1000 * 60 * 2)
}, },
methods: { methods: {
async getData() { async getData() {
@ -521,7 +521,7 @@ export default {
} }
.num { .num {
color: #FFEB3B; color: #FFC107;
} }
} }
@ -535,7 +535,7 @@ export default {
} }
.num { .num {
color: #D8070D; color: #FB0102;
//color: #E1B00D; //color: #E1B00D;
} }
} }
@ -567,7 +567,7 @@ export default {
position: absolute; position: absolute;
top: 17%; top: 17%;
left: 3.3%; left: 3.3%;
width: 74.8%; width: 93.4%;
height: 78%; height: 78%;
overflow: auto; overflow: auto;
@ -577,7 +577,7 @@ export default {
.item { .item {
display: inline-block; display: inline-block;
width: calc(33% - 1vw); width: calc(25% - 1vw);
height: 13.91vw; height: 13.91vw;
margin: 0.5vw; margin: 0.5vw;
position: relative; position: relative;

@ -22,14 +22,14 @@
style="color: #6AFD81">{{ style="color: #6AFD81">{{
form.isSimulate ? form.text8 : Math.min((runningData.RUNNINGCOUNT || 0) + 5, (runningData.TOTALCOUNT || 0)) form.isSimulate ? form.text8 : Math.min((runningData.RUNNINGCOUNT || 0) + 5, (runningData.TOTALCOUNT || 0))
}}</span></div> }}</span></div>
<div class="text1" style="top: 19.1%;left: 82.4%;">告警: <span <div class="text1" style="top: 19.1%;left: 82.4%;">停机: <span
style="color: #FFF46C">{{ form.isSimulate ? form.text9 : runningData.STOPPEDCOUNT }}</span> style="color: #FFC107">{{
</div> form.isSimulate ? form.text10 : runningData.STOPPEDCOUNT
<div class="text1" style="top: 19.1%;left: 89.8%;">停机: <span
style="color: #F9241F">{{
form.isSimulate ? form.text10 : Math.max((runningData.NOTSTARTEDCOUNT || 0) - 5, 0)
}}</span> }}</span>
</div> </div>
<div class="text1" style="top: 19.1%;left: 89.8%;">报警: <span
style="color: #FB0102">{{ form.isSimulate ? form.text9 : runningData.ALARMCOUNT }}</span>
</div>
<div class="num2" style="color:#63CDFA;top: 17%;left: 29.05%;"> <div class="num2" style="color:#63CDFA;top: 17%;left: 29.05%;">
{{ (form.isSimulate ? form.text5 : productionTotalData.dayTotal) || '00000' }} {{ (form.isSimulate ? form.text5 : productionTotalData.dayTotal) || '00000' }}
</div> </div>
@ -244,19 +244,19 @@
<div <div
:style='"background-color:" +(item.shutEndTime ? ((index % 2 === 0)? "#05346022":"#05346044"):"#FFEB3B")'> :style='"background-color:" +(item.shutEndTime ? ((index % 2 === 0)? "#05346022":"#05346044"):"#FFEB3B")'>
<div <div
class="scrollTableItem" style="width: 25%;font-size: 0.8vw"> class="scrollTableItem" style="width: 25%;font-size: 0.8vw" :style="`color:${item.shutEndTime ? '#65cdf9':'#000'}`">
{{ form.isSimulate ? item.text1 : item.deviceName }} {{ form.isSimulate ? item.text1 : item.deviceName }}
</div> </div>
<div <div
class="scrollTableItem" style="width: 25%;font-size: 0.8vw"> class="scrollTableItem" style="width: 25%;font-size: 0.8vw" :style="`color:${item.shutEndTime ? '#65cdf9':'#000'}`">
{{ form.isSimulate ? item.text2 : item.shutReason }} {{ form.isSimulate ? item.text2 : item.shutReason }}
</div> </div>
<div <div
class="scrollTableItem" style="width: 25%;font-size: 0.8vw"> class="scrollTableItem" style="width: 25%;font-size: 0.8vw" :style="`color:${item.shutEndTime ? '#65cdf9':'#000'}`">
{{ form.isSimulate ? item.text3 : item.shutBeginTime }} {{ form.isSimulate ? item.text3 : item.shutBeginTime }}
</div> </div>
<div <div
class="scrollTableItem" style="width: 25%;font-size: 0.8vw"> class="scrollTableItem" style="width: 25%;font-size: 0.8vw" :style="`color:${item.shutEndTime ? '#65cdf9':'#000'}`">
{{ form.isSimulate ? item.text3 : item.shutEndTime }} {{ form.isSimulate ? item.text3 : item.shutEndTime }}
</div> </div>
</div> </div>
@ -686,7 +686,7 @@ export default {
await this.getData() await this.getData()
setInterval(async () => { setInterval(async () => {
await this.getData() await this.getData()
}, 1000 * 60 * 10) }, 1000 * 60 * 2)
}, },
methods: { methods: {
@ -883,7 +883,7 @@ export default {
top: 20, top: 20,
right: 20, right: 20,
bottom: 40, bottom: 40,
left: 50 left: 70
}, },
tooltip: { tooltip: {
trigger: "item", trigger: "item",

@ -47,7 +47,7 @@
<div class="text2" style="top: 19.7%;left: 42.5%;">设备巡检执行情况</div> <div class="text2" style="top: 19.7%;left: 42.5%;">设备巡检执行情况</div>
<div class="text2" style="top: 19.7%;left: 74.5%;">故障原因统计TOP5</div> <div class="text2" style="top: 19.7%;left: 74.5%;">故障原因统计TOP5</div>
<div class="text2" style="top: 59.7%;left: 13%;">报警数量曲线(最近30天)</div> <div class="text2" style="top: 59.7%;left: 13%;">报警数量曲线(最近30天)</div>
<div class="text2" style="top: 59.7%;left: 74.5%;">机台产量TOP5</div> <div class="text2" style="top: 59.7%;left: 74.5%;">机台当日产量TOP5</div>
<div class="text3" style="top: 31%;left: 20.9%;">计划保养</div> <div class="text3" style="top: 31%;left: 20.9%;">计划保养</div>
<div class="text3" style="top: 31%;left: 27.5%">已保养</div> <div class="text3" style="top: 31%;left: 27.5%">已保养</div>
<div class="text3" style="top: 42.5%;left: 18.8%;">待保养</div> <div class="text3" style="top: 42.5%;left: 18.8%;">待保养</div>
@ -79,9 +79,9 @@
<Chart ref="chart1"></Chart> <Chart ref="chart1"></Chart>
</div> </div>
<div class="chart2"> <div class="chart2">
<div class="deviceNum">累计应检设备<span style="color: #56BDFF;font-weight: 800;margin-left: 1vw">{{ <div class="deviceNum">累计巡检次数<span style="color: #56BDFF;font-weight: 800;margin-left: 1vw">{{
form.isSimulate ? form.text16 : inspectStatisticsData.deviceCount form.isSimulate ? form.text16 : inspectStatisticsData.deviceCount
}}</span></div> }}</span></div>
<div class="title"><span style="font-size: 1.5vw;font-weight: 800">{{ <div class="title"><span style="font-size: 1.5vw;font-weight: 800">{{
form.isSimulate ? form.text17 : inspectStatisticsData.completeRate form.isSimulate ? form.text17 : inspectStatisticsData.completeRate
}}</span>% }}</span>%
@ -364,7 +364,7 @@ export default {
await this.getData() await this.getData()
setInterval(async () => { setInterval(async () => {
await this.getData() await this.getData()
}, 1000 * 60 * 10) }, 1000 * 60 * 2)
}, },
methods: { methods: {
async getData() { async getData() {
@ -396,19 +396,19 @@ export default {
}, },
chartInit() { chartInit() {
let data = [ let data = [
{ // {
value: this.form.isSimulate ? this.form.value1 : this.deviceStatusDistributionData.experimentPercent, // value: this.form.isSimulate ? this.form.value1 : this.deviceStatusDistributionData.experimentPercent,
name: '实验设备', // name: '',
index: 0, // index: 0,
itemStyle: { // itemStyle: {
color: '#24ACFF', // color: '#24ACFF',
borderColor: '#000', // borderColor: '#000',
borderWidth: 2 // borderWidth: 2
}, // },
}, // },
{ {
value: this.form.isSimulate ? this.form.value2 : this.deviceStatusDistributionData.uncheckedPercent, value: this.form.isSimulate ? this.form.value2 : this.deviceStatusDistributionData.uncheckedPercent,
name: '未检设备', name: '未检',
index: 1, index: 1,
itemStyle: { itemStyle: {
color: '#3CFD96', color: '#3CFD96',
@ -418,7 +418,7 @@ export default {
}, },
{ {
value: this.form.isSimulate ? this.form.value3 : this.deviceStatusDistributionData.normalPercent, value: this.form.isSimulate ? this.form.value3 : this.deviceStatusDistributionData.normalPercent,
name: '正常设备', name: '正常',
index: 2, index: 2,
itemStyle: { itemStyle: {
color: '#FEE924', color: '#FEE924',
@ -429,7 +429,7 @@ export default {
{ {
value: this.form.isSimulate ? this.form.value4 : this.deviceStatusDistributionData.abnormalPercent, value: this.form.isSimulate ? this.form.value4 : this.deviceStatusDistributionData.abnormalPercent,
index: 3, index: 3,
name: '异常设备', name: '异常',
itemStyle: { itemStyle: {
color: '#FE6624', color: '#FE6624',
borderColor: '#000', borderColor: '#000',

@ -11,16 +11,16 @@
<div class="logo"></div> <div class="logo"></div>
<div v-if="num1 >= 30"> <div v-if="num1 >= 30">
<div class="cgtd1"> <div class="cgtd1">
<span></span> <!-- <span></span>-->
<span></span> <!-- <span></span>-->
<span></span> <!-- <span></span>-->
<span></span> <!-- <span></span>-->
</div> </div>
<div class="cgtd2"> <div class="cgtd2">
<span></span> <!-- <span></span>-->
<span></span> <!-- <span></span>-->
<span></span> <!-- <span></span>-->
<span></span> <!-- <span></span>-->
</div> </div>
<div class="currentPosition1" v-if="$route.query.id === '1'"><span>当前位置</span></div> <div class="currentPosition1" v-if="$route.query.id === '1'"><span>当前位置</span></div>
<div class="currentPosition2" v-if="$route.query.id === '2'"><span>当前位置</span></div> <div class="currentPosition2" v-if="$route.query.id === '2'"><span>当前位置</span></div>
@ -609,7 +609,7 @@ export default {
// appsecret: 'rXmhoLAiOPNKzbl7g2qxCV8tFwRdYuZM' // appsecret: 'rXmhoLAiOPNKzbl7g2qxCV8tFwRdYuZM'
// } // }
const viewer = new AMRT.Viewer('container', {offline: true}) const viewer = new AMRT.Viewer('container', {offline: true})
viewer.sceneManager.setBackground('http://10.100.72.10:8900/bg.jpg') viewer.sceneManager.setBackground('http://localhost:1024/bg.jpg')
viewer.controls.setTarget(285.6140415831262, -66.96447327588656, -15.909577343207037) viewer.controls.setTarget(285.6140415831262, -66.96447327588656, -15.909577343207037)
viewer.controls.setPosition(289.21362270826876, 1559.17755547545135, 1298.62483706445185) viewer.controls.setPosition(289.21362270826876, 1559.17755547545135, 1298.62483706445185)
let modelArr = [ let modelArr = [
@ -852,7 +852,7 @@ export default {
onComplete: function (m) { onComplete: function (m) {
that.num1 += 1 that.num1 += 1
if (that.num1 === modelArr.length) { if (that.num1 === modelArr.length) {
viewer.renderManager.setLoop(false) // viewer.renderManager.setLoop(false)
} }
num += 1 num += 1
@ -884,9 +884,9 @@ export default {
// viewer.operator.enabled = true // viewer.operator.enabled = true
viewer.controls.enablePan = false viewer.controls.enablePan = true
viewer.controls.enableRotate = false viewer.controls.enableRotate = true
viewer.controls.enableZoom = false viewer.controls.enableZoom = true
// viewer.addEventListener(AMRT.Event.UPDATE, () => { // viewer.addEventListener(AMRT.Event.UPDATE, () => {
// console.log('update') // console.log('update')

Loading…
Cancel
Save