From 785fd3a05f38d3b3f98698497294866447880a28 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 04 九月 2023 18:00:38 +0800
Subject: [PATCH] 基础数据
---
src/components/view/technology.vue | 105 ++++++++++--
src/components/view/mbom.vue | 112 +++++--------
src/components/view/self-inspection.vue | 89 ++++-------
src/components/view/record-content.vue | 88 ++++-------
src/main.js | 4
src/view/index.vue | 16 +-
src/assets/api/controller.js | 11 +
7 files changed, 219 insertions(+), 206 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index f0a6391..e00f9ee 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -66,9 +66,18 @@
chooseElement:"/technologyTemplate/chooseElement",//鏂板宸ヨ壓璺嚎-->閫夋嫨鍏冧欢
addTechTemp:"/technologyTemplate/addTechTemp",//鏂板宸ヨ壓璺嚎==>鏂板
chooseTech:"/technologyTemplate/chooseTech",//鏂板宸ヨ壓璺嚎--銆嬮�夊垯宸ュ簭
- writeTechById:"/technologyTemplate/writeTechById",//宸ヨ壓璺嚎-->缂栬緫
+ writeTechById:"/technologyTemplate/writeTechById",//鏂板宸ヨ壓璺嚎-->缂栬緫浼犲弬
+ delTechById:"/technologyTemplate/delTechById",//鏂板宸ヨ壓璺嚎==>鍒犻櫎
+ selecTechById:"/technologyTemplate/selecTechById",//鏂板宸ヨ壓璺嚎--銆嬬紪杈�
+ delAllTech:"/technologyTemplate/delAllTech",//鎵归噺鍒犻櫎
selectAllleft:"/technicalModel/selectAllTechTem",//鎶�鏈寚鏍�-->宸﹁竟
selectAllright:"/technicalModel/selectAllTechNam",//鎶�鏈寚鏍�--銆嬪彸杈�
+ chooseProFath:"/technicalModel/chooseProFath",//鎶�鏈寚鏍�---銆嬬埗绫婚�夋嫨
+ chooseTechFath: "/technicalModel/chooseTechFath",// 鎶�鏈�--->宸ュ簭宸ヨ壓
+ selectAllMbom:"/mbomModel/selectAllMbom",//鐗╂枡缁存姢--銆嬪彸杈�
+ selectAllTeque:"/techniqueModel/selectAllTeque",//鐢熶骇宸ヨ壓缁存姢---銆傚彸杈�
+ selectAllSelf:"/selfcheckModel/selectAllSelf",//鑷缓缁存姢-----銆嬪彸杈�
+ selectjilu:"/techniqueModel/selectAllTeque",//鐢熶骇璁板綍缁存姢---銆嬪彸杈�
}
const url = {
enter: "user/enter", //鐧诲綍
diff --git a/src/components/view/mbom.vue b/src/components/view/mbom.vue
index 05d29af..a52dcd9 100644
--- a/src/components/view/mbom.vue
+++ b/src/components/view/mbom.vue
@@ -101,23 +101,25 @@
<div class="choose">
<span>绫诲瀷锛�</span>
- <el-select v-model="search.type" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
+ <el-select v-model="search.type" size="small" @change="TYpe" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
<el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
<el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
<el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
</el-select>
- <span>鍘熸潗鏂欏悕绉帮細</span>
+ <!-- <span>鍘熸潗鏂欏悕绉帮細</span>
<el-select v-model="search.name" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
<el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
</el-select>
<el-button size="mini"><span>閲� 缃�</span></el-button>
- <el-button size="mini" type="primary" style="background: #004EA2;"><span>鏌ヨ</span></el-button>
+ <el-button size="mini" type="primary" style="background: #004EA2;"><span>鏌ヨ</span></el-button> -->
</div>
<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" :props="{children: 'children',label: 'name'}" node-key="id" default-expand-all>
+ <el-tree :data="list" ref="tree"
+ :props="{children: 'children',label: 'name'}"
+ node-key="id" default-expand-all @node-click="handleNodeClick" >
<div class="custom-tree-node" slot-scope="{ node, data }">
<span><i :class="`node_i ${data.code != '[3]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
{{data.code}} {{ data.name }}</span>
@@ -160,76 +162,56 @@
data() {
return {
search:{},
- list: [{
- id: 0,
- name: "鍘熸潗鏂�",
- children: [{
- id: 3,
- name: "宸ヨ壓",
- children: [{
- id: 6,
- name: "璁惧1"
- }]
- }]
- }, {
- id: 1,
- name: "鎴愬搧",
- children: [{
- id: 4,
- name: "宸ヨ壓"
- }]
- }, {
- id: 2,
- name: "鍗婃垚鍝�",
- children: [{
- id: 5,
- name: "宸ヨ壓"
- }]
- }],
+ list:[],
process:[],
// handleClose:[],
+ checkTreeNode:[],
+ tableData:[],
search:{},
form:{},
dialogVisible:false,
- tableData: [{
- id: 1,
- name: "璐ㄩ噺杩芥函鍙�",
- unit: "鍗曚綅",
- thing: "dajskda",
- input:'浣犲ソ1'
- }, {
- id: 2,
- name: "浣滀笟浜哄憳",
- unit: "鍗曚綅",
- thing: "dajskda",
- input:'浣犲ソ2'
-
- }, {
- id: 3,
- name: "瑙勬牸",
- unit: "鍗曚綅",
- thing: "dajskda",
- input:'浣犲ソ3'
-
- }, {
- id: 4,
- name: "瑙勬牸",
- unit: "鍗曚綅",
- thing: "dajskda",
- input:'浣犲ソ4'
-
- }, {
- id: 5,
- name: "瑙勬牸",
- unit: "鍗曚綅",
- thing: "dajskda",
- input:'浣犲ソ5'
-
- }],
+ typeselect:0,
+ tableData: [],
input:''
}
},
+ mounted() {
+ this.selectAllleft()
+ },
methods:{
+ TYpe(val) {
+ this.typeselect = val
+ this.selectAllleft()
+ },
+ //宸﹁竟
+ selectAllleft() {
+ this.$axios.get(this.$api.url.selectAllleft,{
+ params:{type:this.typeselect}
+ }).then(res => {
+ this.list = res.data;
+ }, {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ })
+ },
+ //鍙宠竟
+ selectAllMbom() {
+ this.$axios.get(this.$api.url.selectAllMbom,{
+ params:{id:this.checkTreeNode.id}
+ }).then(res => {
+ this.tableData = res.data;
+ }, {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ })
+ },
+ handleNodeClick(data){
+ this.checkTreeNode = data
+ console.log(this.checkTreeNode.id);
+ this.selectAllMbom()
+ },
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
.then(_ => {
diff --git a/src/components/view/record-content.vue b/src/components/view/record-content.vue
index 4861c07..c6be046 100644
--- a/src/components/view/record-content.vue
+++ b/src/components/view/record-content.vue
@@ -121,19 +121,19 @@
</div>
<div class="choose">
<span>绫诲瀷锛�</span>
- <el-select v-model="search.type" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
+ <el-select v-model="search.type" size="small" @change="TYpe" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
<el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
<el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
<el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
</el-select>
- <span>宸ュ簭锛�</span>
+ <!-- <span>宸ュ簭锛�</span>
<el-select v-model="search.name" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
<el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
</el-select>
<el-button size="mini" @click="clean()"><span>閲� 缃�</span></el-button>
<el-button size="mini" type="primary" style="background: #004EA2;"><span>鏌�
- 璇�</span></el-button>
+ 璇�</span></el-button> -->
</div>
<div class="thing">
<div class="left">
@@ -329,62 +329,14 @@
modifyVisible:false,
dialogVisible:false,
process: [],
- list: [{
- id: 0,
- name: "鍘熸潗鏂�",
- children: [{
- id: 3,
- name: "宸ヨ壓",
- children: [{
- id: 6,
- name: "璁惧1"
- }]
- }]
- }, {
- id: 1,
- name: "鎴愬搧",
- children: [{
- id: 4,
- name: "宸ヨ壓"
- }]
- }, {
- id: 2,
- name: "鍗婃垚鍝�",
- children: [{
- id: 5,
- name: "宸ヨ壓"
- }]
- }],
+ list: [],
checkTreeNode: {},
- tableData: [{
- id: 1,
- name: "璐ㄩ噺杩芥函鍙�",
- unit: "鍗曚綅",
- thing: "dajskda"
- }, {
- id: 2,
- name: "浣滀笟浜哄憳",
- unit: "鍗曚綅",
- thing: "dajskda"
- }, {
- id: 3,
- name: "瑙勬牸",
- unit: "鍗曚綅",
- thing: "dajskda"
- }, {
- id: 4,
- name: "瑙勬牸",
- unit: "鍗曚綅",
- thing: "dajskda"
- }, {
- id: 5,
- name: "瑙勬牸",
- unit: "鍗曚綅",
- thing: "dajskda"
- }],
+ tableData: [],
upIndex: 0,
selects: [],
+ typeselect:0,
upDia: false,
+ checkTreeNode:[],
upData: {
id: 0,
name: null,
@@ -394,9 +346,32 @@
}
},
mounted() {
- this.selectDataList()
+ this.selectAllleft()
},
methods: {
+ TYpe(val) {
+ this.typeselect = val
+ console.log(this.typeselect);
+ this.selectAllleft()
+ },
+ //涓讳綋宸�
+ selectAllleft() {
+ this.$axios.get(this.$api.url.selectAllleft,{
+ params:{type:this.typeselect}
+ }).then(res => {
+ this.list = res.data;
+ console.log(this.list);
+ })
+ },
+ //selectjilu checkTreeNode
+ selectjilu() {
+ this.$axios.get(this.$api.url.selectjilu,{
+ params:{id:this.checkTreeNode.id}
+ }).then(res => {
+ this.tableData = res.data;
+ console.log(this.tableData);
+ })
+ },
modify(){
this.modifyVisible = true
},
@@ -435,6 +410,7 @@
},
handleNodeClick(data) {
this.checkTreeNode = data
+ this.selectjilu()
if(data.code=='[3]'){
console.log(data);
}
diff --git a/src/components/view/self-inspection.vue b/src/components/view/self-inspection.vue
index 44c9b99..be60b33 100644
--- a/src/components/view/self-inspection.vue
+++ b/src/components/view/self-inspection.vue
@@ -120,7 +120,7 @@
</div>
<div class="choose">
<span>绫诲瀷锛�</span>
- <el-select v-model="search.type" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
+ <el-select v-model="search.type" size="small" @change="TYpe" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
<el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
<el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
@@ -164,9 +164,9 @@
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅">
</el-table-column>
- <el-table-column prop="stand" label="鏍囧噯鍊�">
+ <el-table-column prop="required" label="鏍囧噯鍊�">
</el-table-column>
- <el-table-column prop="ask" label="鍐呮帶鍊�">
+ <el-table-column prop="internal" label="鍐呮帶鍊�">
</el-table-column>
<el-table-column label="鎿嶄綔" width="130">
<template slot-scope="scope">
@@ -371,63 +371,14 @@
dialogVisible:false,
process: [],
product: [],
- list: [{
- id: 0,
- name: "鍘熸潗鏂�",
- children: [{
- id: 3,
- name: "宸ヨ壓"
- }]
- }, {
- id: 1,
- name: "鎴愬搧",
- children: [{
- id: 4,
- name: "宸ヨ壓"
- }]
- }, {
- id: 2,
- name: "鍗婃垚鍝�",
- children: [{
- id: 5,
- name: "宸ヨ壓"
- }]
- }],
+ list: [],
checkTreeNode: {},
- tableData: [{
- id: 1,
- name: "鐢电紗瑙勬牸",
- unit: "dajskda",
- stand: "12348",
- ask: "564165"
- }, {
- id: 2,
- name: "浣滀笟浜哄憳",
- unit: "dajskda",
- stand: "12348",
- ask: "564165"
- }, {
- id: 3,
- name: "瑙勬牸",
- unit: "dajskda",
- stand: "12348",
- ask: "564165"
- }, {
- id: 4,
- name: "瑙勬牸",
- unit: "dajskda",
- stand: "12348",
- ask: "564165"
- }, {
- id: 5,
- name: "瑙勬牸",
- unit: "dajskda",
- stand: "12348",
- ask: "564165"
- }],
+ tableData: [],
upIndex: 0,
selects: [],
upDia: false,
+ typeselect:0,
+ checkTreeNode:[],
upData: {
id: 0,
name: null,
@@ -438,9 +389,32 @@
}
},
mounted() {
- this.selectDataList()
+ this.selectAllleft()
},
methods: {
+ TYpe(val) {
+ this.typeselect = val
+ console.log(this.typeselect);
+ this.selectAllleft()
+ },
+ //涓讳綋宸�
+ selectAllleft() {
+ this.$axios.get(this.$api.url.selectAllleft,{
+ params:{type:this.typeselect}
+ }).then(res => {
+ this.list = res.data;
+ console.log(this.list);
+ })
+ },
+ //selectAllSelf checkTreeNode
+ selectAllSelf() {
+ this.$axios.get(this.$api.url.selectAllSelf,{
+ params:{id:this.checkTreeNode.id}
+ }).then(res => {
+ this.tableData = res.data;
+ console.log(this.tableData);
+ })
+ },
modify(){
this.modifyVisible = true
},
@@ -474,6 +448,7 @@
},
handleNodeClick(data) {
this.checkTreeNode = data
+ this.selectAllSelf()
if(data.code=='[2]'){
console.log(data);
}
diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index 4bd43a6..a34acbe 100644
--- a/src/components/view/technology.vue
+++ b/src/components/view/technology.vue
@@ -120,7 +120,7 @@
</div>
<div class="choose">
<span>绫诲瀷锛�</span>
- <el-select v-model="search.type" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
+ <el-select v-model="search.type" size="small" placeholder="璇烽�夋嫨" @change="type" style="width: 224px;margin-right: 30px;">
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
<el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
<el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
@@ -134,13 +134,17 @@
<el-select v-model="search.name" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
<el-option v-for="(a, ai) in product" key="ai" :label="a.name" :value="a.id"></el-option>
</el-select> -->
- <el-button size="mini" @click="clean()"><span>閲� 缃�</span></el-button>
+ <!-- <el-button size="mini" @click="clean()"><span>閲� 缃�</span></el-button>
<el-button size="mini" type="primary" style="background: #004EA2;"><span>鏌�
- 璇�</span></el-button>
+ 璇�</span></el-button> -->
</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-input v-model="search.technology" suffix-icon="el-icon-search"
+ placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" size="small"
+ clearable @input="query">
+ <!-- clearable @input="(val)=>$refs.tree.filter(val)"> -->
+ </el-input>
<el-tree
:data="towTree" ref="tree"
:props="{children: 'children',label: 'father'}"
@@ -170,7 +174,7 @@
<el-table-column label="鎿嶄綔" width="130">
<template slot-scope="scope">
<span class="table_do" @click="upContent(scope.row)">缂栬緫 </span>
- <span class="table_do" @click="deleteRow(scope.$index, tableData)">鍒犻櫎</span>
+ <span class="table_do" @click="deleteRow(scope.$index, scope.row)">鍒犻櫎</span>
</template>
</el-table-column>
</el-table>
@@ -278,7 +282,7 @@
<el-col :span="10">
<el-form-item label="鍏冧欢">
<template>
- <el-select v-model="form.elementId" placeholder="璇烽�夋嫨绫诲瀷" style="width: 200px;" >
+ <el-select v-model="form.elementId" placeholder="璇烽�夋嫨绫诲瀷" style="width: 200px;" >
<el-option
v-for="item in element"
:key="item.value"
@@ -300,7 +304,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="Neworder">纭� 瀹�</el-button>
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button @click="Deleteapi">鍙� 娑�</el-button>
</span>
</el-dialog>
<!-- 宸ヨ壓璺嚎淇敼 -->
@@ -387,11 +391,12 @@
search:{
type:'',
},
+ delete:[],
treetrunk:[],
process: [],
product: [],
procedure:[],
- checkTreeNode:'',
+ checkTreeNode:'涓嬫枡',
towTree:[],
value:"",
modifyevent:false,
@@ -403,6 +408,7 @@
upDia: false,
element:[],
equipment:[0],
+ edit:[],
upData: {
name:'',
device_group:'',
@@ -410,6 +416,7 @@
father:'',
type:'',
},
+ typeselect:0,
newdata:{
type:''
}
@@ -422,10 +429,21 @@
this.chooseElement()
},
methods: {
+ type(val){
+ this.typeselect = val
+ console.log(this.typeselect);
+ this.selectAllTechTem()
+ },
Neworder() {
this.dialogVisible = false
this.addTechTemp()
+ this.selectAllTechNam()
+ // this.form = '';
+ },
+ Deleteapi() {
+ this.dialogVisible = false
+ this.form = '';
},
addTechTemp() {
// console.log(this.$api.url.addTechTemp);
@@ -470,30 +488,48 @@
console.log(this.procedure);
})
},
+ //鎵归噺鍒犻櫎
+ delAllTech() {
+ console.log(this.delete);
+ this.$axios.post(this.$api.url.delAllTech,{
+ ids:this.delete
+ })
+ },
//鍒犻櫎
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
})
},
//缂栬緫
writeTechById() {
this.$axios.post(this.$api.url.writeTechById,{
- deviceGroup:this.upData.device_group,
- elementId:this.upData.ele[0],
- father:this.upData.father,
- name:this.upData.name,
- type:this.upData.type,
- // id:this.this.upData.id,
+ params:{
+ id:this.upData.id,
+ technologyTemplateDto:{
+ deviceGroup:this.upData.device_group,
+ elementId:this.upData.ele[0],
+ father:this.upData.father,
+ name:this.upData.name,
+ type:this.upData.type
+ }
+ // id:this.upData.id,
+ }
}, {
headers: {
"Content-Type": "application/json"
}
})
},
+
+ query(val){
+ this.selectAllTechTem()
+ },
selectAllTechTem() {
+ console.log(this.typeselect,'222');
this.$axios.get(this.$api.url.selectAllTechTem,{
- params:{type: 0}
+ params:{type: this.typeselect,message:this.search.technology}
}).then(res => {
// let list = res.data;
// list.forEach(i => {
@@ -572,13 +608,46 @@
}
}
})
+ // console.log(this.selects);
+ let cc = this.selects.map(el => {
+ // console.log(el.id);
+ return el.id
+ })
+ // console.log(this.delete);
+ this.delete = cc.join(',')
+ console.log(this.delete);
+ this.delAllTech()
+ // this.delete =
+ // console.log('444');
this.$message.success('鍒犻櫎瀹屾垚')
},
deleteRow(index, rows) {
- rows.splice(index, 1);
+ // console.log(rows);
+ // rows.splice(index, 1);
+ this.tableData.splice(index,1)
+ this.upData.id = rows.id
+ this.delTechById()
},
+ selecTechById() {
+ this.$axios.get(this.$api.url.selecTechById,{
+ params:{
+ id:this.upData.id,
+ }
+ }
+ // , {
+ // headers: {
+ // "Content-Type": "application/json"
+ // }
+ // }
+ ).then(res =>{
+ this.edit = res.data
+ console.log(this.edit);
+ })
+ },
+ //缂栬緫鍐呭
upContent(ob) {
this.upData = ob
+ this.selecTechById()
console.log(this.upData);
this.upDia = true
},
@@ -593,7 +662,7 @@
// }
// })
this.writeTechById()
-
+
this.$message.success('淇敼鎴愬姛')
this.upIndex++
this.upDia = false
diff --git a/src/main.js b/src/main.js
index 03c0412..d0bd9ce 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,9 @@
Vue.use(qs);
Vue.use(api);
-const javaApi = 'http://192.168.137.74:8001/'
+// const javaApi = 'http://127.0.0.1:8001/'
+const javaApi = 'http://192.168.73.249:8001/'
+
axios.defaults.baseURL = javaApi
axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
diff --git a/src/view/index.vue b/src/view/index.vue
index 711181b..97d3d3b 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -447,7 +447,7 @@
i: "font icon-shouye",
c: [{
k: 23,
- v: "璁板綍鍐呭缁存姢",
+ v: "鐢熶骇璁板綍缁存姢",
i: "font icon-shouye",
u: "record-content"
},
@@ -481,15 +481,15 @@
i: "font icon-shouye",
u: "mbom"
},
- {
- k: 29,
- v: "宸℃椤圭洰缁存姢",
- i: "font icon-shouye",
- u: "routinginspection"
- },
+ // {
+ // k: 29,
+ // v: "宸℃椤圭洰缁存姢",
+ // i: "font icon-shouye",
+ // u: "routinginspection"
+ // },
{
k: 30,
- v: "璁惧鎸囨爣缁存姢",
+ v: "鐢熶骇宸ヨ壓缁存姢",
i: "font icon-shouye",
u: "equipmentmaintain"
}
--
Gitblit v1.9.3