fix:fmlog改动，以及大屏改动
This commit is contained in:
parent
ffc95890fa
commit
0d9afd42e0
|
|
@ -104,7 +104,7 @@
|
|||
<div>设备运转状态</div>
|
||||
</div>
|
||||
<div class="itemBody">
|
||||
<div id="eqPieChart" style="width: 310px;height: 220px;"></div>
|
||||
<div id="eqPieChart" style="width:16vw;height:20vh;"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -112,7 +112,7 @@
|
|||
<div class="flexItem">
|
||||
<div class="itemTitle2">
|
||||
<div>库存</div>
|
||||
<el-carousel height="40px" :interval="30000" indicator-position="none"
|
||||
<el-carousel height="4vh" :interval="30000" indicator-position="none"
|
||||
style="position: absolute;top: 0;right: 0;width: 100px;">
|
||||
<el-carousel-item>
|
||||
<div style="color: #ffffff; z-index: 10;font-size: 18px;">成品库</div>
|
||||
|
|
@ -123,7 +123,7 @@
|
|||
</el-carousel>
|
||||
</div>
|
||||
<div class="itemBody itemBody1">
|
||||
<el-carousel height="140px" :interval="30000" indicator-position="none">
|
||||
<el-carousel height="14vh" :interval="30000" indicator-position="none">
|
||||
<el-carousel-item>
|
||||
<dv-scroll-board
|
||||
:config="configDataProd"
|
||||
|
|
@ -145,11 +145,11 @@
|
|||
<div>质量分析</div>
|
||||
</div>
|
||||
<div class="itemBody3">
|
||||
<scEcharts height="165px" width="128px" :option="options"></scEcharts>
|
||||
<scEcharts height="165px" width="128px" :option="option1"></scEcharts>
|
||||
<scEcharts height="165px" width="128px" :option="option2"></scEcharts>
|
||||
<scEcharts height="165px" width="128px" :option="option3"></scEcharts>
|
||||
<scEcharts height="165px" width="128px" :option="option4"></scEcharts>
|
||||
<scEcharts :height="pieHeight" :width="pieWidth" :option="options"></scEcharts>
|
||||
<scEcharts :height="pieHeight" :width="pieWidth" :option="option1"></scEcharts>
|
||||
<scEcharts :height="pieHeight" :width="pieWidth" :option="option2"></scEcharts>
|
||||
<scEcharts :height="pieHeight" :width="pieWidth" :option="option3"></scEcharts>
|
||||
<scEcharts :height="pieHeight" :width="pieWidth" :option="option4"></scEcharts>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -159,7 +159,7 @@
|
|||
<div class="itemTitleIcon"></div>
|
||||
<div>实时视频</div>
|
||||
</div>
|
||||
<div class="itemBody">
|
||||
<div class="itemBody" style="height: 32.5vh;">
|
||||
<video width="100%" height="100%" autoplay controls loop>
|
||||
<!-- <source :src="videoUrl" type="video/mp4"> -->
|
||||
<source src="img/gx/gx_video.mp4" type="video/mp4">
|
||||
|
|
@ -174,46 +174,17 @@
|
|||
<div class="itemBody">
|
||||
<div class="viewsItem" v-for="articleItem in articleList" :key="articleItem.id">
|
||||
<div class="viewsItem_wrap">
|
||||
<!-- <img style="float: left;" class="viewsItem_img" src="img/gz_logo.png"> -->
|
||||
<img style="float: left;" class="viewsItem_img" :src="articleItem.poster">
|
||||
<article>
|
||||
{{ articleItem.content }}
|
||||
</article>
|
||||
</div>
|
||||
</div>
|
||||
<div class="viewsItem">
|
||||
<div class="viewsItem_wrap">
|
||||
<img style="float: left;" class="viewsItem_img" src="img/gz_logo.png">
|
||||
<article>
|
||||
紧绷“安全弦”，筑牢“防护网”，光芯科技开展“五一”节前安全生产大检查，紧绷“安全弦”，筑牢“防护网”，光芯科技开展“五一”节前安全生产大检查
|
||||
</article>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="viewsItem">
|
||||
<div class="viewsItem_wrap">
|
||||
<img style="float: left;" class="viewsItem_img" src="img/gz_logo.png">
|
||||
<article>
|
||||
紧绷“安全弦”，筑牢“防护网”，光芯科技开展“五一”节前安全生产大检查，紧绷“安全弦”，筑牢“防护网”，光芯科技开展“五一”节前安全生产大检查
|
||||
</article>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="bottom_block">
|
||||
<div id="scroll" class="bottom_block2">
|
||||
<!-- <div class="flexItem3">
|
||||
<div class="itemTitle itemTitle_b">
|
||||
<div>切片</div>
|
||||
</div>
|
||||
<div class="itemBody">
|
||||
<dv-scroll-board
|
||||
:config="configData0"
|
||||
class="inmBoxmain"
|
||||
/>
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
<div class="flexItem3">
|
||||
<div class="flexItem3_title">切片</div>
|
||||
<div class="flexItem3Body">
|
||||
|
|
@ -221,7 +192,7 @@
|
|||
:config="configData0"
|
||||
class="inmBoxmain"
|
||||
/>
|
||||
<scEcharts width="370px" height="150px" :option="options0"></scEcharts>
|
||||
<scEcharts :width="lineWidth" :height="lineHeight" :option="options0"></scEcharts>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flexItem3">
|
||||
|
|
@ -231,7 +202,7 @@
|
|||
:config="configData2"
|
||||
class="inmBoxmain"
|
||||
/>
|
||||
<scEcharts width="370px" height="150px" :option="options2"></scEcharts>
|
||||
<scEcharts :width="lineWidth" :height="lineHeight" :option="options2"></scEcharts>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flexItem3">
|
||||
|
|
@ -241,7 +212,7 @@
|
|||
:config="configData3"
|
||||
class="inmBoxmain"
|
||||
/>
|
||||
<scEcharts width="370px" height="150px" :option="options3"></scEcharts>
|
||||
<scEcharts :width="lineWidth" :height="lineHeight" :option="options3"></scEcharts>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flexItem3">
|
||||
|
|
@ -251,7 +222,7 @@
|
|||
:config="configData4"
|
||||
class="inmBoxmain"
|
||||
/>
|
||||
<scEcharts width="370px" height="150px" :option="options4"></scEcharts>
|
||||
<scEcharts :width="lineWidth" :height="lineHeight" :option="options4"></scEcharts>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flexItem3">
|
||||
|
|
@ -261,7 +232,7 @@
|
|||
:config="configData5"
|
||||
class="inmBoxmain"
|
||||
/>
|
||||
<scEcharts width="370px" height="150px" :option="options5"></scEcharts>
|
||||
<scEcharts :width="lineWidth" :height="lineHeight" :option="options5"></scEcharts>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flexItem3">
|
||||
|
|
@ -271,7 +242,7 @@
|
|||
:config="configData6"
|
||||
class="inmBoxmain"
|
||||
/>
|
||||
<scEcharts width="370px" height="150px" :option="options6"></scEcharts>
|
||||
<scEcharts :width="lineWidth" :height="lineHeight" :option="options6"></scEcharts>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flexItem3">
|
||||
|
|
@ -281,7 +252,7 @@
|
|||
:config="configData8"
|
||||
class="inmBoxmain"
|
||||
/>
|
||||
<scEcharts width="370px" height="150px" :option="options8"></scEcharts>
|
||||
<scEcharts :width="lineWidth" :height="lineHeight" :option="options8"></scEcharts>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flexItem3">
|
||||
|
|
@ -291,7 +262,7 @@
|
|||
:config="configData9"
|
||||
class="inmBoxmain"
|
||||
/>
|
||||
<scEcharts width="370px" height="150px" :option="options9"></scEcharts>
|
||||
<scEcharts :width="lineWidth" :height="lineHeight" :option="options9"></scEcharts>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flexItem3">
|
||||
|
|
@ -301,7 +272,7 @@
|
|||
:config="configData10"
|
||||
class="inmBoxmain"
|
||||
/>
|
||||
<scEcharts width="370px" height="150px" :option="options10"></scEcharts>
|
||||
<scEcharts :width="lineWidth" :height="lineHeight" :option="options10"></scEcharts>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flexItem3">
|
||||
|
|
@ -311,7 +282,7 @@
|
|||
:config="configData11"
|
||||
class="inmBoxmain"
|
||||
/>
|
||||
<scEcharts width="370px" height="150px" :option="options11"></scEcharts>
|
||||
<scEcharts :width="lineWidth" :height="lineHeight" :option="options11"></scEcharts>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flexItem3">
|
||||
|
|
@ -321,7 +292,7 @@
|
|||
:config="configData12"
|
||||
class="inmBoxmain"
|
||||
/>
|
||||
<scEcharts width="370px" height="150px" :option="options12"></scEcharts>
|
||||
<scEcharts :width="lineWidth" :height="lineHeight" :option="options12"></scEcharts>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flexItem3">
|
||||
|
|
@ -331,7 +302,7 @@
|
|||
:config="configData13"
|
||||
class="inmBoxmain"
|
||||
/>
|
||||
<scEcharts width="370px" height="150px" :option="options13"></scEcharts>
|
||||
<scEcharts :width="lineWidth" :height="lineHeight" :option="options13"></scEcharts>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flexItem3">
|
||||
|
|
@ -341,7 +312,7 @@
|
|||
:config="configData14"
|
||||
class="inmBoxmain"
|
||||
/>
|
||||
<scEcharts width="370px" height="150px" :option="options14"></scEcharts>
|
||||
<scEcharts :width="lineWidth" :height="lineHeight" :option="options14"></scEcharts>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flexItem3">
|
||||
|
|
@ -351,7 +322,7 @@
|
|||
:config="configData15"
|
||||
class="inmBoxmain"
|
||||
/>
|
||||
<scEcharts width="370px" height="150px" :option="options15"></scEcharts>
|
||||
<scEcharts :width="lineWidth" :height="lineHeight" :option="options15"></scEcharts>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flexItem3">
|
||||
|
|
@ -361,7 +332,7 @@
|
|||
:config="configData0"
|
||||
class="inmBoxmain"
|
||||
/>
|
||||
<scEcharts width="370px" height="150px" :option="options0"></scEcharts>
|
||||
<scEcharts :width="lineWidth" :height="lineHeight" :option="options0"></scEcharts>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -388,7 +359,7 @@ import baseUrl from "@/config";
|
|||
const configData={
|
||||
header : ['物料批次','未加工','进行中','已完成','合格数'],
|
||||
headerBGC : '#0a3f44',
|
||||
rowNum : 3,
|
||||
rowNum : 4,
|
||||
headerHeight : 35,
|
||||
align : 'center',
|
||||
waitTime : 150000,
|
||||
|
|
@ -691,14 +662,22 @@ export default {
|
|||
options15:{},
|
||||
articleList:[],
|
||||
videoUrl:'',
|
||||
pieWidth:0,
|
||||
lineWidth:0,
|
||||
pieHeight:0,
|
||||
lineHeight:0,
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
let that = this;
|
||||
that.initFactory();
|
||||
var windowHeight = window.innerHeight;
|
||||
var windowWidth = window.innerWidth;
|
||||
that.pieWidth =Math.round((windowWidth/100*33)/5)+'px';
|
||||
that.pieHeight = Math.round((windowHeight/100)*13)+'px';
|
||||
that.lineWidth = (windowWidth/5-10)+'px';
|
||||
that.lineHeight = (windowHeight/100)*12.5+'px';
|
||||
that.bigScreenName = that.$TOOL.data.get("BASE_INFO").base.bigScreen_name;
|
||||
that.showTime();
|
||||
that.addListener();
|
||||
|
||||
//一天的毫秒数
|
||||
let nowDate = new Date();
|
||||
let year = nowDate.getFullYear();
|
||||
|
|
@ -716,14 +695,7 @@ export default {
|
|||
}
|
||||
// dayArr.push(day);
|
||||
that.dayArr = dayArr;
|
||||
that.getEquipments();
|
||||
that.getMaterials();
|
||||
that.getMgroup();
|
||||
that.getTaskNumber();
|
||||
that.addListener();
|
||||
that.setIntervalFun();
|
||||
that.getQulity();
|
||||
that.getArticles();
|
||||
|
||||
that.myChart = echarts.init(document.getElementById('eqPieChart'));
|
||||
that.myChart.setOption(that.option_eq);
|
||||
let index2 = 0;
|
||||
|
|
@ -748,6 +720,19 @@ export default {
|
|||
index2 = 0;
|
||||
}
|
||||
}, 3000);
|
||||
that.$nextTick(function () {
|
||||
that.getEquipments();
|
||||
that.getMaterials();
|
||||
that.getMgroup();
|
||||
that.getTaskNumber();
|
||||
that.addListener();
|
||||
that.setIntervalFun();
|
||||
that.getQulity();
|
||||
that.getArticles();
|
||||
that.initFactory();
|
||||
that.showTime();
|
||||
that.addListener();
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
//获取公告和视频
|
||||
|
|
@ -826,16 +811,18 @@ export default {
|
|||
//底部轮播定时
|
||||
setIntervalFun(){
|
||||
let that = this;
|
||||
let containerWidth = document.getElementsByClassName("container")[0].offsetWidth;
|
||||
let wdiths = containerWidth/5;
|
||||
that.scrollInterval = setInterval(() => {
|
||||
if(that.scrollNum>8){
|
||||
that.scrollNum = 0;
|
||||
}else{
|
||||
that.scrollNum++;
|
||||
}
|
||||
let nums = that.scrollNum * 384;
|
||||
let nums = that.scrollNum * wdiths;
|
||||
let lefts = 0-nums;
|
||||
document.getElementById("scroll").style.left = lefts +'px';
|
||||
},6000)
|
||||
},600000)
|
||||
},
|
||||
//时间
|
||||
showTime() {
|
||||
|
|
@ -871,6 +858,10 @@ export default {
|
|||
var windowWidth = window.innerWidth;
|
||||
var container = document.getElementsByClassName("container")[0];
|
||||
var model = document.getElementsByClassName("model")[0];
|
||||
that.pieWidth = windowWidth/500*33+'px';
|
||||
that.lineWidth = (windowWidth/5-10)+'px';
|
||||
that.pieHeight = windowHeight/100*13+'px';
|
||||
that.lineHeight = windowHeight/100*12.8+'px';
|
||||
if (windowWidth > 960) {
|
||||
container.style.overflow = "hidden";
|
||||
model.style.position = "absolute";
|
||||
|
|
@ -1191,17 +1182,17 @@ export default {
|
|||
.container {
|
||||
/* background: url("/public/img/gx/gx_bj.jpg") no-repeat; */
|
||||
background-size: cover;
|
||||
height: 1080px;
|
||||
width: 1920px;
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
position: relative;
|
||||
}
|
||||
/* header-start */
|
||||
.pageHeader {
|
||||
z-index: 100;
|
||||
height: 70px;
|
||||
width: 1920px;
|
||||
padding: 0 20px;
|
||||
line-height:70px;
|
||||
height: 6.48vh;
|
||||
width: 100vw;
|
||||
padding: 0 1vw;
|
||||
line-height:6.48vh;
|
||||
color: #ffffff;
|
||||
position: absolute;
|
||||
text-align: center;
|
||||
|
|
@ -1210,30 +1201,30 @@ export default {
|
|||
/* border-bottom: 1px solid rgba(54, 217, 187, 0.3); */
|
||||
}
|
||||
.header_left{
|
||||
position: absolute;top: 0;left: 10px;font-size: 18px;
|
||||
position: absolute;top: 0;left: 1vw;font-size: 18px;
|
||||
}
|
||||
.header_center_text{
|
||||
font-family: myfont;letter-spacing: 0.2em; font-size: 38px;line-height:53px;z-index: 100;
|
||||
font-family: myfont;letter-spacing: 0.2em; font-size: 3vh;line-height:5vh;z-index: 100;
|
||||
}
|
||||
.header_right{
|
||||
position: absolute;top: 0;right: 10px;font-size: 18px;
|
||||
position: absolute;top: 0;right: 1vw;font-size: 18px;
|
||||
}
|
||||
.header_bg{
|
||||
z-index: -1;position: absolute;top:0;left:0;width:1920px;height:70px;
|
||||
z-index: -1;position: absolute;top:0;left:0;width:100vw;height:6.48vh;
|
||||
}
|
||||
.header_line{
|
||||
top:65px;
|
||||
top:6vh;
|
||||
height: 1px;
|
||||
position: absolute;
|
||||
background: rgb(54,217,187);
|
||||
}
|
||||
.header_line1{
|
||||
width: 10px;
|
||||
right: 160px;
|
||||
width: 0.5vw;
|
||||
right: 8vw;
|
||||
}
|
||||
.header_line2{
|
||||
width: 20px;
|
||||
right: 80px;
|
||||
width: 1.5vw;
|
||||
right: 4vw;
|
||||
}
|
||||
/* header-end */
|
||||
|
||||
|
|
@ -1241,8 +1232,8 @@ export default {
|
|||
.left_block,
|
||||
.left_block2,
|
||||
.right_block{
|
||||
top:74px;
|
||||
width:320px;
|
||||
top:6.48vh;
|
||||
width:16.5vw;
|
||||
z-index: 10;
|
||||
display: flex;
|
||||
position:absolute;
|
||||
|
|
@ -1254,65 +1245,67 @@ export default {
|
|||
background: rgba(9, 31, 43, 0.5);
|
||||
}
|
||||
.left_block3{
|
||||
top:340px;
|
||||
top:31.48vh;
|
||||
left: 0;
|
||||
width:640px;
|
||||
width:33vw;
|
||||
display: flex;
|
||||
position:absolute;
|
||||
overflow:hidden;
|
||||
flex-direction: column;
|
||||
padding: 0 5px;
|
||||
height: 400px;
|
||||
height: 37vh;
|
||||
background: rgba(9, 31, 43, 0.5);
|
||||
}
|
||||
.left_block3 .flexItem{
|
||||
width:630px;
|
||||
width:32.8vw;
|
||||
height: 38vh;
|
||||
}
|
||||
.left_block {
|
||||
left: 0;
|
||||
height: 270px;
|
||||
height: 25vh;
|
||||
}
|
||||
.right_block {
|
||||
right: 0;
|
||||
width:640px;
|
||||
height: 670px;
|
||||
width:33vw;
|
||||
height: 62vh;
|
||||
}
|
||||
.left_block2{
|
||||
left: 320px;
|
||||
height: 270px;
|
||||
left: 16.5vw;
|
||||
height: 25vh;
|
||||
padding: 0 5px;
|
||||
}
|
||||
.left_block2 .flexItem{
|
||||
width:310px;
|
||||
width:16vw;
|
||||
}
|
||||
.flexItem{
|
||||
width: 310px;
|
||||
width: 16.5vw;
|
||||
}
|
||||
.videoFlexItem{
|
||||
width: 630px;
|
||||
height: 400px;
|
||||
width: 32.8vw;
|
||||
height: 37vh;
|
||||
}
|
||||
.newsFlexItem{
|
||||
width: 620px;
|
||||
height: 270px;
|
||||
width: 32.8vw;
|
||||
height: 25vh;
|
||||
}
|
||||
/* //短标题 */
|
||||
.itemTitle{
|
||||
color: #fff;
|
||||
height:45px;
|
||||
padding-left: 1.5em;
|
||||
font-size: 16px;
|
||||
line-height: 40px;
|
||||
height: 4.2vh;
|
||||
padding-left: 1.5em;
|
||||
font-size: 1.3vh;
|
||||
line-height: 4vh;
|
||||
width: 16vw;
|
||||
background-size: 100% 100%;
|
||||
background-image: url("/public/img/gx/title_bg2.png");
|
||||
}
|
||||
/* //长标题 */
|
||||
.itemTitle2 {
|
||||
color: #fff;
|
||||
height:45px;
|
||||
height:4.2vh;
|
||||
padding-left: 1.5em;
|
||||
font-size: 16px;
|
||||
line-height: 40px;
|
||||
font-size: 1.3vh;
|
||||
line-height: 4vh;
|
||||
background: url("/public/img/gx/title_bg.png") ;
|
||||
background-size: 100% 100%;
|
||||
display: flex;
|
||||
|
|
@ -1329,7 +1322,7 @@ export default {
|
|||
}
|
||||
|
||||
.block1NumberWrap{
|
||||
width:135px;
|
||||
width:7.5vw;
|
||||
border: 1px solid rgba(54, 217, 187, 0.3);
|
||||
padding: 3px;
|
||||
text-align: center;
|
||||
|
|
@ -1337,20 +1330,20 @@ export default {
|
|||
.block1Numberinner{
|
||||
background: rgba(54, 217, 187, 0.3);
|
||||
color: #fff;
|
||||
height:64px;
|
||||
line-height:80px;
|
||||
height: 6vh;
|
||||
line-height: 7.5vh;
|
||||
position: relative;
|
||||
}
|
||||
.block1Text{
|
||||
top: 0;
|
||||
left: 10px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
height: 2vh;
|
||||
line-height: 2vh;
|
||||
position: absolute;
|
||||
font-size: 14px;
|
||||
font-size: 0.8vh;
|
||||
}
|
||||
.block1Number{
|
||||
font-size: 26px;
|
||||
font-size: 1.6vh;
|
||||
vertical-align: bottom;
|
||||
margin: 0 0.5em;
|
||||
color: orange;
|
||||
|
|
@ -1374,7 +1367,7 @@ export default {
|
|||
display: flex;
|
||||
}
|
||||
.boxmain{
|
||||
height: 140px;
|
||||
height: 13vh;
|
||||
width:100%;
|
||||
margin:auto;
|
||||
}
|
||||
|
|
@ -1384,7 +1377,7 @@ export default {
|
|||
position: absolute;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
height: 340px;
|
||||
height: 31vh;
|
||||
overflow: hidden;
|
||||
}
|
||||
.bottom_block2{
|
||||
|
|
@ -1392,22 +1385,22 @@ export default {
|
|||
position: absolute;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
height: 340px;
|
||||
height: 31.4vh;
|
||||
display: flex;
|
||||
transition: left 2s ease;
|
||||
}
|
||||
|
||||
.flexItem3 {
|
||||
width: 384px;
|
||||
height: 340px;
|
||||
width: 20vw;
|
||||
height: 31.5vh;
|
||||
position: relative;
|
||||
background: rgba(9, 31, 43, 0.5)
|
||||
}
|
||||
.flexItem3_title{
|
||||
left: 50%;
|
||||
width: 150px;
|
||||
height: 30px;
|
||||
line-height: 28px;
|
||||
width: 7.8vw;
|
||||
height: 2.8vh;
|
||||
line-height: 2.5vh;
|
||||
font-size: 16px;
|
||||
color: #00ffff;
|
||||
text-align: center;
|
||||
|
|
@ -1416,24 +1409,24 @@ export default {
|
|||
box-shadow: inset 0 0 5px 5px rgb(0 255 255 / 32%);
|
||||
z-index: 99;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
top: 0.6vh;
|
||||
transform: translateX(-50%);
|
||||
background: rgb(4 50 83);
|
||||
}
|
||||
.flexItem3Body{
|
||||
width: 380px;
|
||||
height: 315px;
|
||||
padding-top: 25px;
|
||||
width: 19.8vw;
|
||||
height: 28.5vh;
|
||||
padding-top: 2.3vh;
|
||||
border: 1px solid #00ffff;
|
||||
border-radius: 5px;
|
||||
position: absolute;
|
||||
top: 15px;
|
||||
top: 2vh;
|
||||
box-shadow: inset 0 0 15px 5px rgb(0 255 255 / 32%);
|
||||
}
|
||||
|
||||
.inmBoxmain{
|
||||
flex: 1;
|
||||
height:140px;
|
||||
height:12.96vh;
|
||||
width:98%;
|
||||
margin:auto;
|
||||
/* border-left: 2px solid #0f5b8e; */
|
||||
|
|
@ -1444,21 +1437,21 @@ export default {
|
|||
}
|
||||
.viewsItem {
|
||||
color: #ffffff;
|
||||
width: 620px;
|
||||
height: 100px;
|
||||
width: 32.3vw;
|
||||
height: 9.26vh;
|
||||
font-size: 15px;
|
||||
display: inline-block;
|
||||
margin-bottom: 10px;
|
||||
margin-bottom: 1vh;
|
||||
}
|
||||
.viewsItem_wrap {
|
||||
height: 100px;
|
||||
height: 9.26vh;
|
||||
flex-direction: column;
|
||||
border-left: 5px solid rgba(28, 169, 231, 0.81);
|
||||
padding-left: 10px;
|
||||
border-radius: 5px;
|
||||
}
|
||||
.viewsItem_img{
|
||||
width: 85px;
|
||||
width: 4.4vw;
|
||||
margin-top: 10px;
|
||||
}
|
||||
article{
|
||||
|
|
|
|||
|
|
@ -18,14 +18,33 @@
|
|||
>
|
||||
<el-row>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="工艺路线" prop="route">
|
||||
<el-form-item label="关联任务" prop="mtask">
|
||||
<el-select
|
||||
v-model="form.mtask"
|
||||
placeholder="关联任务"
|
||||
clearable
|
||||
style="width: 100%"
|
||||
@change="changeMtask"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in options"
|
||||
:key="item.id"
|
||||
:label="item.number"
|
||||
:value="item.id"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="工艺路线">
|
||||
<el-select
|
||||
v-model="form.route"
|
||||
placeholder="工艺路线"
|
||||
clearable
|
||||
disabled
|
||||
filterable
|
||||
style="width: 100%"
|
||||
:disabled="mode == 'edit'"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in routeOptions"
|
||||
|
|
@ -42,25 +61,6 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="关联任务">
|
||||
<el-select
|
||||
v-model="form.mtask"
|
||||
placeholder="关联任务"
|
||||
clearable
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in options"
|
||||
:key="item.id"
|
||||
:label="item.number"
|
||||
:value="item.id"
|
||||
>
|
||||
<!-- <span>{{ item.material_out_name }}</span>/ -->
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="备注">
|
||||
<el-input
|
||||
|
|
@ -129,11 +129,10 @@ export default {
|
|||
form: Object.assign({}, defaultForm),
|
||||
//验证规则
|
||||
rules: {
|
||||
|
||||
route: [
|
||||
mtask: [
|
||||
{
|
||||
required: true,
|
||||
message: "请选择工艺路线",
|
||||
message: "请选择任务",
|
||||
trigger: "blur",
|
||||
},
|
||||
],
|
||||
|
|
@ -185,7 +184,14 @@ export default {
|
|||
Object.assign(this.form, data);
|
||||
this.getRoute(data.id);
|
||||
},
|
||||
|
||||
changeMtask(){
|
||||
let that = this;
|
||||
that.options.forEach((item) => {
|
||||
if(item.id == that.form.mtask){
|
||||
that.form.route = item.route;
|
||||
}
|
||||
})
|
||||
},
|
||||
//表单提交方法
|
||||
submit() {
|
||||
let that = this;
|
||||
|
|
|
|||
Loading…
Reference in New Issue