From 04b8eff075a04db23e6f908855699b4d2954588c Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期四, 23 五月 2024 18:47:01 +0800
Subject: [PATCH] 380新产品,优化
---
jcdm-ui/src/views/main/cfkb/Instructions/index.vue | 145 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 105 insertions(+), 40 deletions(-)
diff --git a/jcdm-ui/src/views/main/cfkb/Instructions/index.vue b/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
index 1001b5c..48a3e91 100644
--- a/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
+++ b/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
@@ -2,26 +2,29 @@
<div class="app-container">
<el-row :gutter="3">
<el-col :span="6">
- <el-card shadow="always">
- <img style="width: 200px;height: 50px; margin-left: 40px; margin-top: 0px" src="@/assets/logo/jcdm2.png" alt="dark">
- <span style="margin-left: 66px; font-weight: bold">{{currentTime}}</span>
+ <el-card shadow="always" class="boxSize">
+ <div class="centerImg">
+ <img style="width: 140px;height: 30px;" src="@/assets/logo/jcdm2.png" alt="dark">
+<!-- <span class="nextLine" style="font-weight: bold">{{currentTime}}</span>-->
+ </div>
+
</el-card>
</el-col>
<el-col :span="3">
- <el-card shadow="always">
- <span class="centerText" style="margin-top: 26px">{{locationCode}}</span>
+ <el-card shadow="always" class="boxSize">
+ <span class="centerText" style="height: 60px">{{locationCode}}</span>
</el-card>
</el-col>
<el-col :span="15">
- <el-card shadow="always">
- <span class="centerText">{{locationName}}</span>
+ <el-card shadow="always" class="boxSize">
+ <span class="centerText" >{{locationName}}</span>
</el-card>
</el-col>
</el-row>
<el-row :gutter="3" style="margin-top: 5px">
<el-col :span="6">
- <div style="height: 600px;overflow: auto;">
- <div class="container" style="height: 50px;background-color: #00afff;margin-bottom: 10px">
+ <div style="height: 550px;overflow: auto;">
+ <div class="container" style="height: 50px;background-color: #00afff;margin-bottom: 5px">
<span class="centered">浣滀笟娴佺▼</span>
</div>
<div v-for="(item,index) in tableData" :key="item.index" class="outerDiv" :id="'outerDiv'+index">
@@ -35,51 +38,75 @@
</div>
</el-col>
<el-col :span="18">
- <el-col :span="20">
- <el-card style="height: 600px" shadow="always">
- <el-row style="height: 100px">
- <span style="color: #31b431;font-size: 30px;font-weight: bold">{{address}}</span>
+ <el-col :span="18">
+ <el-card style="height: 550px" shadow="always">
+ <el-row style="height: 60px">
+ <span style="color: #31b431;font-size: 20px;font-weight: bold">{{address}}</span>
</el-row>
- <el-row style="height: 400px">
- <el-image style="height: 390px;width: 960px" :src="src"></el-image>
+ <el-row style="height: 420px">
+ <div class="centerImg">
+ <el-image style="height: 400px;width: 400px;" :src="src"></el-image>
+ </div>
+
<!-- {{src}}-->
</el-row>
- <el-row style="height: 100px">
- <el-button type="primary" @click="backClick()" style="height: 50px; width: 130px; font-size: 20px; float: left" icon="el-icon-d-arrow-left">涓婁竴姝�</el-button>
- <el-button type="primary" @click="nextStep()" style="height: 50px; width: 130px; font-size: 20px; float: right">涓嬩竴姝�<i class="el-icon-d-arrow-right"></i></el-button>
+ <el-row style="height: 100%;width: 100%">
+ <el-button type="primary" @click="backClick()" style="height: 50%; width: 20%; font-size: 20%; float: left" icon="el-icon-d-arrow-left">涓婁竴姝�</el-button>
+ <el-button type="primary" @click="nextStep()" style="height: 50%; width: 20%; font-size: 20%; float: right">涓嬩竴姝�<i class="el-icon-d-arrow-right"></i></el-button>
</el-row>
</el-card>
</el-col>
- <el-col :span="4">
- <el-card style="height: 600px" shadow="always">
- <el-row style="height: 100px;margin-top: 100px">
- <el-button type="primary" @click="processDocuments()" style="height: 50px; width: 130px; font-size: 20px; float: left" icon="el-icon-folder-opened">宸ヨ壓鏂囦欢</el-button>
+ <el-col :span="6">
+ <el-card style="height: 550px;width: 100%" shadow="always">
+ <el-row >
+ <div class="centerImg" style="height: 30%; margin-top: 60%">
+ <el-button type="primary" @click="processDocuments()" style="height: 40%; width: 90%; font-size: 70%; float: left" icon="el-icon-folder-opened">宸ヨ壓鏂囦欢</el-button>
+ </div>
+
</el-row>
- <el-row style="height: 80px;margin-top: 5px">
- <el-button type="info" @click="changeProducts('2V91')" :class="{ 'active': isClickd === '2V91' }" style="height: 50px; width: 130px; font-size: 20px; float: left" icon="el-icon-s-unfold">2V91</el-button>
+ <el-row style="height: 30%;margin-top: 40%" class="centerImg">
+ <el-button type="info" @click="changeProducts('2V91')" :class="{ 'active': isClickd === '2V91' }" style="height: 40%; width: 80%; font-size: 70%; float: left" icon="el-icon-s-unfold">2V91</el-button>
</el-row>
- <el-row style="height: 80px;">
- <el-button type="info" @click="changeProducts('191')" :class="{ 'active': isClickd === '191' }" style="height: 50px; width: 130px; font-size: 20px; float: left" icon="el-icon-s-unfold">191</el-button>
+ <el-row style="height: 30%;margin-top: 5%" class="centerImg">
+ <el-button type="info" @click="changeProducts('191')" :class="{ 'active': isClickd === '191' }" style="height: 40%; width: 80%; font-size: 70%; float: left" icon="el-icon-s-unfold">191</el-button>
</el-row>
- <el-row style="height: 80px;">
- <el-button type="info" @click="changeProducts('0JWF')" :class="{ 'active': isClickd === '0JWF' }" style="height: 50px; width: 130px; font-size: 20px; float: left" icon="el-icon-s-unfold">0JWF</el-button>
+ <el-row style="height: 30%;margin-top: 5%" class="centerImg">
+ <el-button type="info" @click="changeProducts('0JWF')" :class="{ 'active': isClickd === '0JWF' }" style="height: 40%; width: 80%; font-size: 70%; float: left" icon="el-icon-s-unfold">0JWF</el-button>
</el-row>
</el-card>
</el-col>
</el-col>
</el-row>
+ <div>
+ <el-dialog
+ title="宸ヨ壓鏂囦欢"
+ :visible.sync="dialogVisible"
+ width="70%"
+ @close="closeMethod"
+
+ >
+ <div><el-image style="height: 1090px;width: 960px;margin-left: 33px" :src="mainProcessSrc"></el-image></div>
+ <span slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="dialogVisible = false" style="margin-right: 80px">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ </div>
</div>
+
</template>
<script>
-import {listFormulaChild, getProductProcess} from "@/api/main/bs/formulaChild/formulaChild";
+import {getMainProductProcess, getProductProcess} from "@/api/main/bs/formulaChild/formulaChild";
import {listStationConf,getIp} from "@/api/main/sc/stationConf";
export default {
name: "index",
data() {
return {
+ dialogVisible: false,
+ mainProcessSrc: '',
+ mainProcess: [],
isClickd: '', // 鍒濆鍖栦负鏈偣鍑荤姸鎬�
locationCode: "鏈厤缃�",
locationName: "鏈厤缃伐浣�",
@@ -149,7 +176,7 @@
mounted() {
this.getStationConf()
// this.changeProducts(this.productCode)
- this.changeProducts("2V91")
+ // this.changeProducts("2V91")
this.getNowTime()
// this.autoShow()
},
@@ -166,8 +193,15 @@
listStationConf(queryParams).then(response => {
this.locationName = response.rows[0].processesName
this.locationCode = response.rows[0].processesCode
+ console.log('llllll',this.locationCode)
+ this.changeProducts("2V91")
});
+
});
+
+ },
+ closeMethod(){
+ this.mainProcessSrc = ''
},
//鑾峰彇褰撳墠鏃堕棿
getNowTime () {
@@ -198,6 +232,10 @@
setImg(index) {
this.address = this.tableData[index].address
this.src = this.tableData[index].img
+ },
+ cleanImg(){
+ this.address = ''
+ this.src = ''
},
setBg() {
if (document.getElementById('outerDiv' + (this.tableData.length - 1)).style.background === 'yellow') {
@@ -234,12 +272,20 @@
this.getUpOrDown(1)
},
processDocuments(){
-
+ getMainProductProcess(this.queryParams).then(res => {
+ this.mainProcess = res.rows
+ if (res.rows!=null && res.rows.length>0){
+ this.mainProcessSrc = res.rows[0].img
+ }
+ })
+ this.dialogVisible = true
},
changeProducts(val){
+
console.log("------鏇存崲鍥剧墖",val)
console.log("------鐩綍==============",this.tableData)
+ console.log("locationCode",this.locationCode)
this.productCode = val
const _this = this
@@ -247,8 +293,9 @@
/** 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛� */
this.queryParams.productCode = val;
this.queryParams.processesCode = this.locationCode
- listFormulaChild(this.queryParams).then(response => {
+ getProductProcess(this.queryParams).then(response => {
this.tableData = [];
+ this.cleanImg()
this.tableData = response.rows;
this.$nextTick(() => {
clearInterval(this.intervalId);
@@ -272,8 +319,8 @@
width: fit-content;
min-width: 102%;
/*width: 300px;*/
- height: 50px;
- margin-bottom: 10px;
+ height: 30px;
+ margin-bottom: 5px;
}
.innerDiv1 {
@@ -301,6 +348,7 @@
white-space: nowrap;
padding-left: 5px;
padding-right: 5px;
+ font-size: 20px;
}
.container {
display: flex;
@@ -318,17 +366,34 @@
.centerText{
color: black;
font-weight: bold;
- font-size: 40px;
+ font-size: 20px;
display: flex;
justify-content: center;
- margin-top: 20px
-}
-::v-deep .el-card__body{
- height: 100px;
+ margin-top: 5px
}
.active {
background-color: #31b431; /* 鐐瑰嚮鍚庣殑鑳屾櫙鑹� */
}
-
+::v-deep .el-dialog {
+ height: 90%;
+ overflow-y: auto;
+}
+::v-deep .el-dialog__footer{
+ margin-top: 10px;
+}
+::v-deep .el-card .is-always-shadow{
+ height: 60px;
+}
+.boxSize{
+ height: 60px;
+}
+.nextLine{
+ display: block;
+}
+.centerImg{
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
</style>
--
Gitblit v1.9.3