Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-11 e0ff382cd71d451190021e3ed12af99b9a965ee9

 src/components/view/technology.vue

@@ -174,7 +174,9 @@
          node-key="id"
          default-expand-all
          @node-click="handleNodeClick"
          style="height: 500px;overflow-y: auto;"
          :key="upIndex"
          highlight-current
        >
          <div class="custom-tree-node" slot-scope="{ node, data }">
            <span
@@ -332,6 +334,8 @@
            <template>
              <el-select
                v-model="form.father"
                allow-create
                filterable
                placeholder="请选择"
                style="width: 480px"
              >
@@ -368,6 +372,7 @@
                <template>
                  <el-select
                    v-model="form.elementId"
                    multiple
                    placeholder="请选择"
                    style="width: 200px"
                  >
@@ -567,7 +572,7 @@
    Neworder() {
      this.dialogVisible = false;
      this.addTechTemp();
      // this.form = '';
      this.form = {};
    },
    Deleteapi() {
      this.dialogVisible = false;
@@ -581,7 +586,7 @@

          {
            deviceGroup: this.form.deviceGroup,
            elementId: this.form.elementId,
            elementId: JSON.stringify(this.form.elementId).replace("[","").replace("]",""),
            father: this.form.father,
            name: this.form.name,
            type: this.form.type,