Merge remote-tracking branch 'origin/master'

xyc

2024-08-16 33246bb56e05b273944ec1cc03a58dc112e48848

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

@@ -9,7 +9,7 @@
          <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">
          <zt-form-item label="时间分片" prop="samplPeriod">
            <el-input type="number" :min="1" v-model="dataForm.samplPeriod">
              <template slot="append">分钟</template>
            </el-input>
@@ -28,11 +28,10 @@
          <el-col :span="4">
            <div style="margin-right: 5px;height: calc(88vh - 100px)" v-if="isSelect">
              <product-model-tree @on-selected="onTreeSelected" showXdy="false"
                                  ref="ProductModelTree" :isShow="false"/>
                                  ref="ProductModelTree" :isShow="false" basic="4" :productId="dataForm.productId"/>
            </div>
          </el-col>
          <el-col :span="20">

            <div style="margin-top: 20px">
              <div>
                <SimulatCurve ref="SimulatCurve"></SimulatCurve>
@@ -47,7 +46,6 @@

<script>
  import SimulatCurve from "./SimulatCurve";
  import SimulatData from "./SimulatData";
  import ProductModelTree from "../basicInfo/ProductModelTree";


@@ -88,14 +86,15 @@
    components: {
      ProductModelTree,
      SimulatCurve,
      SimulatData
    },

    methods: {
      onTreeSelected(data) {
        console.log(data, 'onProductSelected')
        this.dataForm.showProductId = data.id
        this.$refs.SimulatCurve.getProductEcharts(this.dataForm);
        if (this.dataForm.id){
          console.log(data, 'onProductSelected')
          this.dataForm.showProductId = data.id
          this.$refs.SimulatCurve.getProductEcharts(this.dataForm);
        }
      },
      // 获取信息
      onProductSelected(data) {
@@ -103,6 +102,9 @@
        console.log(data, ' onProductSelected(data)')
        this.dataForm.productId = data.id
        this.getTaskList()
        this.$nextTick(() => {
          this.$refs.ProductModelTree.getProductList()
        })
      },
      onTaskSelected(data) {
        console.log(data, ' onProductSelected(data)')
@@ -111,6 +113,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 = {