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

Fixiaobai

2023-09-14 d0dfd0feb2914fb969722b2521763a23288081a4

 src/components/view/technology.vue

@@ -223,6 +223,9 @@
        </el-table>
      </div>
    </div>



    <el-dialog title="编辑记录内容" :visible.sync="upDia" width="500px">
      <div class="body">
        <el-row style="line-height: 46px">
@@ -273,7 +276,7 @@
          >
          <el-col :span="16" :offset="1">
            <el-select
              v-model="edit.children"
              v-model="cell"
              style="width: 310px"
              disabled
              multiple
@@ -283,7 +286,7 @@
                v-for="item in element"
                :key="item.id"
                :label="item.name"
                :value="item.name"
                :value="item.id"
              >
              </el-option>
            </el-select>
@@ -297,18 +300,35 @@
            <el-input v-model="edit.name" size="small" clearable></el-input>
          </el-col>
        </el-row>

        <el-row style="line-height: 46px">
          <el-col :span="4" style="font-size: 14px; text-align: right"
            >设备组:</el-col
          >
          <el-col :span="16" :offset="1">
            <el-input
            <!-- <el-input
              v-model="upData.device_group"
              size="small"
              clearable
            ></el-input>
            ></el-input> -->
            <template>
              <el-select
                v-model="upData.device_group"
                placeholder="请选择"
                style="width: 306px"
              >
                <el-option
                  v-for="item in equipment"
                  :key="item.index"
                  :label="item.father"
                  :value="item.father"
                >
                </el-option>
              </el-select>
            </template>
          </el-col>
        </el-row>

      </div>
      <span slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitUpData">确 定</el-button>
@@ -519,6 +539,7 @@
      upDia: false,
      element: [],
      equipment: [0],
      cell:[],
      AAA: [
        {
          id: "",
@@ -602,7 +623,7 @@
          }
        )
        .then((res) => {
               this.$parent.removeAllTab()
          console.log(res);
          this.selectAllTechNam();
          this.form = {};
        });
@@ -640,35 +661,36 @@
         },
    //批量删除
    delAllTech() {
      console.log(this.delete);
      this.$axios.post(this.$api.url.delAllTech, {
        ids: this.delete
        ids: this.delete,
      });
         this.$parent.removeAllTab()
    },
    //删除
    delTechById() {
      console.log(this.$api.url.delTechById, this.upData.id);
      this.$axios.post(this.$api.url.delTechById, {
        id: this.upData.id
        id: this.upData.id,
      });
         this.$parent.removeAllTab()
    },
    //编辑
    writeTechById() {
      // console.log(JSON.stringify(this.edit.children));
      // console.log(JSON.stringify(this.edit.children));
      // var str = ''
      // this.edit.children.forEach((a,ai)=>{
      //   str += a.id
      //   if(ai!=this.edit.children.length-1) str+=','
      // })
      this.$axios
        .post(
          this.$api.url.writeTechById,
          {
            params: {
              id: this.upData.id,
              technologyTemplateDto: {
          this.$api.url.writeTechById + `?id=${this.upData.id}`,
            {
                deviceGroup: this.upData.device_group,
                elementId: this.edit.elementId,
                elementId:this.cell.join(','),
                father: this.edit.father,
                name: this.edit.name,
                type: this.edit.type,
              },
              // id:this.upData.id,
            },
                type: this.edit.type
          },
          {
            headers: {
@@ -677,14 +699,14 @@
          }
        )
        .then((res) => {
               this.$parent.removeAllTab()
          this.selectAllTechNam()
        });
    },

    query(val) {
      this.selectAllTechTem();
    },
     selectAllTechTem() { 
     selectAllTechTem() {
       this.$axios
        .get(this.$api.url.selectAllTechTem, {
          params: { type: this.typeselect, message: this.search.technology },
@@ -789,6 +811,7 @@
        return el.id;
      });
      this.delete = cc.join(",");
      console.log(this.delete);
      this.delAllTech();
      this.$message.success("删除完成");
    },
@@ -806,7 +829,14 @@
        })
        .then((res) => {
          this.edit = res.data[0];
          console.log(this.edit);
          console.log(this.edit.children);
          this.cell = this.edit.children.map(el => {
               return el.id
            })
          // this.cell = this.cell.join(',')
          // this.cell = nn
          // console.log(this.cell);

        });
    },
    //编辑内容
@@ -831,4 +861,4 @@
    },
  },
};
</script>
</script>