Browse Source

Merge remote-tracking branch 'origin/master'

master
李磊 3 years ago
parent
commit
79ed207756
  1. 25
      src/views/task/list.vue
  2. 99
      src/views/ysjl/3000/common/index.vue
  3. 52
      src/views/ysjl/3000/dj/common/zdftFb.vue
  4. 155
      src/views/ysjl/3000/dj/xfdt/index.vue
  5. 155
      src/views/ysjl/3000/dj/yyfb/index.vue
  6. 155
      src/views/ysjl/3000/jj/xfdt/index.vue
  7. 160
      src/views/ysjl/3000/jj/yyfb/index.vue
  8. 2
      src/views/ysjl/3000/jj/zdft/index.vue

25
src/views/task/list.vue

@ -32,7 +32,7 @@
<el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
<el-select v-model="listQuery.neibuleibie" placeholder="请选择检验类别" clearable> <el-select v-model="listQuery.neibuleibie" placeholder="请选择检验类别" clearable>
<el-option v-for="item in searchNblbList" :key="item.code" :label="item.name" :value="item.code" /> <el-option v-for="item in searchNblist" :key="item.code" :label="item.name" :value="item.code" />
</el-select> </el-select>
<el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 340px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 340px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 230px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 230px" @keyup.enter.native="handleFilter" />
@ -233,9 +233,16 @@ import Utils from '../../utils/contact.js'
import { getOwnList, terminateRenwu, completeRenwuFn } from '@/api/renwu' import { getOwnList, terminateRenwu, completeRenwuFn } from '@/api/renwu'
import { cancelRenwuFn } from '@/api/common' import { cancelRenwuFn } from '@/api/common'
import Enclosure from '@/views/common/Enclosure' import Enclosure from '@/views/common/Enclosure'
import { mapGetters } from 'vuex'
export default { export default {
name: 'MyTask', name: 'MyTask',
components: { Sticky, Pagination, SliceUpload, Enclosure }, components: { Sticky, Pagination, SliceUpload, Enclosure },
filters: {
screen(value) {
console.log(value, 254444)
return value.charAt(0).toUpperCase() + value.slice(1)
}
},
data() { data() {
return { return {
totalCount: 0, totalCount: 0,
@ -287,13 +294,20 @@ export default {
}, },
currentRenwuId: 0, currentRenwuId: 0,
dialogEnclosureVisible: false, dialogEnclosureVisible: false,
isSysUser: this.$store.getters.clientType === 'System' isSysUser: this.$store.getters.clientType === 'System',
searchNblist:[]
} }
}, },
computed: { computed: {
// 使 getter computed ...mapGetters(['allCategory'])
searchNblbList() { },
return this.$store.getters.allCategory.filter(row => row.parentId) watch: {
allCategory: {
handler(n, o) {
console.log(n.filter(item => item.parentId))
this.searchNblist = n.filter(item => item.parentId)
},
deep: true
} }
}, },
created() { created() {
@ -526,6 +540,7 @@ export default {
} }
this.sbxxList.sblbdm = this.shebeileibiedaima this.sbxxList.sblbdm = this.shebeileibiedaima
this.sbxxList.sbpzdm = this.shebeipinzhongdaima this.sbxxList.sbpzdm = this.shebeipinzhongdaima
console.log(this.path + '/null')
this.$router.push({ this.$router.push({
path: this.path + '/null', path: this.path + '/null',
query: { query: {

99
src/views/ysjl/3000/common/index.vue

@ -189,7 +189,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row <el-row
v-if="fromType === 1 || fromType === 5 || fromType === 3" v-if="fromType === 1 || fromType === 5 || fromType === 3 ||fromType===8"
:gutter="20" :gutter="20"
> >
<el-col :span="18"> <el-col :span="18">
@ -202,7 +202,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="fromType === 2 || fromType === 4" :gutter="20"> <el-row v-if="fromType === 2 || fromType === 4 ||fromType===6||fromType===8" :gutter="20">
<el-col :span="18"> <el-col :span="18">
<el-form-item <el-form-item
label="施工单位名称" label="施工单位名称"
@ -216,7 +216,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="fromType === 2 || fromType === 4" :gutter="20"> <el-row v-if="fromType === 2 || fromType === 4 ||fromType===6||fromType===8" :gutter="20">
<el-col :span="9"> <el-col :span="9">
<el-form-item <el-form-item
label="施工单位许可证编号" label="施工单位许可证编号"
@ -239,7 +239,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="fromType === 2" :gutter="20"> <el-row v-if="fromType === 2 || fromType===6||fromType===8" :gutter="20">
<el-col :span="18"> <el-col :span="18">
<el-form-item label="安装地点" prop="anzhuangdidian"> <el-form-item label="安装地点" prop="anzhuangdidian">
<el-input <el-input
@ -250,7 +250,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row v-if="fromType!==6&&fromType!==8" :gutter="20">
<el-col :span="9"> <el-col :span="9">
<el-form-item label="安全管理人员" prop="anquanguanlirenyuan"> <el-form-item label="安全管理人员" prop="anquanguanlirenyuan">
<el-input <el-input
@ -293,7 +293,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="fromType === 1 || fromType === 5" :gutter="20"> <el-row v-if="fromType === 1 || fromType === 5 ||fromType===7||fromType===8" :gutter="20">
<el-col :span="18"> <el-col :span="18">
<el-form-item label="注册代码" prop="zhucedaima"> <el-form-item label="注册代码" prop="zhucedaima">
<el-input <el-input
@ -304,7 +304,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row v-if="fromType!==6" :gutter="20">
<el-col :span="18"> <el-col :span="18">
<el-form-item label="设备使用地点" prop="anzhuangdidian"> <el-form-item label="设备使用地点" prop="anzhuangdidian">
<el-input <el-input
@ -315,7 +315,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row v-if="fromType!==6&&fromType!==8" :gutter="20">
<el-col :span="9"> <el-col :span="9">
<el-form-item label="单位内编号" prop="danweineibubianhao"> <el-form-item label="单位内编号" prop="danweineibubianhao">
<el-input <el-input
@ -337,7 +337,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="9"> <el-col v-if="fromType!==6&&fromType!==8" :span="9">
<el-form-item label="改造单位名称" prop="gaizaodanwei"> <el-form-item label="改造单位名称" prop="gaizaodanwei">
<el-input <el-input
v-model="ysjl.gaizaodanwei" v-model="ysjl.gaizaodanwei"
@ -356,7 +356,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="fromType === 2" :gutter="20"> <el-row v-if="fromType === 2 || fromType===6" :gutter="20">
<el-col :span="9"> <el-col :span="9">
<el-form-item label="联系人" prop="lianxiren"> <el-form-item label="联系人" prop="lianxiren">
<el-input <el-input
@ -367,7 +367,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="9"> <el-col :span="9">
<el-form-item label="电话" prop="dianhua"> <el-form-item label="联系电话" prop="dianhua">
<el-input <el-input
v-model="param.dianhua" v-model="param.dianhua"
type="number" type="number"
@ -390,7 +390,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="9"> <el-col :span="9">
<el-form-item <el-form-item
v-if="fromType === 5" v-if="fromType === 5 ||fromType === 6||fromType===7||fromType===8"
label="维护保养单位电话" label="维护保养单位电话"
prop="weibaodanweiDianhua" prop="weibaodanweiDianhua"
> >
@ -422,7 +422,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="fromType !== 5" :gutter="20"> <el-row v-if="fromType !== 6&&fromType !== 5&&fromType!==7&&fromType!==8" :gutter="20">
<el-col :span="18"> <el-col :span="18">
<el-form-item <el-form-item
label="现场检验条件" label="现场检验条件"
@ -439,8 +439,48 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="fromType === 7||fromType===8" :gutter="20">
<el-col :span="9">
<el-form-item
label="整机防爆标志"
prop="zhengjifangbaobiaozhi"
>
<el-input
v-model="param.zhengjifangbaobiaozhi"
type="text"
:disabled="edit"
/>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item
label="燃爆物质"
prop="ranbaowuzhi"
>
<el-input
v-model="param.ranbaowuzhi"
type="text"
:disabled="edit"
/>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="fromType === 7||fromType===8" :gutter="20">
<el-col :span="18">
<el-form-item
label="区域防爆等级"
prop="quyufangbaodengji"
>
<el-input
v-model="param.quyufangbaodengji"
type="text"
:disabled="edit"
/>
</el-form-item>
</el-col>
</el-row>
</fieldset> </fieldset>
<fieldset v-if="fromType !== 5"> <fieldset v-if="fromType !== 5&&fromType!==6">
<legend>设备技术参数</legend> <legend>设备技术参数</legend>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="9"> <el-col :span="9">
@ -669,8 +709,8 @@
<el-tab-pane label="检验项目" name="second"> <el-tab-pane label="检验项目" name="second">
<Inspection :bgfy-data="bgfyData" /> <Inspection :bgfy-data="bgfyData" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane v-if="fromType === 5" label="附表1" name="three"> <el-tab-pane v-if="fromType === 5 ||fromType === 6" label="附表1" name="three">
<zdft-fb ref="table1" :table-data.sync="fubiao1" :state.sync="state" /> <zdft-fb ref="table4" :table-data.sync="fubiao1" :state.sync="state" />
</el-tab-pane> </el-tab-pane>
<template v-else> <template v-else>
<el-tab-pane label="附表一" name="four"> <el-tab-pane label="附表一" name="four">
@ -688,8 +728,8 @@
/> />
</el-tab-pane> </el-tab-pane>
<el-tab-pane <el-tab-pane
v-if="fromType === 1 || fromType === 3" v-if="fromType === 1 || fromType === 3||fromType===7||fromType===8"
label="附表3" label="附表"
name="six" name="six"
> >
<phxsb <phxsb
@ -809,6 +849,22 @@ export default {
if (this.state === 'create') { if (this.state === 'create') {
this.initYsjl() this.initYsjl()
this.getMaxBh() this.getMaxBh()
if (this.fromType === 5 || this.fromType === 6) {
this.fubiao1 = [
{
D2: '第一次',
D1: ''
},
{
D2: '第二次',
D1: ''
},
{
D2: '第三次',
D1: ''
}
]
}
} else { } else {
this.getYsjl() this.getYsjl()
this.getParam() this.getParam()
@ -999,8 +1055,9 @@ export default {
buildSaveData(operation) { buildSaveData(operation) {
const tableData = [] const tableData = []
let fubiao let fubiao
if (this.fromType === 5) { if (this.fromType === 5 || this.fromType === 6) {
fubiao = [this.$refs.table1.tableData] console.log(this.$refs.table4.tableData, 5555)
fubiao = [this.$refs.table4.tableData]
} else { } else {
fubiao = [this.fubiao1, this.fubiao2, this.fubiao3] fubiao = [this.fubiao1, this.fubiao2, this.fubiao3]
} }
@ -1056,7 +1113,7 @@ export default {
} }
}, },
save(operation, type, jyxm, fubiao) { save(operation, type, jyxm, fubiao) {
if (this.fromType !== 5) this.ysjl.imagePath = this.$refs.table1.imgPath if (this.fromType !== 5 && this.fromType !== 6) this.ysjl.imagePath = this.$refs.table1.imgPath
// //
if (this.isRepeat) { if (this.isRepeat) {

52
src/views/ysjl/3000/dj/common/zdftFb.vue

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-table :data="data" style="width: 30%" border=""> <el-table :data="tableData" style="width: 30%" border="">
<el-table-column label="" prop="D2" width="100" /> <el-table-column label="" prop="D2" width="100" />
<el-table-column label="制停距离(m)" prop="D1"> <el-table-column label="制停距离(m)" prop="D1">
<template slot-scope="scope"> <template slot-scope="scope">
@ -42,32 +42,30 @@ export default {
] ]
} }
}, },
computed: { // computed: {
data() { // allData() {
if (this.state === 'create') { // if (this.state === "create") {
const arr = [ // this.tableData = [
{ // {
D2: '第一次', // D2: "",
D1: '' // D1: "",
}, // },
{ // {
D2: '第二次', // D2: "",
D1: '' // D1: "",
}, // },
{ // {
D2: '第三次', // D2: "",
D1: '' // D1: "",
} // },
] // ];
return arr // return this.tableData;
} else { // } else {
return this.tableData // return this.tableData;
} // }
} // },
}, // },
mounted() { mounted() {},
},
methods: {} methods: {}
} }
</script> </script>

155
src/views/ysjl/3000/dj/xfdt/index.vue

@ -0,0 +1,155 @@
<template>
<div class="app-container">
<baseInfo :from-type="type" :array-group="arrayGroup" />
</div>
</template>
<script>
import baseInfo from '@/views/ysjl/3000/common/index'
export default {
name: 'ElevatorYeyin',
components: { baseInfo },
data() {
return {
type: 1,
arrayGroup: [
{
header: [
{
label: '层站',
prop: 'D7',
type: 1
},
{
label: '3.7 轿厢与井道壁距离单位:m)',
prop: 'D6',
type: 1
},
{
label: '按20%抽查的项目',
type: 2,
child: [
{
label: '6.6门的运行和导向',
prop: 'D5',
type: 1
},
{
label: '6.7自动关闭层门装置',
prop: 'D4',
type: 1
},
{
label: '6.8紧急开锁装置',
prop: 'D3',
type: 1
},
{
label: '6.9 门的锁紧',
prop: 'D2',
type: 1
},
{
label: '6.10门的闭合',
prop: 'D1',
type: 1
}
]
}
],
data: []
},
{
header: [
{
label: '层站',
prop: 'D9',
type: 1
},
{
label: '6.3施力层门间隙',
prop: 'D8',
type: 1
},
{
label: '6.3门扇与门扇',
prop: 'D7',
type: 1
},
{
label: '6.3门扇与立柱',
prop: 'D6',
type: 1
},
{
label: '6.3门扇与门楣',
prop: 'D5',
type: 1
},
{
label: '6.3门扇与地坎',
prop: 'D4',
type: 1
},
{
label: '6.9门锁啮合长度',
prop: 'D3',
type: 1
},
{
label: '6.12门刀与层门地坎间距',
prop: 'D2',
type: 1
},
{
label: '6.12门锁滚轮与轿门地坎间距',
prop: 'D1',
type: 1
}
],
data: []
}
],
tableHeader2: [
{
label: '电动机电流载重量百分比',
type: 1
},
{
label: '30%',
prop: 'D1',
type: 1
},
{
label: '40%',
prop: 'D2',
type: 1
},
{
label: '45%',
prop: 'D3',
type: 1
},
{
label: '50%',
prop: 'D4',
type: 1
},
{
label: '60%',
prop: 'D5',
type: 1
}
],
list: [],
list1: []
}
},
computed: {},
created() {},
methods: {}
}
</script>
<style>
</style>

155
src/views/ysjl/3000/dj/yyfb/index.vue

@ -0,0 +1,155 @@
<template>
<div class="app-container">
<baseInfo :from-type="type" :array-group="arrayGroup" />
</div>
</template>
<script>
import baseInfo from '@/views/ysjl/3000/common/index'
export default {
name: 'ElevatorYeyin',
components: { baseInfo },
data() {
return {
type: 7,
arrayGroup: [
{
header: [
{
label: '层站',
prop: 'D7',
type: 1
},
{
label: '4.7 轿厢与井道壁距离单位:m)',
prop: 'D6',
type: 1
},
{
label: '按20%抽查的项目',
type: 2,
child: [
{
label: '7.5门的运行和导向',
prop: 'D5',
type: 1
},
{
label: '7.6自动关闭层门装置',
prop: 'D4',
type: 1
},
{
label: '7.7紧急开锁装置',
prop: 'D3',
type: 1
},
{
label: '7.8 门的锁紧',
prop: 'D2',
type: 1
},
{
label: '7.9门的闭合',
prop: 'D1',
type: 1
}
]
}
],
data: []
},
{
header: [
{
label: '层站',
prop: 'D9',
type: 1
},
{
label: '7.3.1施力层门间隙',
prop: 'D8',
type: 1
},
{
label: '7.3.1门扇与门扇',
prop: 'D7',
type: 1
},
{
label: '7.3.1门扇与立柱',
prop: 'D6',
type: 1
},
{
label: '7.3.1门扇与门楣',
prop: 'D5',
type: 1
},
{
label: '7.3.1门扇与地坎',
prop: 'D4',
type: 1
},
{
label: '7.8.1门锁啮合长度',
prop: 'D3',
type: 1
},
{
label: '7.10门刀与层门地坎间距',
prop: 'D2',
type: 1
},
{
label: '7.10门锁滚轮与轿门地坎间距',
prop: 'D1',
type: 1
}
],
data: []
}
],
tableHeader2: [
{
label: '电动机电流载重量百分比',
type: 1
},
{
label: '30%',
prop: 'D1',
type: 1
},
{
label: '40%',
prop: 'D2',
type: 1
},
{
label: '45%',
prop: 'D3',
type: 1
},
{
label: '50%',
prop: 'D4',
type: 1
},
{
label: '60%',
prop: 'D5',
type: 1
}
],
list: [],
list1: []
}
},
computed: {},
created() {},
methods: {}
}
</script>
<style>
</style>

155
src/views/ysjl/3000/jj/xfdt/index.vue

@ -0,0 +1,155 @@
<template>
<div class="app-container">
<baseInfo :from-type="type" :array-group="arrayGroup" />
</div>
</template>
<script>
import baseInfo from '@/views/ysjl/3000/common/index'
export default {
name: 'ElevatorYeyin',
components: { baseInfo },
data() {
return {
type: 1,
arrayGroup: [
{
header: [
{
label: '层站',
prop: 'D7',
type: 1
},
{
label: '3.7 轿厢与井道壁距离单位:m)',
prop: 'D6',
type: 1
},
{
label: '按20%抽查的项目',
type: 2,
child: [
{
label: '6.6门的运行和导向',
prop: 'D5',
type: 1
},
{
label: '6.7自动关闭层门装置',
prop: 'D4',
type: 1
},
{
label: '6.8紧急开锁装置',
prop: 'D3',
type: 1
},
{
label: '6.9 门的锁紧',
prop: 'D2',
type: 1
},
{
label: '6.10门的闭合',
prop: 'D1',
type: 1
}
]
}
],
data: []
},
{
header: [
{
label: '层站',
prop: 'D9',
type: 1
},
{
label: '6.3施力层门间隙',
prop: 'D8',
type: 1
},
{
label: '6.3门扇与门扇',
prop: 'D7',
type: 1
},
{
label: '6.3门扇与立柱',
prop: 'D6',
type: 1
},
{
label: '6.3门扇与门楣',
prop: 'D5',
type: 1
},
{
label: '6.3门扇与地坎',
prop: 'D4',
type: 1
},
{
label: '6.9门锁啮合长度',
prop: 'D3',
type: 1
},
{
label: '6.12门刀与层门地坎间距',
prop: 'D2',
type: 1
},
{
label: '6.12门锁滚轮与轿门地坎间距',
prop: 'D1',
type: 1
}
],
data: []
}
],
tableHeader2: [
{
label: '电动机电流载重量百分比',
type: 1
},
{
label: '30%',
prop: 'D1',
type: 1
},
{
label: '40%',
prop: 'D2',
type: 1
},
{
label: '45%',
prop: 'D3',
type: 1
},
{
label: '50%',
prop: 'D4',
type: 1
},
{
label: '60%',
prop: 'D5',
type: 1
}
],
list: [],
list1: []
}
},
computed: {},
created() {},
methods: {}
}
</script>
<style>
</style>

160
src/views/ysjl/3000/jj/yyfb/index.vue

@ -0,0 +1,160 @@
<template>
<div class="app-container">
<baseInfo :from-type="type" :array-group="arrayGroup" />
</div>
</template>
<script>
import baseInfo from '@/views/ysjl/3000/common/index'
export default {
name: 'ElevatorYeyin',
components: { baseInfo },
data() {
return {
type: 8,
arrayGroup: [
{
header: [
{
label: '层站',
prop: 'D7',
type: 1
},
{
label: '4.7 轿厢与井道壁距离单位:m)',
prop: 'D6',
type: 1
},
{
label: '按20%抽查的项目',
type: 2,
child: [
{
label: '7.5门的运行和导向',
prop: 'D5',
type: 1
},
{
label: '7.6自动关闭层门装置',
prop: 'D4',
type: 1
},
{
label: '7.7紧急开锁装置',
prop: 'D3',
type: 1
},
{
label: '7.8 门的锁紧',
prop: 'D2',
type: 1
},
{
label: '7.9门的闭合',
prop: 'D1',
type: 1
}
]
}
],
data: []
},
{
header: [
{
label: '层站',
prop: 'D10',
type: 1
},
{
label: '7.1层、桥门地坎水平距离',
prop: 'D9',
type: 1
},
{
label: '7.3.1施力层门间隙',
prop: 'D8',
type: 1
},
{
label: '7.3.1门扇与门扇',
prop: 'D7',
type: 1
},
{
label: '7.3.1门扇与立柱',
prop: 'D6',
type: 1
},
{
label: '7.3.1门扇与门楣',
prop: 'D5',
type: 1
},
{
label: '7.3.1门扇与地坎',
prop: 'D4',
type: 1
},
{
label: '7.8.1门锁啮合长度',
prop: 'D3',
type: 1
},
{
label: '7.10门刀与层门地坎间距',
prop: 'D2',
type: 1
},
{
label: '7.10门锁滚轮与轿门地坎间距',
prop: 'D1',
type: 1
}
],
data: []
}
],
tableHeader2: [
{
label: '电动机电流载重量百分比',
type: 1
},
{
label: '30%',
prop: 'D1',
type: 1
},
{
label: '40%',
prop: 'D2',
type: 1
},
{
label: '45%',
prop: 'D3',
type: 1
},
{
label: '50%',
prop: 'D4',
type: 1
},
{
label: '60%',
prop: 'D5',
type: 1
}
],
list: [],
list1: []
}
},
computed: {},
created() {},
methods: {}
}
</script>
<style>
</style>

2
src/views/ysjl/3000/jj/zdft/index.vue

@ -11,7 +11,7 @@ export default {
components: { baseInfo }, components: { baseInfo },
data() { data() {
return { return {
type: 5, type: 6,
arrayGroup: [ arrayGroup: [
{ {
header: [ header: [

Loading…
Cancel
Save