Loading src/utils/axios.js +0 −1 Original line number Diff line number Diff line Loading @@ -49,7 +49,6 @@ service.interceptors.response.use(response => { }); } }else{ // Notify({ type: 'danger', message: '失败' }); Promise.reject(new Error('Error')) } },err=>{ Loading src/views/checked/index.vue +2 −11 Original line number Diff line number Diff line Loading @@ -63,17 +63,8 @@ export default { }, cardLocation(item){ console.log(item) this.$router.push({ name:'problem', query:{ checkitemId:item.id, name:item.name, type:item.type, planStartTime:item.planStartTime, planEndTime:item.planEndTime, address:item.address, } }) sessionStorage.setItem('id',item.id) this.$router.push('/problem') } } } Loading src/views/checked/problem/index.vue +13 −18 Original line number Diff line number Diff line Loading @@ -12,11 +12,11 @@ <div> <LHeader v-bind:text="text"></LHeader> <div class="card"> <div>检查名称:{{itemlist.name}}</div> <div>检查类型:{{itemlist.type}}</div> <div>检查开始时间:{{itemlist.planStartTime}}</div> <div>检查结束时间:{{itemlist.planEndTime}}</div> <div>检查地点:{{itemlist.address}}</div> <div>检查名称:{{nums.name}}</div> <div>检查类型:{{nums.type}}</div> <div>检查开始时间:{{nums.planStartTime}}</div> <div>检查结束时间:{{nums.planEndTime}}</div> <div>检查地点:{{nums.address}}</div> </div> <div class="button-more"> <van-button type="primary" round size="large" @click="problem">检查问题上报{{nums.TroubleNumber}}</van-button> Loading @@ -38,27 +38,17 @@ export default { data() { return { nums:{}, itemlist:{}, text:'问题上报' } }, mounted() { if(this.$route.query.checkitemId){ this.itemlist={ id:this.$route.query.checkitemId, name:this.$route.query.name, type:this.$route.query.type, planStartTime:this.$route.query.planStartTime, planEndTime:this.$route.query.planEndTime, address:this.$route.query.address, } } this.init() }, methods: { init(){ var id=sessionStorage.getItem('id') this.nums=[]; getFun('check/carry/count').then((Response)=>{ getFun('check/carry/count',{planId:id}).then((Response)=>{ this.nums=Response.data }) }, Loading @@ -74,7 +64,12 @@ export default { this.$router.push('/list') }, note(){ this.$router.push('/note') this.$router.push({ name:'note', query:{ id:this.nums.id } }) }, formwork(){ this.$router.push('/formwork') Loading src/views/checked/problem/note/index.vue +32 −21 Original line number Diff line number Diff line Loading @@ -13,24 +13,12 @@ <LHeader v-bind:text="text"></LHeader> <van-checkbox-group v-model="result" @change="checkedEvent" ref="checkboxGroup"> <div class="card" v-for="(item,index) in list" :key="index" > <van-checkbox :name="item.planItemId" :disabled="item.planItemId==1?true:false">问题{{item.id}}</van-checkbox> <van-checkbox :name="item.id" :disabled="item.checkSubmitId?true:false">问题{{item.id}}</van-checkbox> <div>问题名称:{{item.title}}</div> <div>问题位置:{{item.address}}</div> <div>问题内容:{{item.context}}</div> <div>发现时间:{{item.checkTime}}</div> </div> <!-- <div class="card"> <van-checkbox name="b">问题二</van-checkbox> <div>问题描述:未编制专项试工方案或未进行设计计算</div> <div>具体位置:项目内页管理</div> <div>发现时间:2021-12-15</div> </div> <div class="card"> <van-checkbox name="c">问题三</van-checkbox> <div>问题描述:未编制专项试工方案或未进行设计计算</div> <div>具体位置:项目内页管理</div> <div>发现时间:2021-12-15</div> </div> --> </van-checkbox-group> <div class="page-footer"> <van-checkbox v-model="checkedAll" @change="checkedAllEvent" @click="checkedAllClick">全选</van-checkbox> Loading @@ -55,16 +43,25 @@ export default { text:'问题记录', checkedAll:false, result: [], list:[] list:[], id:'', } }, mounted() { if(this.$route.query.id){ this.id=this.$route.query.id } this.init() }, methods: { init(){ getFun('check/carry/trouble/list').then((Response)=>{ getFun('check/carry/trouble/list',).then((Response)=>{ this.list=Response.data this.list.forEach((item)=>{ if(item.checkSubmitId){ this.result.push(parseInt(item.checkSubmitId)) } }) }) }, //全选点击事件---只让全选框的触发全不选事件 Loading @@ -72,13 +69,18 @@ export default { if(this.checkedAll){ this.$refs.checkboxGroup.toggleAll(true); }else{ this.$refs.checkboxGroup.toggleAll(false); /* 全不选只可以控制未禁用状态下的复选框 */ for(var key of this.$refs.checkboxGroup.$children){ if(!key.$el._prevClass.includes('disabled')){ key.toggle(false) } } } }, checkedEvent(list){ if(list.length==3){ checkedEvent(){ if(this.result.length==this.list.length){ this.checkedAll=true }else if(list.length<3){ }else if(this.result.length<this.list.length){ this.checkedAll=false } }, Loading @@ -91,9 +93,18 @@ export default { this.$toast.success('取消') }, commit(){ var checkedList=[] /* 禁用状态下的(已选过)问题不进行提交,进行清空处理 */ this.result.forEach((it)=>{ this.list.forEach((item)=>{ if(it==item.id&&!item.checkSubmitId){ checkedList.push(it) } }) }) var obj={ planId:1, troubleIds:this.result planId:this.id, troubleIds:checkedList } this.$dialog.confirm({ title: '提示', Loading Loading
src/utils/axios.js +0 −1 Original line number Diff line number Diff line Loading @@ -49,7 +49,6 @@ service.interceptors.response.use(response => { }); } }else{ // Notify({ type: 'danger', message: '失败' }); Promise.reject(new Error('Error')) } },err=>{ Loading
src/views/checked/index.vue +2 −11 Original line number Diff line number Diff line Loading @@ -63,17 +63,8 @@ export default { }, cardLocation(item){ console.log(item) this.$router.push({ name:'problem', query:{ checkitemId:item.id, name:item.name, type:item.type, planStartTime:item.planStartTime, planEndTime:item.planEndTime, address:item.address, } }) sessionStorage.setItem('id',item.id) this.$router.push('/problem') } } } Loading
src/views/checked/problem/index.vue +13 −18 Original line number Diff line number Diff line Loading @@ -12,11 +12,11 @@ <div> <LHeader v-bind:text="text"></LHeader> <div class="card"> <div>检查名称:{{itemlist.name}}</div> <div>检查类型:{{itemlist.type}}</div> <div>检查开始时间:{{itemlist.planStartTime}}</div> <div>检查结束时间:{{itemlist.planEndTime}}</div> <div>检查地点:{{itemlist.address}}</div> <div>检查名称:{{nums.name}}</div> <div>检查类型:{{nums.type}}</div> <div>检查开始时间:{{nums.planStartTime}}</div> <div>检查结束时间:{{nums.planEndTime}}</div> <div>检查地点:{{nums.address}}</div> </div> <div class="button-more"> <van-button type="primary" round size="large" @click="problem">检查问题上报{{nums.TroubleNumber}}</van-button> Loading @@ -38,27 +38,17 @@ export default { data() { return { nums:{}, itemlist:{}, text:'问题上报' } }, mounted() { if(this.$route.query.checkitemId){ this.itemlist={ id:this.$route.query.checkitemId, name:this.$route.query.name, type:this.$route.query.type, planStartTime:this.$route.query.planStartTime, planEndTime:this.$route.query.planEndTime, address:this.$route.query.address, } } this.init() }, methods: { init(){ var id=sessionStorage.getItem('id') this.nums=[]; getFun('check/carry/count').then((Response)=>{ getFun('check/carry/count',{planId:id}).then((Response)=>{ this.nums=Response.data }) }, Loading @@ -74,7 +64,12 @@ export default { this.$router.push('/list') }, note(){ this.$router.push('/note') this.$router.push({ name:'note', query:{ id:this.nums.id } }) }, formwork(){ this.$router.push('/formwork') Loading
src/views/checked/problem/note/index.vue +32 −21 Original line number Diff line number Diff line Loading @@ -13,24 +13,12 @@ <LHeader v-bind:text="text"></LHeader> <van-checkbox-group v-model="result" @change="checkedEvent" ref="checkboxGroup"> <div class="card" v-for="(item,index) in list" :key="index" > <van-checkbox :name="item.planItemId" :disabled="item.planItemId==1?true:false">问题{{item.id}}</van-checkbox> <van-checkbox :name="item.id" :disabled="item.checkSubmitId?true:false">问题{{item.id}}</van-checkbox> <div>问题名称:{{item.title}}</div> <div>问题位置:{{item.address}}</div> <div>问题内容:{{item.context}}</div> <div>发现时间:{{item.checkTime}}</div> </div> <!-- <div class="card"> <van-checkbox name="b">问题二</van-checkbox> <div>问题描述:未编制专项试工方案或未进行设计计算</div> <div>具体位置:项目内页管理</div> <div>发现时间:2021-12-15</div> </div> <div class="card"> <van-checkbox name="c">问题三</van-checkbox> <div>问题描述:未编制专项试工方案或未进行设计计算</div> <div>具体位置:项目内页管理</div> <div>发现时间:2021-12-15</div> </div> --> </van-checkbox-group> <div class="page-footer"> <van-checkbox v-model="checkedAll" @change="checkedAllEvent" @click="checkedAllClick">全选</van-checkbox> Loading @@ -55,16 +43,25 @@ export default { text:'问题记录', checkedAll:false, result: [], list:[] list:[], id:'', } }, mounted() { if(this.$route.query.id){ this.id=this.$route.query.id } this.init() }, methods: { init(){ getFun('check/carry/trouble/list').then((Response)=>{ getFun('check/carry/trouble/list',).then((Response)=>{ this.list=Response.data this.list.forEach((item)=>{ if(item.checkSubmitId){ this.result.push(parseInt(item.checkSubmitId)) } }) }) }, //全选点击事件---只让全选框的触发全不选事件 Loading @@ -72,13 +69,18 @@ export default { if(this.checkedAll){ this.$refs.checkboxGroup.toggleAll(true); }else{ this.$refs.checkboxGroup.toggleAll(false); /* 全不选只可以控制未禁用状态下的复选框 */ for(var key of this.$refs.checkboxGroup.$children){ if(!key.$el._prevClass.includes('disabled')){ key.toggle(false) } } } }, checkedEvent(list){ if(list.length==3){ checkedEvent(){ if(this.result.length==this.list.length){ this.checkedAll=true }else if(list.length<3){ }else if(this.result.length<this.list.length){ this.checkedAll=false } }, Loading @@ -91,9 +93,18 @@ export default { this.$toast.success('取消') }, commit(){ var checkedList=[] /* 禁用状态下的(已选过)问题不进行提交,进行清空处理 */ this.result.forEach((it)=>{ this.list.forEach((item)=>{ if(it==item.id&&!item.checkSubmitId){ checkedList.push(it) } }) }) var obj={ planId:1, troubleIds:this.result planId:this.id, troubleIds:checkedList } this.$dialog.confirm({ title: '提示', Loading