|
@@ -5,78 +5,13 @@
|
|
|
<div>
|
|
|
<el-tabs v-model='activeName' @tab-click='handleClick'>
|
|
|
<el-tab-pane v-for='(item,index) in everySystem' :key='index' :label='`${item.label}`' :name='`${item.type}`'>
|
|
|
+ <!-- 综合记录事项 -->
|
|
|
<div v-if='item.type==1'>
|
|
|
- <div class='tab-top'>
|
|
|
- <el-date-picker
|
|
|
- v-model='value1'
|
|
|
- type='daterange'
|
|
|
- size='small'
|
|
|
- style='margin-right:12px;width:216px'
|
|
|
- range-separator='-'
|
|
|
- start-placeholder='开始日期'
|
|
|
- end-placeholder='结束日期'
|
|
|
- ></el-date-picker>
|
|
|
- <Select
|
|
|
- width='180'
|
|
|
- tipPlace='top'
|
|
|
- caption='政府部门'
|
|
|
- size='small'
|
|
|
- style='margin-right:12px'
|
|
|
- :selectdata='dataSelect2'
|
|
|
- :placeholder='"请选择"'
|
|
|
- ></Select>
|
|
|
- <el-input placeholder='请按照记录事项搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
|
|
|
- </div>
|
|
|
- <el-table :data='tableData' style='width: 100%;margin-top:12px'>
|
|
|
- <el-table-column label='序号' type='index' width='50'></el-table-column>
|
|
|
- <el-table-column prop='name' sortable label='日期'></el-table-column>
|
|
|
- <el-table-column prop='type' label='政府部门'></el-table-column>
|
|
|
- <el-table-column prop='thing' label='记录事项' :show-overflow-tooltip='true'></el-table-column>
|
|
|
- <el-table-column prop='name' label='工作要求'></el-table-column>
|
|
|
- <el-table-column prop='type' label='整改要求'></el-table-column>
|
|
|
- <el-table-column prop='name' label='附件'></el-table-column>
|
|
|
- </el-table>
|
|
|
+ <zhsx-other-table1 ref='tableZhsx1'></zhsx-other-table1>
|
|
|
</div>
|
|
|
+ <!-- 第三方检测事项 -->
|
|
|
<div v-if='item.type==2'>
|
|
|
- <div class='tab-top'>
|
|
|
- <Select
|
|
|
- width='146'
|
|
|
- tipPlace='top'
|
|
|
- caption='状态'
|
|
|
- size='small'
|
|
|
- style='margin-right:12px'
|
|
|
- :selectdata='dataSelect2'
|
|
|
- :placeholder='"请选择"'
|
|
|
- ></Select>
|
|
|
- <Select
|
|
|
- width='146'
|
|
|
- tipPlace='top'
|
|
|
- caption='部门'
|
|
|
- size='small'
|
|
|
- style='margin-right:12px'
|
|
|
- :selectdata='dataSelect2'
|
|
|
- :placeholder='"请选择"'
|
|
|
- ></Select>
|
|
|
- <el-input placeholder='请按照任务名称搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
|
|
|
- </div>
|
|
|
- <el-table :data='tableData' style='width: 100%;margin-top:12px'>
|
|
|
- <el-table-column label='序号' type='index' width='50'></el-table-column>
|
|
|
- <el-table-column prop='name' sortable label='任务名称'></el-table-column>
|
|
|
- <el-table-column prop='type' label='状态'></el-table-column>
|
|
|
- <el-table-column prop='thing' label='部门' :show-overflow-tooltip='true'></el-table-column>
|
|
|
- <el-table-column prop='name' label='检测结论'></el-table-column>
|
|
|
- </el-table>
|
|
|
- <div class='foot'>
|
|
|
- <el-pagination
|
|
|
- background
|
|
|
- layout='prev, pager, next'
|
|
|
- :total='total'
|
|
|
- :page-size='size'
|
|
|
- @prev-click='pageChanged'
|
|
|
- @next-click='pageChanged'
|
|
|
- @current-change='pageChanged'
|
|
|
- ></el-pagination>
|
|
|
- </div>
|
|
|
+ <zhsx-other-table2 ref='tableZhsx2'></zhsx-other-table2>
|
|
|
</div>
|
|
|
</el-tab-pane>
|
|
|
</el-tabs>
|
|
@@ -85,173 +20,37 @@
|
|
|
<img src='../../assets/imgs/zy1.png' alt />
|
|
|
</div>
|
|
|
</div>
|
|
|
- <!-- <div class='zhsx-top'> -->
|
|
|
- <!-- 第一版 暂时不要动 -->
|
|
|
- <!-- <div class='zhsx-top-left'>
|
|
|
- <span></span>
|
|
|
- <span>综合事项记录</span>
|
|
|
- <img src='../../assets/imgs/zy.svg' alt @click='zhsxLog()' />
|
|
|
- </div>
|
|
|
- <div class='zhsx-top-right'>
|
|
|
- <el-date-picker
|
|
|
- v-model='value1'
|
|
|
- type='daterange'
|
|
|
- size='small'
|
|
|
- style='margin-right:12px'
|
|
|
- range-separator='至'
|
|
|
- start-placeholder='开始日期'
|
|
|
- end-placeholder='结束日期'
|
|
|
- ></el-date-picker>
|
|
|
- <Select
|
|
|
- width='224'
|
|
|
- tipPlace='top'
|
|
|
- caption='政府部门'
|
|
|
- size='small'
|
|
|
- style='margin-right:12px'
|
|
|
- :selectdata='dataSelect2'
|
|
|
- :placeholder='"请选择"'
|
|
|
- ></Select>
|
|
|
- <el-input placeholder='请按照记录事项搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
|
|
|
- </div>-->
|
|
|
- <!-- </div> -->
|
|
|
- <!-- <div class='zhsx-bottom'>
|
|
|
- <el-table :data='tableData' style='width: 100%'>
|
|
|
- <el-table-column label='序号' type='index' width='50'></el-table-column>
|
|
|
- <el-table-column prop='date' sortable label='日期' width='130'></el-table-column>
|
|
|
- <el-table-column prop='address1' label='政府部门' :show-overflow-tooltip='true'></el-table-column>
|
|
|
- <el-table-column prop='address1' label='记录事项' :show-overflow-tooltip='true'></el-table-column>
|
|
|
- <el-table-column prop='address2' label='工作要求'></el-table-column>
|
|
|
- <el-table-column prop='address2' label='整改要求'></el-table-column>
|
|
|
- <el-table-column prop='address2' label='附件'></el-table-column>
|
|
|
- </el-table>
|
|
|
- <div class='footer'>
|
|
|
- <el-pagination background layout='prev, pager, next' :total='100'></el-pagination>
|
|
|
- </div>
|
|
|
- </div>-->
|
|
|
<zhsx-dialog ref='Dialog'></zhsx-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
+import moment from 'moment'
|
|
|
import Select from '@/components/Select/Select.vue'
|
|
|
import ZhsxDialog from './zhsxDialog'
|
|
|
-import { queryGlams, querygcfzyfhz, queryfzyfchange } from '@/api/other.js'
|
|
|
+import zhsxOtherTable1 from './zhsxOtherTable1'
|
|
|
+import zhsxOtherTable2 from './zhsxOtherTable2'
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
- activeName: '1',
|
|
|
- input: '',
|
|
|
- tableData: [
|
|
|
- {
|
|
|
- date: '2016-05-01',
|
|
|
- name: '王小虎',
|
|
|
- address: '上海市普陀区金沙江路 1519 弄',
|
|
|
- address1: 'BI超市消防联动测试故障,要求2.5前完,再复查',
|
|
|
- address2: '陈卫国'
|
|
|
- },
|
|
|
- {
|
|
|
- date: '2016-05-03',
|
|
|
- name: '王小虎',
|
|
|
- address: '上海市普陀区金沙江路 1516 弄',
|
|
|
- address1: 'BI超市消防联动测试故障,要求2.5前完,再复查',
|
|
|
- address2: '陈卫国'
|
|
|
- },
|
|
|
- {
|
|
|
- date: '2016-05-02',
|
|
|
- name: '王小虎',
|
|
|
- address: '应急管理',
|
|
|
- address1: 'BI超市消防联动测试故障,要求2.5前完,再复查',
|
|
|
- address2: '陈卫国'
|
|
|
- },
|
|
|
- {
|
|
|
- date: '2016-05-04',
|
|
|
- name: '王小虎',
|
|
|
- address: '三明市梅列生态环境局',
|
|
|
- address1: 'BI超市消防联动测试故障,要求2.5前完,再复查',
|
|
|
- address2: '陈卫国'
|
|
|
- },
|
|
|
- {
|
|
|
- date: '2016-05-01',
|
|
|
- name: '王小虎',
|
|
|
- address: '上海市普陀区金沙江路 1519 弄',
|
|
|
- address1: 'BI超市消防联动测试故障,要求2.5前完,再复查',
|
|
|
- address2: '陈卫国'
|
|
|
- },
|
|
|
- {
|
|
|
- date: '2016-05-03',
|
|
|
- name: '王小虎',
|
|
|
- address: '上海市普陀区金沙江路 1516 弄',
|
|
|
- address1: 'BI超市消防联动测试故障,要求2.5前完,再复查',
|
|
|
- address2: '陈卫国'
|
|
|
- },
|
|
|
- {
|
|
|
- date: '2016-05-02',
|
|
|
- name: '王小虎',
|
|
|
- address: '应急管理',
|
|
|
- address1: 'BI超市消防联动测试故障,要求2.5前完,再复查',
|
|
|
- address2: '陈卫国'
|
|
|
- },
|
|
|
- {
|
|
|
- date: '2016-05-04',
|
|
|
- name: '王小虎',
|
|
|
- address: '三明市梅列生态环境局',
|
|
|
- address1: 'BI超市消防联动测试故障,要求2.5前完,再复查',
|
|
|
- address2: '陈卫国'
|
|
|
- },
|
|
|
- {
|
|
|
- date: '2016-05-01',
|
|
|
- name: '王小虎',
|
|
|
- address: '上海市普陀区金沙江路 1519 弄',
|
|
|
- address1: 'BI超市消防联动测试故障,要求2.5前完,再复查',
|
|
|
- address2: '陈卫国'
|
|
|
- },
|
|
|
- {
|
|
|
- date: '2016-05-03',
|
|
|
- name: '王小虎',
|
|
|
- address: '上海市普陀区金沙江路 1516 弄',
|
|
|
- address1: 'BI超市消防联动测试故障,要求2.5前完,再复查',
|
|
|
- address2: '陈卫国'
|
|
|
- }
|
|
|
- ],
|
|
|
- value1: '',
|
|
|
- dataSelect2: [
|
|
|
- { id: 'test1', name: '选择项' },
|
|
|
- { id: 'test2', name: '单平米' },
|
|
|
- { id: 'test3', name: '下级分项' },
|
|
|
- { id: 'test4', name: '滑动平均滑动平均' }
|
|
|
- ],
|
|
|
- currentPage: 1,
|
|
|
- total: 1,
|
|
|
- size: 10
|
|
|
+ activeName: '1'
|
|
|
}
|
|
|
},
|
|
|
props: ['everySystem'],
|
|
|
- components: { ZhsxDialog, Select },
|
|
|
+ components: { ZhsxDialog, Select, zhsxOtherTable1, zhsxOtherTable2 },
|
|
|
methods: {
|
|
|
zhsxLog() {
|
|
|
this.$refs.Dialog.open()
|
|
|
},
|
|
|
- pageChanged(page, size) {
|
|
|
- this.currentPage = page
|
|
|
- this.getList()
|
|
|
- },
|
|
|
handleClick(tab) {
|
|
|
- // this.param = tab.name
|
|
|
- console.log(tab)
|
|
|
- },
|
|
|
- getTableData() {
|
|
|
- let getParams = {
|
|
|
- plazaId: this.$store.state.plazaId,
|
|
|
- page: this.page,
|
|
|
- size: this.size
|
|
|
+ if (tab.index == '0') {
|
|
|
+ this.$refs.tableZhsx1[0].getZhjl()
|
|
|
+ } else if (tab.index == '1') {
|
|
|
+ this.$refs.tableZhsx2[0].dsfjc()
|
|
|
}
|
|
|
- queryGlams({ getParams }).then(res => {
|
|
|
- console.log(res)
|
|
|
- })
|
|
|
}
|
|
|
},
|
|
|
mounted() {
|
|
|
- // this.getTableData()
|
|
|
- console.log(this.everySystem)
|
|
|
+ this.$refs.tableZhsx1[0].getZhjl()
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
@@ -261,43 +60,6 @@ export default {
|
|
|
padding: 66px 50px 38px 50px;
|
|
|
.zhsx-top {
|
|
|
position: relative;
|
|
|
- // display: flex;
|
|
|
- // justify-content: space-between;
|
|
|
- // align-items: center;
|
|
|
- // border: 1px solid greenyellow;
|
|
|
- // .zhsx-top-left {
|
|
|
- // display: flex;
|
|
|
- // align-items: center;
|
|
|
- // padding: 5px 0;
|
|
|
- // background: linear-gradient(270deg, rgba(199, 217, 234, 0) 0%, rgba(199, 217, 234, 1) 100%);
|
|
|
- // box-shadow: -6px 2px 8px 0px rgba(31, 36, 41, 0.1);
|
|
|
- // span:nth-of-type(1) {
|
|
|
- // display: inline-block;
|
|
|
- // width: 2px;
|
|
|
- // height: 16px;
|
|
|
- // background: rgba(2, 91, 170, 1);
|
|
|
- // margin-right: 8px;
|
|
|
- // }
|
|
|
- // span:nth-of-type(2) {
|
|
|
- // display: inline-block;
|
|
|
- // width: 107px;
|
|
|
- // height: 22px;
|
|
|
- // font-size: 16px;
|
|
|
- // font-family: MicrosoftYaHeiSemibold;
|
|
|
- // color: rgba(2, 91, 170, 1);
|
|
|
- // line-height: 21px;
|
|
|
- // font-weight: bold;
|
|
|
- // }
|
|
|
- // img {
|
|
|
- // width: 16px;
|
|
|
- // height: 16px;
|
|
|
- // margin-right: 10px;
|
|
|
- // cursor: pointer;
|
|
|
- // }
|
|
|
- // }
|
|
|
- // .zhsx-top-right {
|
|
|
- // display: flex;
|
|
|
- // }
|
|
|
.zhsx-img {
|
|
|
position: absolute;
|
|
|
width: 16px;
|
|
@@ -314,6 +76,7 @@ export default {
|
|
|
align-items: center;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.zhsx-bottom {
|
|
|
margin-top: 12px;
|
|
|
background: #ffffff;
|
|
@@ -384,5 +147,12 @@ export default {
|
|
|
.el-tabs__header {
|
|
|
margin: 0 0 12px;
|
|
|
}
|
|
|
+ .el-table td,
|
|
|
+ .el-table th {
|
|
|
+ padding: 8px 0;
|
|
|
+ }
|
|
|
+ .el-input--suffix .el-input__inner {
|
|
|
+ padding-right: 20px;
|
|
|
+ }
|
|
|
}
|
|
|
</style>
|