Browse Source

修改筛选条件修改原始记录附表

master
xiaobai 3 years ago
parent
commit
be10d49922
  1. 4
      .env.development
  2. 17
      src/views/task/list.vue
  3. 8
      src/views/ysjl/3000/dj/common/zdftFb.vue
  4. 73
      src/views/ysjl/3000/jj/zdft/index.vue

4
.env.development

@ -4,10 +4,10 @@
VUE_APP_PROJECT_NAME = 'SJJY'
# 微服务IP
VUE_APP_SERVER_ADDRESS = '192.168.1.130'
VUE_APP_SERVER_ADDRESS = 'test.sdma.mingansei.com'
# 微服务地址
VUE_APP_SERVER_API = 'http://${VUE_APP_SERVER_ADDRESS}:9100'
VUE_APP_SERVER_API = 'http://${VUE_APP_SERVER_ADDRESS}'
# 省局数据后台IP
VUE_APP_SJ_BASE_IP_ADDRESS = '192.168.1.130'

17
src/views/task/list.vue

@ -31,6 +31,9 @@
<el-select v-model="listQuery.shebeizhongleidaima" placeholder="请选择设备种类" clearable>
<el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
<el-select v-model="listQuery.neibuleibie" placeholder="请选择检验类别" clearable>
<el-option v-for="item in searchNblbList" :key="item.code" :label="item.name" :value="item.code" v-show="item.parentId" />
</el-select>
<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.shiyongdengjibianhao" placeholder="使用登记证号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
@ -229,7 +232,7 @@ import Pagination from '@/components/Pagination'
import Utils from '../../utils/contact.js'
import { getOwnList, terminateRenwu, completeRenwuFn } from '@/api/renwu'
import { cancelRenwuFn } from '@/api/common'
import { mapGetters } from 'vuex'
import Enclosure from '@/views/common/Enclosure'
export default {
name: 'MyTask',
@ -288,11 +291,23 @@ export default {
isSysUser: this.$store.getters.clientType === 'System'
}
},
filters: {
screen(value) {
console.log(value,254444)
return value.charAt(0).toUpperCase() + value.slice(1)
}
},
created() {
this.getList()
this.getSbList(undefined, undefined, 1)
this.jylbList = this.$store.getters.allCategory
},
computed: {
// 使 getter computed
searchNblbList(){
return this.$store.getters.allCategory
}
},
mounted() {
const that = this
this.common.$on('task-list', function() {

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

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-table :data="data" style="width: 50%">
<el-table-column label="" prop="D2" />
<el-table :data="data" style="width: 30%" border="">
<el-table-column label="" prop="D2" width="100" />
<el-table-column label="制停距离(m)" prop="D1">
<template slot-scope="scope">
<el-input v-model="scope.row.D1" />
@ -21,7 +21,7 @@ export default {
},
state: {
type: String,
require: true
required: true
}
},
data() {
@ -44,7 +44,7 @@ export default {
},
computed: {
data() {
if (this.state == 'create') {
if (this.state === 'create') {
const arr = [
{
D2: '第一次',

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

@ -0,0 +1,73 @@
<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: 5,
arrayGroup: [
{
header: [
{
label: '',
prop: 'D2',
type: 1
},
{
label: '制停距离(m)',
prop: 'D1',
type: 1
}
]
}
],
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>
Loading…
Cancel
Save