Merge remote-tracking branch 'origin/master'

xyc

2024-11-07 769ba15e9071b01cb53a65e8fdf4c8f37ac005b9

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

@@ -9,7 +9,7 @@
        </el-form-item>
      </el-form>
      <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px"
                v-adaptive="{bottomOffset:70}" border @selection-change="table.selectionChangeHandle"
                v-adaptive="{bottomOffset:30}" border @selection-change="table.selectionChangeHandle"
                row-key="iid"
                :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
                :default-expand-all="true">
@@ -33,9 +33,9 @@
          </template>
        </el-table-column>
      </el-table>
      <el-dialog v-dialogDrag :title="title" top="1vh" width='95%' :visible.sync="dialogVisible2" v-if="dialogVisible2">
        <model-view ref="modelView"></model-view>
      </el-dialog>
<!--      <el-dialog v-dialogDrag :title="title" top="1vh" width='95%' :visible.sync="dialogVisible2" v-if="dialogVisible2">-->
<!--        <model-view ref="modelView"></model-view>-->
<!--      </el-dialog>-->
    </zt-table-wraper>
  </div>
</template>
@@ -144,15 +144,15 @@
        }
      },
      drawRBD(row) {
        this.dialogVisible2 = true
        this.title=row.modelName + '模型设计'
        let param = {
          id: row.modelId,
          modelName: row.modelName,
          collapseTransition:0,
          title:row.modelName + '模型设计'
        }
        this.$nextTick(() => {
          this.$refs.modelView.init(param)
        })
        this.$emit('collapseTransitionChange', param)


      }
    }
  }