Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-11 e0ff382cd71d451190021e3ed12af99b9a965ee9

Merge remote-tracking branch 'origin/master'

 src/assets/api/controller.js

@@ -110,8 +110,10 @@
    delAll:"selfcheckModel/delAllTech",//批量删除---.自检

    selectjilu:"/recordModel/selectAllRecord",//生产记录维护---》右边
    selecRecord:"/recordModel/selecRecordById",//生产记录----.编辑
    delQueById:"/recordModel/delQueById",//删除---.记录内容
    selecRecord:"/recordModel/selecRecordById",//生产记录----.新增
    writeRecordById:"/recordModel/writeRecordById",//编辑
    delQueByIdapi:"/recordModel/delQueById",//删除---.记录内容
		
    delAllRecord:"/recordModel/delAllRecord",//删除批量--->记录
    addRecord:"/recordModel/addRecord",//生产记录-------.新增


 src/components/view/Technicalindex.vue

@@ -189,7 +189,7 @@
                size="small" 
                clearable @input="query" ></el-input>
                    <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'father'}" node-key="id" default-expand-all
                    @node-click="handleNodeClick" 
                    @node-click="handleNodeClick" highlight-current
                        >
                    <div class="custom-tree-node" slot-scope="{ node, data }">
                        <span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>

 src/components/view/equipmentmaintain.vue

@@ -163,7 +163,7 @@
                suffix-icon="el-icon-search" 
                placeholder="请输入搜索内容" 
                size="small" clearable ></el-input>
                    <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" node-key="id" default-expand-all
                    <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" highlight-current node-key="id" default-expand-all
                        highlight-current  :filter-node-method="filterNode"
                        @node-click="handleNodeClick"
                        >

 src/components/view/laboratoryManagement.vue

@@ -209,6 +209,7 @@
          :props="{ children: 'children', label: 'father' }"
          node-key="id"
          default-expand-all
          highlight-current
          @node-click="handleNodeClick"
        >
          <div class="custom-tree-node" slot-scope="{ node, data }">

 src/components/view/mbom.vue

@@ -137,7 +137,7 @@
        <div class="thing">
            <div class="left">
                <el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="请输入搜索内容" size="small" clearable ></el-input>
                <el-tree :data="list" ref="tree" 
                <el-tree :data="list" ref="tree"  highlight-current
                :props="{children: 'children',label: 'name'}" 
                node-key="id" default-expand-all  @node-click="handleNodeClick" >
                    <div class="custom-tree-node" slot-scope="{ node, data }">

 src/components/view/record-content.vue

@@ -111,7 +111,7 @@
    <div class="record_content">
        <div class="title">
            <el-row>
                <el-col :span="12" style="line-height: 32px;">记录内容维护</el-col>
                <el-col :span="12" style="line-height: 32px;">生产记录维护</el-col>
                <el-col :span="12" style="text-align: right;">
                    <el-button type="primary" icon="el-icon-plus" style="background: #004EA2;" @click="addend">新增</el-button>
                    <!-- <el-button icon="el-icon-edit-outline" @click="modify">修改</el-button> -->
@@ -134,16 +134,20 @@
            <el-button size="mini" @click="clean()"><span>重 ç½®</span></el-button>
            <el-button size="mini" type="primary" style="background: #004EA2;"><span>查
                    è¯¢</span></el-button> -->
                <!-- :style="{height: scrollerHeight,overflow:'auto',display: 'flex'}" -->

        </div>
        <div class="thing">
            <div class="left">
                <el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="请输入搜索内容" size="small" clearable @input="(val)=>$refs.tree.filter(val)"></el-input>
                <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" node-key="id" default-expand-all
                    @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen" @node-collapse="nodeClose" :filter-node-method="filterNode"
                <el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="请输入搜索内容" size="small" clearable @input="query"></el-input>
                <el-tree :data="list" ref="tree"
                style="height: 500px;overflow-y: auto;"
                :props="{children: 'children',label: 'name'}" node-key="name" default-expand-all
                    @node-click="handleNodeClick" highlight-current
                    :key="upIndex">
                    <div class="custom-tree-node" slot-scope="{ node, data }">
                        <span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
                            {{data.code}} {{ data.name }}</span>
                            {{ data.cord }}{{ data.name }}</span>
                        <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
                            <i class="el-icon-delete"></i>
                        </el-button> -->
@@ -178,7 +182,7 @@
                    <el-col :span="4" style="font-size: 14px;text-align: right;">类型:</el-col>
                    <el-col :span="16" :offset="1">
                        <template>
                        <el-select v-model="edit.type" placeholder="请选择" style="width: 310px;">
                        <el-select v-model="edit.type" disabled placeholder="请选择" style="width: 310px;">
                            <el-option label="橡胶连接器" :value="0"></el-option>
                            <el-option label="金属连接器" :value="1"></el-option>
                            <el-option label="湿插拔电连接器" :value="2"></el-option>
@@ -193,6 +197,9 @@
                        <template>
                        <el-select v-model="edit.techFather"
                        placeholder="请选择"
                        <el-select v-model="edit.techFather"
                        placeholder="请选择"
                        disabled
                        @change="workevent"
                        style="width: 310px;">
                            <el-option
@@ -206,10 +213,10 @@
                    </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="4" style="font-size:  14px;text-align: right;">工艺:</el-col>
                    <el-col :span="16" :offset="1">
                        <template>
                        <el-select v-model="edit.techName" placeholder="请选择" style="width: 310px;">
                        <el-select v-model="edit.techName"  disabled placeholder="请选择" style="width: 310px;">
                            <el-option
                            v-for="item in craftapi"
                            :key="item.id"
@@ -245,12 +252,12 @@
            </span>
        </el-dialog>
        <!-- æ–°å¢žå¼¹çª— -->
        <el-dialog title="工序新增" :visible.sync="dialogVisible" width="35%">
        <el-dialog title="生产记录新增" :visible.sync="dialogVisible" width="35%">
            <div>
                <el-form ref="form" :model="form" label-width="80px">
                <el-form-item label="类型">
                    <template>
                        <el-select v-model="form.type" placeholder="请选择" style="width: 480px;">
                        <el-select v-model="form.type"  @change="edittype" placeholder="请选择" style="width: 480px;">
                            <el-option label="橡胶连接器" :value="0"></el-option>
                            <el-option label="金属连接器" :value="1"></el-option>
                            <el-option label="湿插拔电连接器" :value="2"></el-option>
@@ -392,9 +399,13 @@
                typeselect:0,
                upDia: false,
                checkTreeNode:{
                    id:1,
                    id:'',
                },
                upData:{},
                upData:{
                    name:'',
                    unit:'',
                    note:'',
                },
                edit:{
                    name:'',
                    note:'',
@@ -403,12 +414,6 @@
                    type:'',
                    unit:'',
                },
                upData: {
                    id: 0,
                    name: null,
                    unit: null,
                    thing: null
                }
            }
        },
        mounted() {
@@ -420,11 +425,22 @@
                this.$axios.get(this.$api.url.delQueById,)
            },
            childrenClick() {},
            TYpe(val) {
                this.typeselect = val
                console.log(this.typeselect);
                this.selectAllleft()
            },
            edittype(val) {
                // this.typeselect = ''
                this.typeselect = val
                this.chooseTechFath()
            },
            //新增
            workevent(val){
                console.log(val);
                let idx = this.process.findIndex(el => el.name === val)
                this.craftapi = this.process[idx].children
                console.log( this.craftapi);
            },
            chooseTechFath() {
            this.$axios.get(this.$api.url.chooseTechFath,{
@@ -436,7 +452,9 @@
                headers: {
                        "Content-Type": "application/json"
                      }
            })
            }).then(res =>{

            })
            },
            addRecord() {
                this.$axios.post(this.$api.url.addRecord,{
@@ -458,30 +476,38 @@
                this.selectjilu()
                this.form = {};
            },
            //编辑    this.upData
            selecRecord() {
                this.$axios.get(this.$api.url.selecRecord,{
                    params:{
                        id:this.upData.id
                    }
                }).then(res => {
                    this.edit = res.data[0]
                    // console.log(this.edit);
                })
            query() {
                this.selectAllleft()
            },
            TYpe(val) {
                this.typeselect = val
                console.log(this.typeselect);
                this.selectAllleft()
            },
            //主体左
            selectAllleft() {
            this.$axios.get(this.$api.url.selectAllleft,{
                params:{type:this.typeselect}
                params:{type:this.typeselect,message:this.search.technology}
            }).then(res => {
                this.list = res.data;
                console.log(this.list);
                this.selectDataList()
                this.$nextTick(() => {
                this.$refs.tree.setCurrentKey(this.list[0].children[0].name) // é»˜è®¤é€‰ä¸­èŠ‚点第一个
            })
            console.log("=======");
            console.log(this.list);
            let one=this.list.filter(item=>{
            return item.children.length>0
            })[0]
            console.log(one);
            let name=one.children[0].id
            console.log(name);
            this.selectjiluStart(name)
            this.selectDataList();
            });
            },
            //默认
            selectjiluStart(name) {
            this.$axios.get(this.$api.url.selectjilu,{
                params:{id:name}
            }).then(res => {
                this.tableData = res.data;
                console.log(this.tableData);
            })
            },
            //selectjilu  checkTreeNode
@@ -571,35 +597,62 @@
            },

            //删除
            delQueById() {
                this.$axios.post(this.$api.url.delQueById,{
            delQueByIdapi() {
                this.$axios.post(this.$api.url.delQueByIdapi,{
                        id:this.upData.id
                })
            },
            deleteRow(index, rows) {
                this.tableData.splice(index,1)
                this.upData.id = rows.id
                this.delQueById()
                this.selectjilu()
                this.delQueByIdapi()
                // this.selectjilu()
            },

            //编辑
            upContent(ob) {
                this.upData = ob
                console.log(this.upData);
                // console.log(this.upData);
                this.selecRecord()
                this.chooseTechFath()
                // this.chooseTechFath()
                this.upDia = true
            },
            submitUpData() {
                this.tableData.forEach(a => {
                    if (a.id == this.upData.id) {
                        a.name = this.upData.name
                        a.unit = this.upData.unit
                        a.thing = this.upData.thing
            selecRecord() {
                this.$axios.get(this.$api.url.selecRecord,{
                    params:{
                        id:this.upData.id
                    }
                }).then(res => {
                    this.edit = res.data[0]
                })
            },
            writeRecordById() {
                // console.log(this.upData.id);
                this.$axios.post(this.$api.url.writeRecordById + '?id=' + this.upData.id,{
                    name:this.upData.name,
                    note:this.upData.note,
                    techTemId:this.edit.id,
                    unit:this.upData.unit
                }, {
                    headers: {
                        "Content-Type": "application/json"
                      }
                }).then(res => {
                    this.selectjilu()
                })
            },
            submitUpData() {
                this.writeRecordById()
                this.$message.success('修改成功')

                this.upDia = false
                    // this.tableData.forEach(a => {
                //     if (a.id == this.upData.id) {
                //         a.name = this.upData.name
                //         a.unit = this.upData.unit
                //         a.thing = this.upData.thing
                //     }
                // })
                // console.log(this.upData);
            }
        }
    }

 src/components/view/self-inspection.vue

@@ -141,7 +141,7 @@
        <div class="thing">
            <div class="left">
                <el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="请输入搜索内容" size="small" clearable @input="(val)=>$refs.tree.filter(val)"></el-input>
                <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" node-key="id" default-expand-all
                <el-tree :data="list" style="height: 500px;overflow-y: auto;" ref="tree" :props="{children: 'children',label: 'name'}" node-key="name" default-expand-all
                    @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen" @node-collapse="nodeClose" :filter-node-method="filterNode"
                    :key="upIndex">
                    <div class="custom-tree-node" slot-scope="{ node, data }">
@@ -216,7 +216,7 @@
                <el-form ref="form" :model="form" label-width="80px">
                <el-form-item label="类型">
                    <template>
                        <el-select v-model="form.value" placeholder="请选择" style="width: 480px;">
                        <el-select v-model="form.value" placeholder="请选择" @change="edittype" style="width: 480px;">
                            <el-option label="橡胶连接器" :value="0"></el-option>
                            <el-option label="金属连接器" :value="1"></el-option>
                            <el-option label="湿插拔电连接器" :value="2"></el-option>
@@ -442,9 +442,10 @@
                    ids:this.delete
                })
            },
            //编辑
            writeRecordById() {



            },
            //新增
            add() {
                this.dialogVisible = false
@@ -489,6 +490,11 @@
                console.log(this.typeselect);
                this.selectAllleft()
            },
            edittype(val) {
                // this.typeselect = ''
                this.typeselect = val
                this.chooseTechFath()
            },
            //主体左
            selectAllleft() {
            this.$axios.get(this.$api.url.selectAllleft,{
@@ -497,8 +503,12 @@
                this.list = res.data;
                console.log(this.list);
                this.selectDataList()
                this.$nextTick(() => {
                this.$refs.tree.setCurrentKey(this.list[0].children[0].name) // é»˜è®¤é€‰ä¸­èŠ‚点第一个
            })
            })
            },

            //selectAllSelf   checkTreeNode
            selectAllSelf() {
            this.$axios.get(this.$api.url.selectAllSelf,{

 src/components/view/standard-table/bom.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,107 @@
<template>
    <div class="standard">
      <div>
            <el-table :data="tableData" height="800" row-key="id" border
            :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
              @selection-change="handleSelectionChange" default-expand-all
              :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
              <el-table-column type="selection" width="55">
              </el-table-column>
              <el-table-column type="index" width="60" label="序号">
              </el-table-column>
              <el-table-column prop="father" label="工序" sortable width="200px">
                <template slot-scope="scope">
                      <el-tag v-if="scope.row.children" type="primary">01</el-tag>
                      <span style="color: black">
                        {{ scope.row.father }}
                      </span>
              </template>
              </el-table-column>
              <el-table-column sortable label="工艺名称">
                <template slot-scope="scope">
                  <el-tag type="success" v-if="!scope.row.children">02</el-tag>
                  <span style="color: black">{{ scope.row.name  }}</span>
                </template>
              </el-table-column>
              <el-table-column prop="mname" label="材料名称">
              </el-table-column>
              <el-table-column prop="specifications" label="规格">
              </el-table-column>
              <el-table-column prop="unit" label="单位">
              </el-table-column>
              <el-table-column prop="num" label="数量">
              </el-table-column>
              <!-- <el-table-column label="操作">
                <el-button style="color: rgb(137, 137, 229);">编辑</el-button>
              </el-table-column> -->
            </el-table>
          </div>
    </div>
  </template>
  
  <script>
    export default {
      data() {
        return {
          selects: []
        }
      },
      props:['tableData','tableType'],
      created() {
        console.log(this.tableData)
      },
      mounted() {
        
      },
      methods: {
        handleSelectionChange(val) {
          this.selects = val;
        }
      }
    }
  </script>
  
  <style scoped>
    .standard {
      width: 100%;
      height: 100%;
    }
  </style>
  <style>
    .standard * {
      font-size: 14px;
    }
  
    .standard .has-gutter .el-table__cell {
      background-color: #F0F1F5 !important;
      color: #333;
    }
  
    .standard .has-gutter .el-table__cell .cell {
      font-size: 16px;
      font-weight: 500;
    }
  
    .standard .cell {
      color: #333;
      padding-left: 17px !important;
    }
  
    .standard {
      width: 100%;
      height: 100%;
      overflow: auto;
    }
  
    .standard .el-table__body-wrapper {
      height: 100%;
    }
  
    .standard .el-table__body {
      height: 100%;
    }
    .standard .el-table .el-table__row:not([class*="el-table__row--level-"]) td:nth-child(3){
      padding-left: 23px !important;
     }
  </style>
  

 src/components/view/standard-table/material.vue

@@ -1,7 +1,7 @@
<template>
    <div class="standard">
      <div>
            <el-table :data="tableData" style="width: 100%;margin-bottom: 20px;" row-key="name" border
            <el-table :data="tableData" style="width: 100%;margin-bottom: 20px;" row-key="id" border
              @selection-change="handleSelectionChange" default-expand-all
              :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
              <el-table-column type="selection" width="55">
@@ -10,27 +10,19 @@
              </el-table-column>
              <el-table-column prop="father" label="工序" sortable width="200px">
                <template slot-scope="scope">
                      <el-tag v-if="scope.row.children" :type="scope.row.children ? 'primary' : 'success'">
                        <div class="firstDiv" :style="{ color: scope.row.children ? '#16a7ff' : '#58c173' }">
                          01
                        </div>
                      </el-tag>
                      <span style="color: black">
                      <el-tag v-if="scope.row.children" type="primary">01</el-tag>
                      <span style="color: #000000">
                        {{ scope.row.father }}
                      </span>
              </template>
              </el-table-column>
              <el-table-column prop="tanme" sortable label="工艺名称">
                <!-- <template slot-scope="scope">
                          <el-tag v-if="!scope.row.children">
                              <div class="firstDiv" :style="`color: ${scope.row.children? '#16a7ff' : '#58c173'}`">
                                02
                              </div>
                          </el-tag>
              <el-table-column prop="name" sortable label="工艺名称">
                <template slot-scope="scope">
                          <el-tag type="success" v-if="!scope.row.children">02</el-tag>
                          <span style="color: black">
                            {{ scope.row.tname  }}
                            {{ scope.row.name  }}
                          </span>
                          </template> -->
                          </template>
              </el-table-column>
              <el-table-column prop="mname" label="材料名称">
              </el-table-column>

 src/components/view/standard-table/technology.vue

@@ -1,43 +1,34 @@
<template>
  <div class="standard">
    <div>
          <el-table :data="tableData" style="width: 100%;margin-bottom: 20px;" row-key="name" border
          <el-table :data="tableData" height="800" row-key="id" border
          :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
            @selection-change="handleSelectionChange" default-expand-all
            :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
            <el-table-column type="selection" width="55">
            </el-table-column>
            <el-table-column type="index" width="50" label="序号">
            <el-table-column type="index" width="60" label="序号">
            </el-table-column>
            <el-table-column prop="father" label="工序" sortable width="200px">
              <template slot-scope="scope">
                    <el-tag v-if="scope.row.children" :type="scope.row.children ? 'primary' : 'success'">
                      <div class="firstDiv" :style="{ color: scope.row.children ? '#16a7ff' : '#58c173' }">
                        01
                      </div>
                    </el-tag>
                    <el-tag v-if="scope.row.children" type="primary">01</el-tag>
                    <span style="color: black">
                      {{ scope.row.father }}
                    </span>
            </template>
            </el-table-column>
            <el-table-column prop="name" sortable label="工艺名称">
            <el-table-column sortable label="工艺名称">
              <template slot-scope="scope">
                        <el-tag v-if="!scope.row.children">
                            <div class="firstDiv" :style="`color: ${scope.row.children? '#16a7ff' : '#58c173'}`">
                              02
                            </div>
                        </el-tag>
                        <span style="color: black">
                          {{ scope.row.name  }}
                        </span>
                        </template>
                <el-tag type="success" v-if="!scope.row.children">02</el-tag>
                <span style="color: black">{{ scope.row.name  }}</span>
              </template>
            </el-table-column>
            <el-table-column prop="dg" label="设备组">
            </el-table-column>
            <el-table-column prop="pq" label="生产定额">
            </el-table-column>
            <el-table-column prop="" label="操作">
              <el-butten style="color: rgb(137, 137, 229);">编辑</el-butten>
            <el-table-column label="操作">
              <el-button style="color: rgb(137, 137, 229);">编辑</el-button>
            </el-table-column>
          </el-table>
        </div>
@@ -53,7 +44,7 @@
    },
    props:['tableData','tableType'],
    created() {
      console.log(this.tableData,this.tableType)
      console.log(this.tableData)
    },
    mounted() {
      

 src/components/view/standard.vue

@@ -16,11 +16,11 @@
      <div class="left">
        <el-input v-model="search" suffix-icon="el-icon-search" placeholder="请输入搜索内容" size="small" clearable></el-input>

        <el-tree :data="list" ref="tree" :default-expand-all="true" :props="{ children: 'children', label: 'name' }"
        <el-tree :data="list" ref="tree" default-expand-all :props="{ children: 'children', label: 'name' }"
          node-key="id" :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current>
          <div class="custom-tree-node" slot-scope="{ node, data }">
            <span><i :class="`node_i ${data.code != '[5]' ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
              {{ data.name }}</span>
              {{ data.code }}{{ data.name }}</span>
            <el-button type="text" size="mini" @click.stop="remove(node, data)">
              <i class="el-icon-delete"></i>
            </el-button>
@@ -52,24 +52,15 @@
              è¯¢</span></el-button>
        </div>

        <div v-if="this.typeselect == 0">
        <div class="contentTable" v-if="this.typeselect == 0">
          <technology  :tableType="tableType" :tableData="tableData"></technology>
        </div>
        <div v-if="this.typeselect == 1">
          æŠ€æœ¯æŒ‡æ ‡
        </div>
        <div v-if="this.typeselect == 1">技术指标</div>
        <div v-if="this.typeselect == 2">
          <material  :tableType="tableType" :tableData="tableData"></material>
          <bom  :tableType="tableType" :tableData="tableData"></bom>
        </div>
        <div v-if="this.typeselect == 3">
          ç”Ÿäº§å·¥è‰º
        </div>
        <!-- <div class="table">
          <technology v-if="tableData.length !== 0" :tableType="tableType" :tableData="tableData"></technology>
        </div> -->
        <!-- <div class="table">
          <technology v-if="tableData.length !== 0" :tableType="tableType" :tableData="tableData"></technology>
        </div> -->
        <div v-if="this.typeselect == 3">生产工艺</div>
        
      </div>
    </div>

@@ -91,8 +82,9 @@
<script>
import technology from "./standard-table/technology.vue"
import material from "./standard-table/material.vue"
import bom from "./standard-table/bom.vue"
export default {
  components: { technology,material },
  components: { technology,material,bom },

  data() {
    return {
@@ -104,7 +96,6 @@
      checkTreeNode: {},// ç‚¹å‡»é€‰ä¸­æ ‘节点
      tableData: [],
      bomAddModelVisible: false,// æŽ§åˆ¶bom新增模态框是否显示
      list: [],
      typeselect: 0,
      returntree: {
        id:28,
@@ -124,8 +115,8 @@
  //   }
  // },
  mounted() {
    this.tableType=0
    this.selectMaterialTree()
    // this.selectAll()
    this.selectVersion()
  },
  methods: {
@@ -158,18 +149,18 @@

    },
    TYPE(val) {//类型.数据
      console.log(val);
      // console.log(val);
      this.typeselect = val
     
      // console.log(this.typeselect);

      console.log(this.typeselect);
      this.selectVersion()
    },
    handleNodeClick(val) {//树的值
      console.log(val);
      // console.log(val);
      this.returntree = val
    },
    selectVersion() {//版本
      this.$axios.get(this.$api.url.selectVersion, {
    async selectVersion() {//版本
      let v=await this.$axios.get(this.$api.url.selectVersion, {
        params: {
          specificationsId: this.returntree.id,
          type: this.typeselect,
@@ -179,12 +170,15 @@
        this.version = this.verdata.map(el => {
          return el = `v${el}`
        })
        console.log(this.verdata);
        // console.log("版本");
        return this.verdata[0]
      })
      this.character=v
      this.VER="v"+v
      this.selectAll()
    },
    //右侧数据
    selectAll() {
      console.log(this.$axios.get(this.$api.url.selectAll));
      this.$axios.get(this.$api.url.selectAll, {
        params: {
          specificationsId: this.returntree.id,//tree的点击反馈
@@ -192,14 +186,18 @@
          version: this.character,//版本
        }
      }).then(res => {
        console.log(res.data);
        this.tableData = res.data
        let arr = res.data;
        console.log(arr);
        for(var i=0;i<arr.length;i++){
            arr[i].id = "0" + i;
        }
        this.tableData = arr;
      })
    },
    verevent(val) {
      console.log(val);
      // console.log(val);
      let cc = val.replace('v', '')
      console.log(cc);
      // console.log(cc);
      this.character = cc
      this.selectAll()
      // const { v, ...newObj } = val;
@@ -208,8 +206,8 @@
    },
    //五级树
    selectMaterialTree() {
      this.$axios.get(this.$api.url.selectTreeByMaterial).then(res => {
        this.list = res.data
      this.$axios.get(this.$api.url.selectTreeByMaterial).then( res => {
        this.list=res.data
        this.list.forEach((el, idx, arr) => {
          if (idx == 0) {
            arr[idx].name = '成品'
@@ -219,8 +217,33 @@
          }
        })
        this.selectDataList()
        // é»˜è®¤ç¬¬ä¸€ä¸ªäº”级节点搜索，新增配置项
        const treeOptions = JSON.parse(JSON.stringify(this.list));
        this.getDefault(treeOptions, 0);
        this.formTypeOptions = treeOptions;
        this.$nextTick().then(() => {
          const firstNode = document.querySelector(
            ".el-tree-node .el-tree-node__children .el-tree-node .el-tree-node__children .el-tree-node .el-tree-node__children .el-tree-node .el-tree-node__children .el-tree-node"
          );
          try {
            firstNode.click();
          } catch (e) {
            //TODO handle the exception
          }
        });
      })
    },
    getDefault(arr, index) {
            for (const item of arr) {
                if (item.children && item.children.length > 0) {
                    // æœ‰å­èŠ‚点
                    this.getDefault(item.children, index + 1);
                    if (index === 2) {
                        item.children = null;
                    }
                }
            }
        },
    filterNode(value, data) {
      if (!value) return true;
      return data.label.indexOf(value) !== -1;
@@ -269,6 +292,9 @@
<style scoped>
.standard {}

.standard .contentTable{
}

.standard .title .el-button {
  height: 32px;
  border: 1px solid rgba(190, 190, 190, 0.44);

 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,

 src/main.js

@@ -23,7 +23,9 @@
Vue.use(qs);
Vue.use(api);

const javaApi = 'http://192.168.0.25:8001'
const javaApi = 'http://192.168.0.23:8001'

// const javaApi = '192.168.0.6'