Skip to content

B
BCDH-APP
Commit 6f943834 authored by 王李辉's avatar 王李辉
Browse files
Options

Merge branch 'develop' of http://git.censoft.com.cn/BCDH-HSE/bcdh-app into develop

parents c88340fd 2e00fbea
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 31 deletions
src/views/checked/index.vue
View file @ 6f943834
......@@ -21,17 +21,12 @@
<div @click="onSearch">搜索</div>
</template>
</van-search>
<div class="card" @click="cardLocation">
<div>检查名称：昌平区回迁房改造项目安全检查</div>
<div>检查名称：专项检查</div>
<div>检查名称：2021-12-15</div>
<div>检查名称：昌平区回迁房改造工程</div>
</div>
<div class="card">
<div>检查名称：昌平区回迁房改造项目安全检查</div>
<div>检查名称：专项检查</div>
<div>检查名称：2021-12-31</div>
<div>检查名称：昌平区回迁房改造工程</div>
<div class="card" v-for="(item,index) in checkedList" :key="index" @click="cardLocation">
<div>检查名称：{{item.name}}</div>
<div>检查类型：{{item.type}}</div>
<div>检查开始时间：{{item.planStartTime}}</div>
<div>检查结束时间：{{item.planEndTime}}</div>
<div>检查地点：{{item.address}}</div>
</div>
</div>
</template>
......@@ -47,6 +42,28 @@ export default {
data() {
return {
value:'',
checkedList:[
{
"id":17,
"userId":1,
"name":"1",
"type":"定期安全检查",
"planStartTime":"2021-10-09 06:30:42",
"planEndTime":"2021-10-09 15:55:42",
"address":"1",
"finish":false
},
{
"id":18,
"userId":1,
"name":"1",
"type":"定期安全检查",
"planStartTime":"2021-10-09 06:30:42",
"planEndTime":"2021-10-09 15:55:42",
"address":"11",
"finish":false
}
],
text:'检查执行'
}
},
......@@ -55,9 +72,9 @@ export default {
},
methods: {
list(){
// this.checkedList=[]
getFun('check/carry/user/list').then((Response)=>{
console.log(Response)
// this.checkedList=Response.data
})
},
onSearch(){
......
src/views/checked/problem/formwork/index.vue
View file @ 6f943834
......@@ -24,13 +24,13 @@
</tr>
</thead>
<tbody>
<tr v-for="(user,index) in user" :key="index">
<tr v-for="(item,index) in list" :key="index">
<td align="center" v-text="index+1" style="width:10%" ></td>
<td align="center" v-text="user.subject" style="width:15%"></td>
<td align="center" v-text="user.content" style="width:20%"></td>
<td align="center" v-text="user.law" style="width:30%"></td>
<td align="center" v-text="item.checkItem" style="width:15%"></td>
<td align="center" v-text="item.checkContent" style="width:20%"></td>
<td align="center" v-text="item.checkBasis" style="width:30%"></td>
<td align="center">
<van-radio-group v-model="user.radio">
<van-radio-group v-model="item.checkStatus">
<van-radio name="1">合格</van-radio>
<van-radio name="2">不合格</van-radio>
</van-radio-group>
......@@ -50,6 +50,7 @@
</template>
<script>
import LHeader from '@/components/header.vue'
import { getFun,postFun } from '@/service/table'
export default {
name: 'formwork',
components: {
......@@ -57,6 +58,7 @@ export default {
},
data() {
return {
list:[],
active:0,
text:'问题上报表',
user:[
......@@ -82,9 +84,14 @@ export default {
}
},
mounted() {
this.init()
},
methods: {
init(){
getFun('check/carry/list/problem').then((Response)=>{
this.list=Response.data
})
}
}
}
</script>
......
src/views/checked/problem/index.vue
View file @ 6f943834
......@@ -18,9 +18,9 @@
<div>检查名称：昌平区回迁房改造工程</div>
</div>
<div class="button-more">
<van-button type="primary" round size="large" @click="problem">检查问题上报（4）</van-button>
<van-button type="primary" round size="large" @click="formwork">检查清单模板（4）</van-button>
<van-button type="primary" round size="large" @click="note">检查问题记录（8）</van-button>
<van-button type="primary" round size="large" @click="problem">检查问题上报{{nums.TroubleNumber}}</van-button>
<van-button type="primary" round size="large" @click="formwork">检查清单模板{{nums.addTroubleNumber}}</van-button>
<van-button type="primary" round size="large" @click="note">检查问题记录{{nums.listNumber}}</van-button>
<van-button type="primary" round size="large" @click="end">结束上报</van-button>
</div>
</div>
......@@ -28,6 +28,7 @@
<script>
import LHeader from '@/components/header.vue'
import { getFun,postFun } from '@/service/table'
export default {
name: 'problem',
components: {
......@@ -35,13 +36,20 @@ export default {
},
data() {
return {
nums:{},
text:'问题上报'
}
},
mounted() {
this.init()
},
methods: {
init(){
this.nums=[];
getFun('check/carry/count').then((Response)=>{
this.nums=Response.data
})
},
end(){
this.$dialog.confirm({
title: '提示',
......
src/views/checked/problem/note/index.vue
View file @ 6f943834
......@@ -12,13 +12,14 @@
<div>
<LHeader v-bind:text="text"></LHeader>
<van-checkbox-group v-model="result" @change="checkedEvent" ref="checkboxGroup">
<div class="card">
<van-checkbox name="a">问题一</van-checkbox>
<div>问题描述：未编制专项试工方案或未进行设计计算</div>
<div>具体位置：项目内页管理</div>
<div>发现时间：2021-12-15</div>
<div class="card" v-for="(item,index) in list" :key="index" >
<van-checkbox :name="item.id">问题{{item.id}}</van-checkbox>
<div>问题名称：{{item.title}}</div>
<div>问题位置：{{item.address}}</div>
<div>问题内容：{{item.context}}</div>
<div>发现时间：{{item.checkTime}}</div>
</div>
<div class="card">
<!-- <div class="card">
<van-checkbox name="b">问题二</van-checkbox>
<div>问题描述：未编制专项试工方案或未进行设计计算</div>
<div>具体位置：项目内页管理</div>
......@@ -29,7 +30,7 @@
<div>问题描述：未编制专项试工方案或未进行设计计算</div>
<div>具体位置：项目内页管理</div>
<div>发现时间：2021-12-15</div>
</div>
</div> -->
</van-checkbox-group>
<div class="page-footer">
<van-checkbox v-model="checkedAll" @change="checkedAllEvent" @click="checkedAllClick">全选</van-checkbox>
......@@ -42,6 +43,7 @@
<script>
import LHeader from '@/components/header.vue'
import { ContactList } from 'vant';
import { getFun,postFun } from '@/service/table'
export default {
name: 'note',
components: {
......@@ -52,12 +54,18 @@ export default {
text:'问题记录',
checkedAll:false,
result: [],
list:[]
}
},
mounted() {
this.init()
},
methods: {
init(){
getFun('check/carry/trouble/list').then((Response)=>{
this.list=Response.data
})
},
//全选点击事件---只让全选框的触发全不选事件
checkedAllClick(){
if(this.checkedAll){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment