Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

zouyu

2023-09-13 e31a294cd6ce4cdc41a2df4a5d3994b0f14f1eb2

 src/components/view/laboratoryManagement.vue

@@ -55,7 +55,7 @@
                    placeholder="请选择设备组"
                  >
                    <el-option
                      v-for="list in equip"
                      v-for="list in equaip"
                      :key="list"
                      :label="list"
                      :value="list"
@@ -190,7 +190,7 @@
        <el-radio-button  label="1">生产设备</el-radio-button>
        <el-radio-button  label="2">检验设备</el-radio-button>
        </el-radio-group>
        <el-input
        <!-- <el-input
          class="frame_input"
          v-model="search_class"
          placeholder="请输入分类名称"
@@ -202,14 +202,17 @@
            style="font-size: 23px; padding: 5px 0;cursor:pointer;"
            @click="handlerDeptList"
          ></i>
        </el-input>
        </el-input> -->
        <el-tree
          :data="towTree"
          ref="tree"
          :props="{ children: 'children', label: 'father' }"
          node-key="id"
          default-expand-all
          highlight-current
          style="margin-top: 20px;"
          @node-click="handleNodeClick"
          
        >
          <div class="custom-tree-node" slot-scope="{ node, data }">
            <span
@@ -409,7 +412,7 @@
      // BOM树数据结构
      towTree: [],
      equipment: '',
      equip:'',
      equaip:'',
      ruleForm: {
        // 新增仪器表单
        code: "",
@@ -424,7 +427,7 @@
        treedata:{
            father:'设备组1',
        },
        equr:1,
        equr:'',
      },
      delete:{},
      equip:1,
@@ -532,15 +535,16 @@
        .catch(_ => {});
    },
    testItem() {
      this.listgroup()
      this.dialogVisible = true;
      this.$axios.get(this.$api.url.addDeviceKeeper).then(res => {
        this.keeperList = res.data;
      });
      this.listgroup()
    },
    listgroup() {
        this.$axios.get(this.$api.url.listgroup).then(res =>{
            this.equip = res.data
            this.equaip = res.data
            console.log(this.equip);
        })
    },
    RadioChange(val){
@@ -551,7 +555,7 @@
    twoTreeApi() {
      this.$axios.get(this.$api.url.towTree,{
        params:{
            type:this.equip
            type:this.equip,
        }
      }).then(res => {
        // let list = res.data;
@@ -575,7 +579,12 @@
        keeper:this.ruleForm.keeper,
        name:this.ruleForm.name,
        type:this.ruleForm.type,
      }, {headers: {"Content-Type": "application/json"}})
      }, {headers: {"Content-Type": "application/json"}
    }).then(res =>{
      this.selectDevice()
      this.$message.success('新增成功')
      this.ruleForm = {}
    })
    },
    // tableDataApi() {
    //   this.$axios.get(this.$api.url.tableDeviceList).then(res => {