Skip to content

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

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

parents 09980722 1b3d786d
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 69 deletions
src/utils/axios.js
View file @ dbd40972
......@@ -6,12 +6,12 @@
* Copyright (c) 2020 陈尼克 all rights reserved.
* 版权所有，侵权必究！
*/
import axios from 'axios'
import router from '../router'
import axios from 'axios'
import router from '../router'
import { Toast } from 'vant';
import { Notify } from 'vant';
import { Dialog } from 'vant';
import { getToken ,removeToken} from '@/utils/auth' // get token from cookie
import { getToken ,removeToken} from '@/utils/auth' // get token from cookie
const service = axios.create({
baseURL: '/hse/app-api', //前缀路径
headers: {//请求头部
......@@ -45,7 +45,7 @@ service.interceptors.response.use(response => {
theme: 'round-button',
}).then(() => {
removeToken()
this.$router.push('/login2')
location.reload()
});
}
}else{
......@@ -53,7 +53,7 @@ service.interceptors.response.use(response => {
Promise.reject(new Error('Error'))
}
},err=>{
// Notify({ type: 'danger', message: '失败' });
Toast.fail('请求失败');
return Promise.reject(err)
})
......
src/views/Login2.vue
View file @ dbd40972
......@@ -76,7 +76,6 @@ export default {
}
/* 存储用户信息 */
setUserInfo(userInfo)
console.log(getUserInfo())
})
this.$notify({
message:'登录成功',
......
src/views/checked/index.vue
View file @ dbd40972
......@@ -42,28 +42,7 @@ 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
}
],
checkedList:[],
text:'检查执行'
}
},
......@@ -72,13 +51,15 @@ export default {
},
methods: {
list(){
// this.checkedList=[]
this.checkedList=[]
getFun('check/carry/user/list').then((Response)=>{
// this.checkedList=Response.data
this.checkedList=Response.data
})
},
onSearch(){
this.$toast('提示内容')
getFun('check/carry/user/list',{name:this.value}).then((Response)=>{
this.checkedList=Response.data
})
},
cardLocation(item){
console.log(item)
......
src/views/checked/problem/formwork/index.vue
View file @ dbd40972
......@@ -30,9 +30,9 @@
<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="item.checkStatus">
<van-radio name="0">合格</van-radio>
<van-radio name="1" @click="noGrage(item)">不合格</van-radio>
<van-radio-group v-model="item.checkStatus" :disabled="item.isDisabled">
<van-radio name="0" >合格</van-radio>
<van-radio name="1" @click="noGrage(item)" >不合格</van-radio>
</van-radio-group>
</td>
</tr>
......@@ -61,26 +61,6 @@ export default {
list:[],
active:0,
text:'问题上报表',
user:[
{
subject:"制度，规程",
content:"应建立地下有限空间作业安全生产责任制、安全生产规章制度和操作规程。",
law:"DB11/852.1-2013 5.2.2作业单位应建立地下有限空间作业安全生产责任制、安全生产规章制度和操作规程。",
radio:'1',
},
{
subject:"制度，规程",
content:"应建立地下有限空间作业安全生产责任制、安全生产规章制度和操作规程。",
law:"DB11/852.1-2013 5.2.2作业单位应建立地下有限空间作业安全生产责任制、安全生产规章制度和操作规程。",
radio:'1',
},
{
subject:"人员方案",
content:"应建立地下有限空间作业安全生产责任制、安全生产规章制度和操作规程。",
law:"DB11/852.1-2013 5.2.2作业单位应建立地下有限空间作业安全生产责任制、安全生产规章制度和操作规程。",
radio:'1',
}
],
}
},
mounted() {
......@@ -91,18 +71,28 @@ export default {
this.list=[]
getFun('check/carry/list/problem').then((Response)=>{
this.list=Response.data
console.log(this.list)
//根据选择的合格状态来填入单选框禁用状态，'1'为禁用,'0'为启用
this.list.forEach((item)=>{
if(item.checkStatus=='1'){
item.isDisabled=true
}else if(item.checkStatus=='0'){
item.isDisabled=false
}
})
})
},
noGrage(item){
this.$router.push({
name: 'list',
query:{
checkitem:item.checkItem,//检查项目
checkContent:item.checkContent,//检查内容
checkBasis:item.checkBasis,//法律依据
}
})
//通过禁用状态来判断是否可以跳转
if(item.isDisabled==false){
this.$router.push({
name: 'list',
query:{
checkitem:item.checkItem,//检查项目
checkContent:item.checkContent,//检查内容
checkBasis:item.checkBasis,//法律依据
}
})
}
}
}
}
......
src/views/checked/problem/index.vue
View file @ dbd40972
......@@ -66,6 +66,8 @@ export default {
this.$dialog.confirm({
title: '提示',
message: '确定结束检查上报？',
}).then(()=>{
this.$router.push('/checked')
})
},
problem(){
......
src/views/checked/problem/note/index.vue
View file @ dbd40972
......@@ -13,7 +13,7 @@
<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">问题{{item.id}}</van-checkbox>
<van-checkbox :name="item.planItemId" :disabled="item.planItemId==1?true:false">问题{{item.id}}</van-checkbox>
<div>问题名称：{{item.title}}</div>
<div>问题位置：{{item.address}}</div>
<div>问题内容：{{item.context}}</div>
......@@ -51,6 +51,7 @@ export default {
},
data() {
return {
timer:'',
text:'问题记录',
checkedAll:false,
result: [],
......@@ -87,7 +88,7 @@ export default {
}
},
cancel(){
this.$toast('取消')
this.$toast.success('取消')
},
commit(){
var obj={
......@@ -98,13 +99,20 @@ export default {
title: '提示',
message: '确定提交检查问题？',
}).then(()=>{
postFun('check/carry/report/submit',obj).then((Response)=>{
postFun('check/carry/trouble/submit',obj).then((Response)=>{
this.$router.push('/correct')
})
}).catch(()=>{
// this.$toast.loading({
// message:'加载中...',
// forbidClick: true,
// loadingType: 'spinner',
// duration: 0
// })
this.$toast.success('取消')
})
}
}
}
......
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