Commit df711019 by lyy

设备驾驶舱bug修复

parent c97cf03d
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
</el-header> </el-header>
<el-container style="margin-top: 3vh;height: 80vh;"> <el-container style="margin-top: 3vh;height: 80vh;">
<el-aside style="width: 20vw;height: 80vh;"> <el-aside style="width: 20vw;height: 80vh;">
<left-manage-cockpit ref="leftmanagecockpit" style="height: 100%" :factory="factory" :datapicker="dataPicker"></left-manage-cockpit> <left-manage-cockpit ref="leftmanagecockpit" style="height: 100%" :factory="factory" :datapicker="dataPicker" :ctx="ctx"></left-manage-cockpit>
</el-aside> </el-aside>
<el-main style="padding-bottom: 0;height: 80vh;"> <el-main style="padding-bottom: 0;height: 80vh;">
<div class="productionMangerBg-img-background" > <div class="productionMangerBg-img-background" >
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
</div> </div>
</el-main> </el-main>
<el-aside style="width: 23vw;height: 80vh;"> <el-aside style="width: 23vw;height: 80vh;">
<right-manage-cockpit ref="rightmanagecockpit" :factory="factory" :datapicker="dataPicker"></right-manage-cockpit> <right-manage-cockpit ref="rightmanagecockpit" :factory="factory" :datapicker="dataPicker" :ctx="ctx"></right-manage-cockpit>
</el-aside> </el-aside>
</el-container> </el-container>
</el-container> </el-container>
...@@ -192,6 +192,8 @@ ...@@ -192,6 +192,8 @@
data() { data() {
return { return {
date: new Date(), date: new Date(),
ctx:'${ctx}',
option: {}, option: {},
option2: {}, option2: {},
factory:'', factory:'',
......
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
</el-header> </el-header>
<el-container style="margin-top: 3vh;height: 80vh;"> <el-container style="margin-top: 3vh;height: 80vh;">
<el-aside style="width: 40vw;height: 80vh;"> <el-aside style="width: 40vw;height: 80vh;">
<left-manage-device style="height: 100%"></left-manage-device> <left-manage-device style="height: 100%" :ctx="ctx"></left-manage-device>
</el-aside> </el-aside>
<el-main style="padding-bottom: 0;height: 80vh;overflow: hidden"> <el-main style="padding-bottom: 0;height: 80vh;overflow: hidden">
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
data() { data() {
return { return {
date: new Date(), date: new Date(),
ctx:'${ctx}',
option1: {}, option1: {},
optionDate1: {}, optionDate1: {},
option2: {}, option2: {},
...@@ -265,7 +265,6 @@ ...@@ -265,7 +265,6 @@
this.querySbNo(); this.querySbNo();
this.setOption(); this.setOption();
this.setOption2(); this.setOption2();
// var self = this; // var self = this;
// setTimeout(function() { // setTimeout(function() {
// self.init(); // self.init();
...@@ -307,6 +306,7 @@ ...@@ -307,6 +306,7 @@
const day = String(today.getDate()).padStart(2, '0'); const day = String(today.getDate()).padStart(2, '0');
const formattedDate = year+month+day; const formattedDate = year+month+day;
this.dataPicker = formattedDate; this.dataPicker = formattedDate;
console.log('ctx',this.ctx)
}, },
getRoleFactory(){ getRoleFactory(){
let _this = this; let _this = this;
......
...@@ -4,39 +4,39 @@ ...@@ -4,39 +4,39 @@
<div class="content-content-title">原材料库</div> <div class="content-content-title">原材料库</div>
<div style="width: 100%;display: flex"> <div style="width: 100%;display: flex">
<div class="content-content-img device-img1" style="margin-left: 3.5vw;margin-right: 3vh"> <div class="content-content-img device-img1" style="margin-left: 3.5vw;margin-right: 3vh">
<img src="../../hggp/common/img/device-img1-content.png" class="device-img1-content img" alt/> <img :src="`${ctx}/common/img/device-img1-content.png`" class="device-img1-content img" alt/>
<div class="content-content-title" style="justify-content: flex-start;margin-top: 2.8vh;padding-left: 1vw">型材切割机</div> <div class="content-content-title" style="justify-content: flex-start;margin-top: 2.8vh;padding-left: 1vw">型材切割机</div>
</div> </div>
<div class="content-content-img device-img2"> <div class="content-content-img device-img2">
<img src="../../hggp/common/img/device-img2-content.png" class="device-img2-content img" alt/> <img :src="`${ctx}/common/img/device-img2-content.png`" class="device-img2-content img" alt/>
<div class="content-content-title" style="justify-content: flex-end;margin-top: 2.8vh;padding-right: 1vw">激光切割机</div> <div class="content-content-title" style="justify-content: flex-end;margin-top: 2.8vh;padding-right: 1vw">激光切割机</div>
</div> </div>
</div> </div>
<div style="width: 100%;height: 48vh;display: flex;margin-top: 2vh"> <div style="width: 100%;height: 48vh;display: flex;margin-top: 2vh">
<div style="width: 50%;height: 100%"> <div style="width: 50%;height: 100%">
<div class="content-content-img device-img1" style="width: 79%;margin-left: 3.2vw;"> <div class="content-content-img device-img1" style="width: 79%;margin-left: 3.2vw;">
<img src="../../hggp/common/img/device-img3-content.png" class="device-img1-content img" alt/> <img :src="`${ctx}/common/img/device-img3-content.png`" class="device-img1-content img" alt/>
<div class="content-content-title" style="justify-content: flex-start;margin-top: 2.8vh;padding-left: 1.5vw">组立机</div> <div class="content-content-title" style="justify-content: flex-start;margin-top: 2.8vh;padding-left: 1.5vw">组立机</div>
</div> </div>
<div style="width: 79%;margin-left: 3.2vw;height: 28vh;margin-top: 2vh"> <div style="width: 79%;margin-left: 3.2vw;height: 28vh;margin-top: 2vh">
<div class="content-device-img img"> <div class="content-device-img img">
<div class="title-content-device img">成品库</div> <div class="title-content-device img">成品库</div>
</div> </div>
<img src="../../hggp/common/img/architectureDiagram.png" style="width: 100%;height: 100%" alt/> <img :src="`${ctx}/common/img/architectureDiagram.png`" style="width: 100%;height: 100%" alt/>
</div> </div>
</div> </div>
<div class="right-device img"> <div class="right-device img">
<div style="width: 100%;height: 30%;display: flex;margin-top: 3vh;"> <div style="width: 100%;height: 30%;display: flex;margin-top: 3vh;">
<div class="content-content-title" style="width: 40%;">组立机</div> <div class="content-content-title" style="width: 40%;">组立机</div>
<img src="../../hggp/common/img/device-img3-content.png" class="device-img1-content img" style="margin: 0;" alt/> <img :src="`${ctx}/common/img/device-img3-content.png`" class="device-img1-content img" style="margin: 0;" alt/>
</div> </div>
<div style="width: 100%;height: 30%;display: flex;margin-top: 2vh;"> <div style="width: 100%;height: 30%;display: flex;margin-top: 2vh;">
<div class="content-content-title" style="width: 40%;">埋弧焊机</div> <div class="content-content-title" style="width: 40%;">埋弧焊机</div>
<img src="../../hggp/common/img/device-img4-content.png" class="device-img1-content img" style="margin: 0;" alt/> <img :src="`${ctx}/common/img/device-img4-content.png`" class="device-img1-content img" style="margin: 0;" alt/>
</div> </div>
<div style="width: 100%;height: 30%;display: flex;margin-top: 2vh;"> <div style="width: 100%;height: 30%;display: flex;margin-top: 2vh;">
<div class="content-content-title" style="width: 40%;">激光焊接机</div> <div class="content-content-title" style="width: 40%;">激光焊接机</div>
<img src="../../hggp/common/img/device-img5-content.png" class="device-img1-content img" style="margin: 0;" alt/> <img :src="`${ctx}/common/img/device-img5-content.png`" class="device-img1-content img" style="margin: 0;" alt/>
</div> </div>
</div> </div>
</div> </div>
...@@ -45,6 +45,9 @@ ...@@ -45,6 +45,9 @@
</template> </template>
<script> <script>
module.exports = { module.exports = {
props:{
ctx:String,
},
data(){ data(){
return { return {
name: '红安', name: '红安',
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
:key="index" style="width: 28%;height: 70%;display: flex;flex-wrap: wrap;justify-content: center;margin-top: 2.5vh" :key="index" style="width: 28%;height: 70%;display: flex;flex-wrap: wrap;justify-content: center;margin-top: 2.5vh"
> >
<div class="content-main-title">{{ getByProcessSumWtList[item] || 0}}</div> <div class="content-main-title">{{ getByProcessSumWtList[item] || 0}}</div>
<img src="../../hggp/common/img/production-icon.png" class="production-icon" alt/> <img :src="`${ctx}/common/img/production-icon.png`" class="production-icon" alt/>
<div class="content-main-footer">{{ sumWtList[index] }}</div> <div class="content-main-footer">{{ sumWtList[index] }}</div>
</div> </div>
</div> </div>
...@@ -29,15 +29,15 @@ ...@@ -29,15 +29,15 @@
<div class="page-content-left" style="position: relative"> <div class="page-content-left" style="position: relative">
<div class="data-title-span temp"> {{ queryBySunWtList[index] || 0 }}</div> <div class="data-title-span temp"> {{ queryBySunWtList[index] || 0 }}</div>
<div style="width: 100%;display: flex;" class="temp"> <div style="width: 100%;display: flex;" class="temp">
<img src="../../hggp/common/img/produce-img.png" class="produce-img " alt/> <img :src="`${ctx}/common/img/produce-img.png`" class="produce-img " alt/>
</div> </div>
<div class="content-main-footer temp" data-process="组立">{{ queryBySunWtDate[index] }}/ 吨</div> <div class="content-main-footer temp" data-process="组立">{{ queryBySunWtDate[index] }}/ 吨</div>
<div style="width: 100%;display: flex;" class="temp"> <div style="width: 100%;display: flex;" class="temp">
<img src="../../hggp/common/img/produce-put.png" v-if="index < 4" alt/> <img :src="`${ctx}/common/img/produce-put.png`" v-if="index < 4" alt/>
</div> </div>
</div> </div>
<div style="position: relative;top:-8vh; right: 0;bottom: 0;left: 6.5vw;" v-if="index == 4"> <div style="position: relative;top:-8vh; right: 0;bottom: 0;left: 6.5vw;" v-if="index == 4">
<img src="../../hggp/common/img/product-transmission.png" style="width: 4vw;height: 3vh;" alt/> <img :src="`${ctx}/common/img/product-transmission.png`" style="width: 4vw;height: 3vh;" alt/>
</div> </div>
<!-- <div class="page-content-left" style="margin-right: -1vw">--> <!-- <div class="page-content-left" style="margin-right: -1vw">-->
<!-- <div class="data-title-span temp">160</div>--> <!-- <div class="data-title-span temp">160</div>-->
...@@ -110,6 +110,7 @@ module.exports = { ...@@ -110,6 +110,7 @@ module.exports = {
props:{ props:{
factory:String, factory:String,
datapicker:String, datapicker:String,
ctx:String,
}, },
data(){ data(){
return { return {
......
...@@ -34,6 +34,7 @@ module.exports = { ...@@ -34,6 +34,7 @@ module.exports = {
props:{ props:{
factory:String, factory:String,
datapicker:String, datapicker:String,
ctx:String,
}, },
data(){ data(){
return { return {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment