Merge remote-tracking branch 'origin/master'

xyc

2024-10-28 b02c7eb73aabc8531b6e52b02fc15489f0441b52

 web/src/views/modules/taskReliability/SimulatAssess.vue

@@ -8,17 +8,20 @@
        <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">
        <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">
        <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>
        <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>
@@ -35,9 +38,9 @@
            </div>
          </el-col>
    </el-row>
    <el-dialog :close-on-click-modal="false" :visible.sync="dialogVisible" title="模型检查" width="60%" @close="dialogVisible = false">
      <el-tag type="danger">模型定义/参数配置里存在以下问题：</el-tag>
      <el-table :data="modelCheckResult" height="100px" v-adaptive="{bottomOffset:30}"
    <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"/>
@@ -81,6 +84,7 @@
          samplPeriod: '10',
          simulatFrequency: 500,
          simulatTime: '',
          repairDiracFlag: false
        },
        dialogVisible: false,
        modelCheckResult: [],
@@ -115,6 +119,7 @@
        console.log(data, ' onProductSelected(data)')
        this.dataForm.productId = data.id
        this.getTaskList()
        this.dataForm.taskModelId = ''
        this.$nextTick(() => {
          this.$refs.ProductModelTree.getProductList()
        })
@@ -138,7 +143,10 @@
      },
      getStroke() {
        if (this.percentage < 100) {
          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 => {
              if (res.data) {
                this.percentage = parseFloat(res.data)
@@ -159,7 +167,7 @@
        let res = await this.$http.post('/taskReliability/SimulatAssess/analyze', this.dataForm)
        if (res.success) {
          console.log(res.data)
          if (res.data != null && res.data.length > 0) {
          if (res.data && res.data.length > 0) {
            this.modelCheckResult = res.data
            this.dialogVisible = true
          } else {