Commit bcb4f481 by lyy

设备驾驶舱bug修复

parent 7c8a7fd3
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
</el-header> </el-header>
<el-container style="height:94vh;margin-top: 2vw"> <el-container style="height:94vh;margin-top: 2vw">
<el-aside style="width: 20vw;"> <el-aside style="width: 20vw;">
<home-page-left ref="homepageleft" :factory="factory" :datapicker="dataPicker" ></home-page-left> <home-page-left ref="homepageleft" :factory="factory" :datapicker="dataPicker" :ctx="ctx" ></home-page-left>
</el-aside> </el-aside>
<el-container> <el-container>
<el-header style="height: 45vh;margin-left: 1vw"> <el-header style="height: 45vh;margin-left: 1vw">
...@@ -246,6 +246,7 @@ ...@@ -246,6 +246,7 @@
splicingList:['组拼','加焊','综合'], splicingList:['组拼','加焊','综合'],
querySplicingList:['zp','jh','zh'], querySplicingList:['zp','jh','zh'],
ctx:'${ctx}',
option:{}, option:{},
option2:{}, option2:{},
......
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,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 ref="leftmanagedevice" style="height: 100%"></left-manage-device> <left-manage-device ref="leftmanagedevice" 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">
<div class="home-page-main"> <div class="home-page-main">
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
data() { data() {
return { return {
date: new Date(), date: new Date(),
ctx:'${ctx}',
option1: {}, option1: {},
optionDate1: {}, optionDate1: {},
option2: {}, option2: {},
......
...@@ -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: 25px" :key="index" style="width: 28%;height: 70%;display: flex;flex-wrap: wrap;justify-content: center;margin-top: 25px"
> >
<div class="content-main-title">{{ queryDataObject[item]}}</div> <div class="content-main-title">{{ queryDataObject[item]}}</div>
<img src="../../hpjx/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">{{queryRCLList[index]}}</div> <div class="content-main-footer">{{queryRCLList[index]}}</div>
</div> </div>
</div> </div>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
:key="index" style="width: 28%;height: 70%;display: flex;flex-wrap: wrap;justify-content: center;margin-top: 25px" :key="index" style="width: 28%;height: 70%;display: flex;flex-wrap: wrap;justify-content: center;margin-top: 25px"
> >
<div class="content-main-title">{{ queryMonthObject[item]}}</div> <div class="content-main-title">{{ queryMonthObject[item]}}</div>
<img src="../../hpjx/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">{{queryRCLList[index]}}</div> <div class="content-main-footer">{{queryRCLList[index]}}</div>
</div> </div>
</div> </div>
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
:key="index" style="width: 28%;height: 70%;display: flex;flex-wrap: wrap;justify-content: center;margin-top: 25px" :key="index" style="width: 28%;height: 70%;display: flex;flex-wrap: wrap;justify-content: center;margin-top: 25px"
> >
<div class="content-main-title">{{ queryYearObject[item]}}</div> <div class="content-main-title">{{ queryYearObject[item]}}</div>
<img src="../../hpjx/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">{{queryRCLList[index]}}</div> <div class="content-main-footer">{{queryRCLList[index]}}</div>
</div> </div>
</div> </div>
...@@ -56,6 +56,7 @@ module.exports = { ...@@ -56,6 +56,7 @@ module.exports = {
props:{ props:{
factory:String, factory:String,
datapicker:String, datapicker:String,
ctx:String,
}, },
data(){ data(){
return { return {
......
...@@ -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="../../hpjx/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="../../hpjx/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="../../hpjx/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="../../hpjx/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="../../hpjx/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="../../hpjx/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="../../hpjx/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 {
}; };
......
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