From 3b3521961c246eda35cde1fde685e3931f8af529 Mon Sep 17 00:00:00 2001 From: wente <329538422@qq.com> Date: 星期一, 28 十月 2024 08:46:25 +0800 Subject: [PATCH] 仿真字体 数量提示 箭头缝隙 --- web/src/views/modules/taskReliability/SimulatAssess.vue | 131 +++++++++++++++++++++++++++---------------- 1 files changed, 82 insertions(+), 49 deletions(-) diff --git a/web/src/views/modules/taskReliability/SimulatAssess.vue b/web/src/views/modules/taskReliability/SimulatAssess.vue index 55d2a39..915cb2e 100644 --- a/web/src/views/modules/taskReliability/SimulatAssess.vue +++ b/web/src/views/modules/taskReliability/SimulatAssess.vue @@ -1,55 +1,65 @@ <template> <div class="fa-card-a"> <el-row :gutter="5"> - <div class="mod-taskReliability-simulatAssess"> - <el-form :inline="true" :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="80px"> - <zt-form-item label="浜у搧鑺傜偣" prop="productId"> - <zt-select v-model="dataForm.productId" :datas="productList" @change="onProductSelected"/> - </zt-form-item> - <zt-form-item label="鎬讳綋浠诲姟" prop="taskModelId"> - <zt-select v-model="dataForm.taskModelId" :datas="taskList" @change="onTaskSelected"/> - </zt-form-item> - <zt-form-item label="閲囨牱鍛ㄦ湡" prop="samplPeriod"> - <el-input type="number" :min="1" v-model="dataForm.samplPeriod"> - <template slot="append">鍒嗛挓</template> - </el-input> - </zt-form-item> - <zt-form-item label="浠跨湡娆℃暟" prop="simulatFrequency"> - <el-input type="number" :min="1" v-model="dataForm.simulatFrequency"> - <template slot="append">娆℃暟</template> - </el-input> - </zt-form-item> - <zt-form-item> - <zt-button @click="analyze()">浠跨湡鍒嗘瀽</zt-button> - </zt-form-item> - </el-form> - <el-progress v-if="isShow" :percentage="percentage"></el-progress> - <div> + <el-form :inline="true" :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="80px"> + <zt-form-item label="浜у搧鑺傜偣" prop="productId"> + <zt-select v-model="dataForm.productId" :datas="productList" @change="onProductSelected"/> + </zt-form-item> + <zt-form-item label="鎬讳綋浠诲姟" prop="taskModelId"> + <zt-select v-model="dataForm.taskModelId" :datas="taskList" @change="onTaskSelected"/> + </zt-form-item> + <zt-form-item label="鏃堕棿鍒嗙墖" prop="samplPeriod" > + <el-input type="number" :min="1" v-model="dataForm.samplPeriod" style="width: 150px;vertical-align: baseline;"> + <template slot="append">鍒嗛挓</template> + </el-input> + </zt-form-item> + <zt-form-item label="浠跨湡娆℃暟" prop="simulatFrequency" > + <el-input type="number" :min="1" v-model="dataForm.simulatFrequency" style="width: 150px;vertical-align: baseline;"> + <template slot="append">娆℃暟</template> + </el-input> + </zt-form-item> + <el-form-item prop="repairDiracFlag" label-width="150px" style="margin-left: 20px"> + <el-checkbox v-model="dataForm.repairDiracFlag">鍙慨璁惧鍙潬搴︿负1</el-checkbox> + </el-form-item> + <zt-form-item style="margin-left: 20px"> + <zt-button @click="analyze()">浠跨湡鍒嗘瀽</zt-button> + </zt-form-item> + </el-form> + <el-progress v-if="isShow" :percentage="percentage"></el-progress> <el-col :span="4"> - <div style="margin-right: 5px;height: calc(88vh - 100px)" v-if="isSelect"> - <product-model-tree :isShow="false"></product-model-tree> + <div style="margin-right: 5px;height: calc(100vh - 230px)" v-if="isSelect"> + <product-model-tree @on-selected="onTreeSelected" showXdy="false" + ref="ProductModelTree" :isShow="false" basic="4" :productId="dataForm.productId"/> </div> </el-col> <el-col :span="20"> - <div style="margin-top: 20px"> - <div style="margin-left: 400px" v-if="isShow"> - <el-tag type="info" effect="dark" style="font-size: 20px">MTBF:{{MTBF}}</el-tag> - <el-tag type="info" effect="dark" style="margin-left: 50px;font-size: 20px">MTTR:{{MTTR}}</el-tag> - </div> - <div> + <div class="fa-card-a" style="height: calc(100vh - 230px)"> <SimulatCurve ref="SimulatCurve"></SimulatCurve> - </div> </div> </el-col> - </div> - </div> </el-row> + <el-dialog v-dialogDrag :close-on-click-modal="false" top="8vh" :visible.sync="dialogVisible" title="妯″瀷妫�鏌�" width="60%" @close="dialogVisible = false"> + <el-tag type="danger" style="margin-bottom: 10px">妯″瀷瀹氫箟/鍙傛暟閰嶇疆閲屽瓨鍦ㄤ互涓嬮棶棰橈細</el-tag> + <el-table :data="modelCheckResult" height="350" + :header-cell-style="{'text-align':'center'}"> + <el-table-column prop="category" label="妫�鏌ョ粨鏋�" align="center" width="150"/> + <el-table-column prop="taskName" label="浠诲姟鍚嶇О" align="center"/> + <el-table-column prop="taskPhaseName" label="浠诲姟闃舵鍚嶇О" align="center"/> + <el-table-column prop="gkName" label="宸ュ喌鍚嶇О" align="center"/> + <el-table-column prop="nodeName" label="鑺傜偣鍚嶇О" align="center"/> + <el-table-column prop="modelName" label="妯″瀷鍚嶇О" align="center"/> + <el-table-column prop="deviceName" label="璁惧鍚嶇О" align="center"/> + <el-table-column prop="paramName" label="鍙傛暟鍚嶇О" align="center"/> + </el-table> + <div slot="footer" class="dialog-footer"> + <el-button type="primary" @click="dialogVisible = false">鍏� 闂�</el-button> + </div> + </el-dialog> </div> </template> <script> import SimulatCurve from "./SimulatCurve"; - import SimulatData from "./SimulatData"; import ProductModelTree from "../basicInfo/ProductModelTree"; @@ -68,13 +78,16 @@ id: '', pid: '', productId: '', + showProductId: '', taskModelId: '', - dataType: '', - isRepair: '', - samplPeriod: '', - simulatFrequency: '', - simulatTime: '' - } + dataType: 'fz', + samplPeriod: '10', + simulatFrequency: 500, + simulatTime: '', + repairDiracFlag: false + }, + dialogVisible: false, + modelCheckResult: [], } }, mounted() { @@ -83,23 +96,33 @@ watch: { percentage() { if (this.percentage === 100) { - this.$refs.SimulatCurve.initEcharts(this.dataForm.id,this.dataForm.taskModelId, this.dataForm.samplPeriod); + this.$refs.SimulatCurve.initEcharts(this.dataForm); } } }, components: { ProductModelTree, SimulatCurve, - SimulatData }, methods: { + onTreeSelected(data) { + if (this.dataForm.id){ + console.log(data, 'onProductSelected') + this.dataForm.showProductId = data.id + this.$refs.SimulatCurve.getProductEcharts(this.dataForm); + } + }, // 鑾峰彇淇℃伅 onProductSelected(data) { this.isSelect = true console.log(data, ' onProductSelected(data)') this.dataForm.productId = data.id this.getTaskList() + this.dataForm.taskModelId = '' + this.$nextTick(() => { + this.$refs.ProductModelTree.getProductList() + }) }, onTaskSelected(data) { console.log(data, ' onProductSelected(data)') @@ -108,6 +131,7 @@ async getProductList() { let res = await this.$http.get('/basicInfo/XhProductModel/getTaskProductList') this.productList = res.data + this.onProductSelected(this.productList[0]) }, async getTaskList() { let params = { @@ -118,12 +142,12 @@ this.taskList = res.data }, getStroke() { - //console.log('getStroke:',this.progress.start,"锛�",this.progress.speed) if (this.percentage < 100) { - //console.log('getStroke2') - this.$http.get(`/taskReliability/SimulatAssess/getCalcProgress?taskId=${this.dataForm.id}`).then( + let param = { + taskList: [this.dataForm.id] + } + this.$http.get(`/taskReliability/SimulatAssess/getCalcProgress`, {params: param}).then( res => { - // console.log(res.data, 'res.data') if (res.data) { this.percentage = parseFloat(res.data) } @@ -131,15 +155,24 @@ ) } else { clearInterval(this.timers) + this.percentage = 0 } }, async analyze() { + this.dialogVisible = false + this.modelCheckResult = [] this.isShow = true let result = await this.$http.get(`/basicInfo/TyProductModel/getUuid`) this.dataForm.id = result.data let res = await this.$http.post('/taskReliability/SimulatAssess/analyze', this.dataForm) if (res.success) { - this.timers = window.setInterval(this.getStroke, 1000) + console.log(res.data) + if (res.data && res.data.length > 0) { + this.modelCheckResult = res.data + this.dialogVisible = true + } else { + this.timers = window.setInterval(this.getStroke, 1000) + } } } } -- Gitblit v1.9.1