From d86d6a6dca39eff9cbd9073c9e23e58308864e51 Mon Sep 17 00:00:00 2001 From: yyt <306727702@qq.com> Date: 星期二, 23 一月 2024 08:25:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- jcdm-ui/src/views/main/cfkb/Instructions/index.vue | 42 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 38 insertions(+), 4 deletions(-) diff --git a/jcdm-ui/src/views/main/cfkb/Instructions/index.vue b/jcdm-ui/src/views/main/cfkb/Instructions/index.vue index 835ee13..8e5781f 100644 --- a/jcdm-ui/src/views/main/cfkb/Instructions/index.vue +++ b/jcdm-ui/src/views/main/cfkb/Instructions/index.vue @@ -69,17 +69,36 @@ </el-col> </el-row> + <div> + <el-dialog + title="宸ヨ壓鏂囦欢" + :visible.sync="dialogVisible" + width="70%" + lock-scroll="false" + @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">纭� 瀹�</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: "鏈厤缃伐浣�", @@ -173,6 +192,9 @@ }); }, + closeMethod(){ + this.mainProcessSrc = '' + }, //鑾峰彇褰撳墠鏃堕棿 getNowTime () { let speed = 1000 @@ -242,7 +264,13 @@ 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){ @@ -257,7 +285,7 @@ /** 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛� */ 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; @@ -340,6 +368,12 @@ .active { background-color: #31b431; /* 鐐瑰嚮鍚庣殑鑳屾櫙鑹� */ } - +::v-deep .el-dialog { + height: 90%; + overflow-y: auto; +} +::v-deep .el-dialog__footer{ + margin-top: 10px; +} </style> -- Gitblit v1.9.3