改bug

王震

2023-09-09 c6cf8edf2f0ff628ea5c1323eb9bc685398b3a43

改bug

 src/assets/api/controller.js

@@ -109,8 +109,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

@@ -39,6 +39,7 @@
        height: calc(100% - 120px);
        background-color: #fff;
        display: flex;
		
    }

    .thing .left {
@@ -46,6 +47,7 @@
        height: calc(100% - 20px);
        border-right: 3px solid rgb(245, 247, 251);
        padding: 16px;
        /* height:calc(50vh - 250px) */
    }

    .thing .left .custom-tree-node span {
@@ -111,7 +113,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 +136,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 +184,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 +199,7 @@
                        <template>
                        <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.vue

@@ -16,7 +16,7 @@
      <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="false" :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 != '[4]' ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>

 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

@@ -25,6 +25,8 @@

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

// const javaApi = '192.168.0.6'



axios.defaults.baseURL = javaApi