Crunchy
2024-07-13 cc364c01de920e57f0ba870ad239ba9a085274ff
设备数采配置提交
已修改3个文件
93 ■■■■■ 文件已修改
src/assets/api/controller.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b6-device-management/b6-data-acquisition-config.vue 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/a6-device-management.vue 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/api/controller.js
@@ -148,6 +148,8 @@
  selectDeviceByCode: "/deviceScope/selectDeviceByCode", //通过设备编号获取设备列表
  getNumberCollect: "/deviceScope/getNumberCollect", //查询数采配置
  numberCollect: "/deviceScope/numberCollect", //维护数采配置
  saveDataAcquisitionConfiguration: "/deviceScope/saveDataAcquisitionConfiguration", // 维护数采配置
}
const insOrder = {
src/components/do/b6-device-management/b6-data-acquisition-config.vue
@@ -14,7 +14,8 @@
      <el-table :data="tableList.slice((page.current - 1) * page.size, page.current * page.size)"
                border tooltip-effect="dark" style="width: 100%;" height="100%">
        <el-table-column type="index" label="序号" align="center" width="65"></el-table-column>
        <el-table-column prop="insProductItem" align="center" label="检验项目"></el-table-column>
        <el-table-column prop="insProductItem" align="center" label="检验项目">
        </el-table-column>
        <el-table-column prop="section" label="操作" width="120">
          <template slot-scope="scope">
            <el-button type="text" @click="dataConfig(scope.row)">数采配置</el-button>
@@ -50,11 +51,11 @@
        <div class="fomItem1"
             v-for="(domain, index) in domains"
             :key="index">
          <el-form-item class="fomItemInput" label="参照1:">
            <el-input v-model="domain.refer1"></el-input>
          <el-form-item class="fomItemInput" label="参照X:">
            <el-input v-model="domain.referx"></el-input>
          </el-form-item>
          <el-form-item class="fomItemInput" label="参照2:">
            <el-input v-model="domain.refer2"></el-input>
          <el-form-item class="fomItemInput" label="参照Y:">
            <el-input v-model="domain.refery"></el-input>
          </el-form-item>
          <el-form-item class="fomItemInput" label="X:">
            <el-input v-model="domain.x"></el-input>
@@ -72,9 +73,6 @@
        <div class="fomItem1">
          <el-form-item class="fomItemInput" label="公式:" prop="formula">
            <el-input v-model="configForm.formula" @change="evalResult"></el-input>
          </el-form-item>
          <el-form-item class="fomItemInput" label="结果:" prop="result">
            <el-input v-model="configForm.result" disabled></el-input>
          </el-form-item>
        </div>
      </el-form>
@@ -99,6 +97,12 @@
      default: () => []
    }
  },
  mounted() {
    this.tableList.forEach(i => {
      let data = i.insProductItem.split(',')
      i.insProductItem = data[data.length - 1]
    })
  },
  data() {
    // 这里存放数据
    return {
@@ -121,28 +125,31 @@
      },
      domains: [
        {
          refer1: '',
          refer2: '',
          referx: '',
          refery: '',
          x: '',
          y: ''
        }
      ],
      upLoad3:false,
      fileTypeOptions: [
        {label: 'csv', value: 'csv'},
        {label: 'db', value: 'db'},
        {label: 'mdb', value: 'mdb'},
        {label: 'word', value: 'word'},
        {label: 'excel', value: 'excel'},
        {label: 'txt', value: 'txt'},
        {label: 'pdf', value: 'pdf'},
        {label: 'csv', value: '.csv'},
        {label: 'db', value: '.db'},
        {label: 'mdb', value: '.mdb'},
        {label: 'word', value: '.docx'},
        {label: 'excel', value: '.xlsx'},
        {label: 'txt', value: '.txt'},
        {label: 'png', value: '.png'},
      ]
    }
  },
  // 方法集合
  methods: {
    dataConfig (row) {
      this.configForm = {}
      this.configForm = {
        deviceId: row.deviceId,
        insProductItem: row.insProductItem
      }
      this.dialogVisible3 = true
      // this.$axios.post(this.$api.deviceScope.getNumberCollect+'?id='+row.id).then(res => {
      //   this.configForm = res.data
@@ -155,12 +162,21 @@
            const isEmpty = Object.values(item).every(val => val === '')
            if (isEmpty) {
              this.$message.error('请填写参照数据')
            } else {
              // 通过校验
            }
          })
          this.domains.forEach(i => {
            i.fileType = this.configForm.fileType
            i.collectUrl = this.configForm.collectUrl
            i.storageUrl = this.configForm.storageUrl
            i.formula = this.configForm.formula
            i.deviceId = this.configForm.deviceId
            i.insProductItem = this.configForm.insProductItem
          })
          console.log(`output->this.domains`,this.domains)
          this.$axios.post(this.$api.deviceScope.saveDataAcquisitionConfiguration, this.domains).then(res => {
            console.log(`output->res`,res)
          })
        } else {
          console.log('error submit!!');
          return false;
        }
      });
@@ -175,8 +191,8 @@
    addDomain() {
      // 添加公式formItem
      this.domains.push({
        refer1: '',
        refer2: '',
        referx: '',
        refery: '',
        x: '',
        y: ''
      });
@@ -192,8 +208,8 @@
    },
    closeForm () {
      this.domains = [{
        refer1: '',
        refer2: '',
        referx: '',
        refery: '',
        x: '',
        y: ''
      }]
src/components/view/a6-device-management.vue
@@ -595,21 +595,21 @@
                    if (power[i].menuMethod == 'addDeviceParameter') {
                        add = true
                    }
          if (power[i].menuMethod == 'numberCollect') {
                      if (power[i].menuMethod == 'numberCollect') {
                        config = true
                    }
                }
        if (!config) {
                    this.componentData.do.splice(2, 1)
                }
                if (!up) {
                    this.componentData.do.splice(1, 1)
                }
                if (!del) {
                    this.componentData.do.splice(0, 1)
                }
                this.addPower = add
            },
                if (!config) {
                            this.componentData.do.splice(2, 1)
                        }
                        if (!up) {
                            this.componentData.do.splice(1, 1)
                        }
                        if (!del) {
                            this.componentData.do.splice(0, 1)
                        }
                        this.addPower = add
                    },
            // 获取字典
            selectEnumByCategory() {
                this.$axios.post(this.$api.enums.selectEnumByCategory, {
@@ -851,6 +851,7 @@
        let list2 = []
        list.map((item) => {
          const obj = Object.assign({
            deviceId: row.id,
            insProductItem: item,
          })
          list2.push(obj)