Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain

This commit is contained in:
”Rain“ 2024-05-28 20:36:46 +08:00
commit 1646d9c6a6
12 changed files with 719 additions and 564 deletions

View File

@ -6,308 +6,307 @@ import store from '@/store'
import { Loading, Message, MessageBox } from 'element-ui'
Vue.prototype.$http = axios
// Vue.prototype.qs = QS;
// Vue.use(ElementUI)
// Vue.prototype.qs = QS;
// Vue.use(ElementUI)
var loading
let needLoadingRequestCount = 0
let showLoadingConfig = ''
var COMPANY = ''
function getLang() {
let currentLanguage = store.state.currentLanguage
let langParam = ''
switch (currentLanguage) {
case 'zh':
langParam = 'zh_CN'
break
case 'en':
langParam = 'en_US'
break
}
return langParam
let currentLanguage = store.state.currentLanguage
let langParam = ''
switch (currentLanguage) {
case 'zh':
langParam = 'zh_CN'
break
case 'en':
langParam = 'en_US'
break
}
return langParam
}
// 环境的切换
if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://8.142.139.165:7080' // 湖里区
// axios.defaults.baseURL = 'http://124.71.87.250/'
// axios.defaults.baseURL = 'http://139.9.66.234:30/'
// axios.defaults.baseURL = 'http://14.29.220.211:6023/'
// axios.defaults.baseURL = 'https://zhgd.loganwy.com/' //龙光
// axios.defaults.baseURL = 'https://zhgd-uat.logan.com.cn/'
// axios.defaults.baseURL = 'http://36.137.53.203:9090/' // 南昌地铁 17512009894 123456789 gdjt 87654321
// axios.defaults.baseURL = 'http://192.168.34.125:6023/'
// axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南
// tag: 本地
// axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
// axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上(旧)地址
// axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上旧
// axios.defaults.baseURL = 'http://47.97.202.104:6023/';
// axios.defaults.baseURL = 'http://139.9.66.234:8/';
// axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
// axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
// axios.defaults.baseURL = 'http://120.196.217.6:7000/' //鹤洲
// axios.defaults.baseURL = 'http://117.156.17.59:9090/'; //
// axios.defaults.baseURL = 'http://120.236.247.200:9000/'; //横琴线上
// axios.defaults.baseURL = 'http://223.82.100.80:9000/'; //南昌地铁
// axios.defaults.baseURL = 'http://139.9.66.234:40001/'; //南昌地铁二期
// axios.defaults.baseURL = 'http://124.71.178.44:30/';
// axios.defaults.baseURL = 'http://192.168.34.125:9090/';
// axios.defaults.baseURL = 'http://192.168.88.220:6023/';
// axios.defaults.baseURL = 'http://124.71.178.44:9000/'; //中建 cscec101 123456
// axios.defaults.baseURL = 'https://jk.cscec1b1.com:5138/';//沃尔
// axios.defaults.baseURL = 'http://61.190.32.219:9050/'
// axios.defaults.baseURL = 'http://183.95.84.54:5800/'//合展-宿迁 zxsd 123456
// axios.defaults.baseURL = 'http://183.95.84.54:9500/'//贵州-敏尚 17512075572 123456
// axios.defaults.baseURL = 'http://183.95.84.34:7185/' //测试服
// axios.defaults.baseURL = 'http://183.60.227.61:30246/'
// axios.defaults.baseURL = 'http://183.60.227.61:30249/' //测试服2
// axios.defaults.baseURL = 'http://183.60.227.61:20561/' //龙光地产 龙光地产 123456
// axios.defaults.baseURL = 'http://218.92.215.138:9090/' //盐城 新佳城小区 123456
// axios.defaults.baseURL = 'http://36.137.53.203:9090/' //盐城 gdjt 123456789
// axios.defaults.baseURL = 'http://183.234.150.152:9090/' //华发 huaxin 123456789
// axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上
// axios.defaults.baseURL = 'http://58.250.210.9:9090/' //深汕线上
// axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上
// axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
// axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上(新)地址
// axios.defaults.baseURL = 'http://101.43.164.214:12350/'//中建五局线上
// axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
// axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式
// axios.defaults.baseURL ='http://jxj.zhgdyun.com:100/' //演示平台/·
// axios.defaults.baseURL ='http://192.168.34.221:8188/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:30001/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
// axios.defaults.baseURL ='http://42.194.144.62:8099/' //坪山沙湖
// axios.defaults.baseURL ='http://125.88.207.86:8099/' //坪山沙湖(最新)地址
// axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上
// axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工)
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
// axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
// axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上(最新)地址
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上(最新)地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
// axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址
// axios.defaults.baseURL = 'http://8.142.139.165:7080' // 湖里区
// axios.defaults.baseURL = 'http://124.71.87.250/'
// axios.defaults.baseURL = 'http://139.9.66.234:30/'
// axios.defaults.baseURL = 'http://14.29.220.211:6023/'
// axios.defaults.baseURL = 'https://zhgd.loganwy.com/' //龙光
// axios.defaults.baseURL = 'https://zhgd-uat.logan.com.cn/'
// axios.defaults.baseURL = 'http://36.137.53.203:9090/' // 南昌地铁 17512009894 123456789 gdjt 87654321
// axios.defaults.baseURL = 'http://192.168.34.125:6023/'
// axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南
// tag: 本地
// axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
// axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上(旧)地址
// axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上旧
// axios.defaults.baseURL = 'http://47.97.202.104:6023/';
// axios.defaults.baseURL = 'http://139.9.66.234:8/';
// axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
// axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
// axios.defaults.baseURL = 'http://120.196.217.6:7000/' //鹤洲
// axios.defaults.baseURL = 'http://117.156.17.59:9090/'; //
// axios.defaults.baseURL = 'http://120.236.247.200:9000/'; //横琴线上
// axios.defaults.baseURL = 'http://223.82.100.80:9000/'; //南昌地铁
// axios.defaults.baseURL = 'http://139.9.66.234:40001/'; //南昌地铁二期
// axios.defaults.baseURL = 'http://124.71.178.44:30/';
// axios.defaults.baseURL = 'http://192.168.34.125:9090/';
// axios.defaults.baseURL = 'http://192.168.88.220:6023/';
// axios.defaults.baseURL = 'http://124.71.178.44:9000/'; //中建 cscec101 123456
// axios.defaults.baseURL = 'https://jk.cscec1b1.com:5138/';//沃尔
// axios.defaults.baseURL = 'http://61.190.32.219:9050/'
// axios.defaults.baseURL = 'http://183.95.84.54:5800/'//合展-宿迁 zxsd 123456
// axios.defaults.baseURL = 'http://183.95.84.54:9500/'//贵州-敏尚 17512075572 123456
// axios.defaults.baseURL = 'http://183.95.84.34:7185/' //测试服
// axios.defaults.baseURL = 'http://183.60.227.61:30246/'
// axios.defaults.baseURL = 'http://183.60.227.61:30249/' //测试服2
// axios.defaults.baseURL = 'http://183.60.227.61:20561/' //龙光地产 龙光地产 123456
// axios.defaults.baseURL = 'http://218.92.215.138:9090/' //盐城 新佳城小区 123456
// axios.defaults.baseURL = 'http://36.137.53.203:9090/' //盐城 gdjt 123456789
// axios.defaults.baseURL = 'http://183.234.150.152:9090/' //华发 huaxin 123456789
// axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上
// axios.defaults.baseURL = 'http://58.250.210.9:9090/' //深汕线上
// axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上
// axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
// axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上(新)地址
// axios.defaults.baseURL = 'http://101.43.164.214:12350/'//中建五局线上
// axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
// axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式
// axios.defaults.baseURL ='http://jxj.zhgdyun.com:100/' //演示平台/·
// axios.defaults.baseURL ='http://192.168.34.221:8188/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:30001/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
// axios.defaults.baseURL ='http://42.194.144.62:8099/' //坪山沙湖
// axios.defaults.baseURL ='http://125.88.207.86:8099/' //坪山沙湖(最新)地址
// axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上
// axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工)
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:9111/' //郭圣雄本地
axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
// axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
// axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上(最新)地址
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上(最新)地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
// axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址
} else if (process.env.NODE_ENV == 'debug') {
axios.defaults.baseURL = 'https://www.ceshi.com'
axios.defaults.baseURL = 'https://www.ceshi.com'
} else if (process.env.NODE_ENV == 'production') {
let host = window.location.host
// axios.defaults.baseURL = window.location.protocol + '//' + host + '/api/'//金林湾地址
axios.defaults.baseURL = window.location.protocol + '//' + host + '/'
// axios.defaults.baseURL ='http://192.168.34.216:6023/'
// axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/"
// axios.defaults.baseURL = 'http://zhgd.loganwy.com/`'
let host = window.location.host
// axios.defaults.baseURL = window.location.protocol + '//' + host + '/api/'//金林湾地址
axios.defaults.baseURL = window.location.protocol + '//' + host + '/'
// axios.defaults.baseURL ='http://192.168.34.216:6023/'
// axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/"
// axios.defaults.baseURL = 'http://zhgd.loganwy.com/`'
}
// tag: 河南
if (COMPANY == 'henan') {
// axios.defaults.baseURL = 'http://124.71.178.44:100/' // 备注 2022 10 12 后端说作废
axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 2022 10 12 邱平毅 创建的服务器地址
// axios.defaults.baseURL = 'http://124.71.178.44:100/' // 备注 2022 10 12 后端说作废
axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 2022 10 12 邱平毅 创建的服务器地址
}
// axios.defaults.baseURL = store.getters.BASEURL //'http://124.71.178.44:100/'axios.defaults.timeout = 600000;
// console.log('store.state.userInfo',store)
if (store.state.userInfo) {
axios.defaults.headers.common['Authorization'] =
'Bearer' + ' ' + store.state.userInfo.token
axios.defaults.headers.common['operateId'] = store.state.userInfo.userId
axios.defaults.headers.common['Authorization'] =
'Bearer' + ' ' + store.state.userInfo.token
axios.defaults.headers.common['operateId'] = store.state.userInfo.userId
}
// http请求拦截器
axios.interceptors.request.use(
(config) => {
if (config.url.includes('downloadTemplate')) {
config.headers.common['responseType'] = 'blob'
}
if (config.url.includes('live?port')) return config
// 分屏插件兼容配置
const screensBaseURL = sessionStorage.getItem('screens-baseURL')
if (config.url.indexOf(screensBaseURL) !== -1) {
delete config.headers.common['operateId']
if (config.url === screensBaseURL + '/login') {
const Authorization = sessionStorage.getItem('screens-Authorization')
config.headers.common['Authorization'] = Authorization
} else {
delete config.headers.common['Authorization']
const token = sessionStorage.getItem('screens-token')
config.headers.common['token'] = token
}
return config
}
if (showLoadingConfig == '' || showLoadingConfig == undefined) {
// showFullScreenLoading()
}
return config
},
(error) => {
tryHideFullScreenLoading()
// Message.error('加载超时');
return Promise.reject(error)
}
)
// 响应拦截器
axios.interceptors.response.use(
(response) => {
tryHideFullScreenLoading()
if (response.status === 200) {
return Promise.resolve(response)
} else {
// alert('进入了哪里444')
return Promise.reject(response)
}
},
// 服务器状态码不是2开头的的情况
// 这里可以跟你们的后台开发人员协商好统一的错误状态码
// 然后根据返回的状态码进行一些操作,例如登录过期提示,错误提示等等
// 下面列举几个常见的操作,其他需求可自行扩展
(error) => {
// tryHideFullScreenLoading()
if (error.response.status) {
console.log('----------', error.response)
let errorUrl = error.response.config.baseURL
console.log('-----------------', errorUrl)
let screensUrl = sessionStorage.getItem('screens-baseURL')
const url = error.response.url
if (
errorUrl == screensUrl ||
url === '26938512:7zS9LX2X8u4tW4Ps0ZjN/login'
) {
// alert('进入了哪里3')
return
} else {
// alert('进入了哪里2')
switch (error.response.status) {
// 401: 未登录
// 未登录则跳转登录页面,并携带当前页面的路径
// 在登录成功后返回当前页面,这一步需要在登录页操作。
case 401:
// Message.error('会话已失效,请重新登录')
// logout()
let errorResponse = sessionStorage.getItem('errorResponse')
console.log('进入401', errorResponse)
if (errorResponse == null || errorResponse === 'null') {
sessionStorage.setItem('errorResponse', '1')
MessageBox.confirm('会话已失效,请重新登录', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
logout()
})
.catch(() => {
MessageBox.message({
type: 'info',
message: '已取消',
})
})
(config) => {
if (config.url.includes('downloadTemplate')) {
config.headers.common['responseType'] = 'blob'
}
if (config.url.includes('live?port')) return config
// 分屏插件兼容配置
const screensBaseURL = sessionStorage.getItem('screens-baseURL')
if (config.url.indexOf(screensBaseURL) !== -1) {
delete config.headers.common['operateId']
if (config.url === screensBaseURL + '/login') {
const Authorization = sessionStorage.getItem('screens-Authorization')
config.headers.common['Authorization'] = Authorization
} else {
delete config.headers.common['Authorization']
const token = sessionStorage.getItem('screens-token')
config.headers.common['token'] = token
}
return config
}
break
// 403 token过期
// 登录过期对用户进行提示
// 清除本地token和清空vuex中token对象
// 跳转登录页面
case 403:
Message.error('登录过期,请重新登录')
logout()
break
// 404请求不存在
case 404:
Message.error('网络请求不存在')
break
case 500:
Message.error('服务器错误')
break
if (showLoadingConfig == '' || showLoadingConfig == undefined) {
// showFullScreenLoading()
}
return config
},
(error) => {
tryHideFullScreenLoading()
// Message.error('加载超时');
return Promise.reject(error)
}
return Promise.reject(error.response)
}
}
}
)
/**
* get方法对应get请求
* @param {String} url [请求的url地址]
* @param {Object} params [请求时携带的参数]
*/
function logout() {
store.commit('setUserInfo', null)
store.commit('setMapBackArr', [])
store.commit('setMoudle', null)
store.commit('setProDetail', null)
store.commit('setGroupTreeList', [])
store.commit('setSelectedGroupSn', null)
sessionStorage.clear()
sessionStorage.setItem('errorResponse', '1')
)
// 响应拦截器
axios.interceptors.response.use(
(response) => {
tryHideFullScreenLoading()
if (response.status === 200) {
return Promise.resolve(response)
} else {
// alert('进入了哪里444')
return Promise.reject(response)
}
},
// 服务器状态码不是2开头的的情况
// 这里可以跟你们的后台开发人员协商好统一的错误状态码
// 然后根据返回的状态码进行一些操作,例如登录过期提示,错误提示等等
// 下面列举几个常见的操作,其他需求可自行扩展
(error) => {
// tryHideFullScreenLoading()
if (error.response.status) {
console.log('----------', error.response)
let errorUrl = error.response.config.baseURL
console.log('-----------------', errorUrl)
let screensUrl = sessionStorage.getItem('screens-baseURL')
let json = {
name: '工作站',
id: 1,
url: '/projectV2/taskList',
menuList: [
{
id: 100000,
menuName: '任务清单',
path: '/projectV2/taskList',
},
{
id: 100001,
menuName: '通知公告',
path: '/projectV2/noticeList',
},
{
id: 100002,
menuName: '工作日程',
path: '/projectV2/workerSchedule',
},
],
}
this.$store.commit('setCurModule', json)
setTimeout(() => {
window.location.href = '/index.html#/login'
}, 1000)
const url = error.response.url
if (
errorUrl == screensUrl ||
url === '26938512:7zS9LX2X8u4tW4Ps0ZjN/login'
) {
// alert('进入了哪里3')
return
} else {
// alert('进入了哪里2')
switch (error.response.status) {
// 401: 未登录
// 未登录则跳转登录页面,并携带当前页面的路径
// 在登录成功后返回当前页面,这一步需要在登录页操作。
case 401:
// Message.error('会话已失效,请重新登录')
// logout()
let errorResponse = sessionStorage.getItem('errorResponse')
console.log('进入401', errorResponse)
if (errorResponse == null || errorResponse === 'null') {
sessionStorage.setItem('errorResponse', '1')
MessageBox.confirm('会话已失效,请重新登录', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
logout()
})
.catch(() => {
MessageBox.message({
type: 'info',
message: '已取消',
})
})
}
break
// 403 token过期
// 登录过期对用户进行提示
// 清除本地token和清空vuex中token对象
// 跳转登录页面
case 403:
Message.error('登录过期,请重新登录')
logout()
break
// 404请求不存在
case 404:
Message.error('网络请求不存在')
break
case 500:
Message.error('服务器错误')
break
}
return Promise.reject(error.response)
}
}
}
)
/**
* get方法对应get请求
* @param {String} url [请求的url地址]
* @param {Object} params [请求时携带的参数]
*/
function logout() {
store.commit('setUserInfo', null)
store.commit('setMapBackArr', [])
store.commit('setMoudle', null)
store.commit('setProDetail', null)
store.commit('setGroupTreeList', [])
store.commit('setSelectedGroupSn', null)
sessionStorage.clear()
sessionStorage.setItem('errorResponse', '1')
let json = {
name: '工作站',
id: 1,
url: '/projectV2/taskList',
menuList: [{
id: 100000,
menuName: '任务清单',
path: '/projectV2/taskList',
},
{
id: 100001,
menuName: '通知公告',
path: '/projectV2/noticeList',
},
{
id: 100002,
menuName: '工作日程',
path: '/projectV2/workerSchedule',
},
],
}
this.$store.commit('setCurModule', json)
setTimeout(() => {
window.location.href = '/index.html#/login'
}, 1000)
}
export function get(url, params, config) {
showLoadingConfig = config
url = url + '?lang=' + getLang()
return new Promise((resolve, reject) => {
axios
.get(url, {
params: params,
})
.then((res) => {
if (
res.config.url == '/xmgl/progressTask/downloadTemplate?lang=zh_CN'
) {
resolve(res.data)
return
}
if (res.data.code == 200) {
resolve(res.data)
} else {
Message.error(res.data.message)
}
})
.catch((err) => {
reject(err.data)
})
})
showLoadingConfig = config
url = url + '?lang=' + getLang()
return new Promise((resolve, reject) => {
axios
.get(url, {
params: params,
})
.then((res) => {
if (
res.config.url == '/xmgl/progressTask/downloadTemplate?lang=zh_CN'
) {
resolve(res.data)
return
}
if (res.data.code == 200) {
resolve(res.data)
} else {
Message.error(res.data.message)
}
})
.catch((err) => {
reject(err.data)
})
})
}
/**
@ -316,26 +315,26 @@ export function get(url, params, config) {
* @param {Object} params [请求时携带的参数]
*/
export function post(url, params, config) {
showLoadingConfig = config
url = url + '?lang=' + getLang()
return new Promise((resolve, reject) => {
axios
.post(url, params)
.then((res) => {
if (res.data.code == 200) {
resolve(res.data)
} else {
if (res.data.status !== 'SUCCESS') {
Message.error(res.data.message)
} else {
resolve(res.data)
}
}
})
.catch((err) => {
reject(err.data)
})
})
showLoadingConfig = config
url = url + '?lang=' + getLang()
return new Promise((resolve, reject) => {
axios
.post(url, params)
.then((res) => {
if (res.data.code == 200) {
resolve(res.data)
} else {
if (res.data.status !== 'SUCCESS') {
Message.error(res.data.message)
} else {
resolve(res.data)
}
}
})
.catch((err) => {
reject(err.data)
})
})
}
/**
* put方法对应put请求
@ -343,47 +342,47 @@ export function post(url, params, config) {
* @param {Object} params [请求时携带的参数]
*/
export function put(url, params, config) {
showLoadingConfig = config
url = url + '?lang=' + getLang()
return new Promise((resolve, reject) => {
axios
.put(url, params)
.then((res) => {
if (res.data.code == 200) {
resolve(res.data)
} else {
Message.error(res.data.message)
}
})
.catch((err) => {
reject(err.data)
})
})
showLoadingConfig = config
url = url + '?lang=' + getLang()
return new Promise((resolve, reject) => {
axios
.put(url, params)
.then((res) => {
if (res.data.code == 200) {
resolve(res.data)
} else {
Message.error(res.data.message)
}
})
.catch((err) => {
reject(err.data)
})
})
}
export function showFullScreenLoading() {
if (needLoadingRequestCount === 0) {
startLoading()
}
needLoadingRequestCount++
if (needLoadingRequestCount === 0) {
startLoading()
}
needLoadingRequestCount++
}
export function tryHideFullScreenLoading() {
if (needLoadingRequestCount <= 0) return
needLoadingRequestCount--
if (needLoadingRequestCount === 0) {
endLoading()
}
if (needLoadingRequestCount <= 0) return
needLoadingRequestCount--
if (needLoadingRequestCount === 0) {
endLoading()
}
}
function startLoading() {
loading = Loading.service({
lock: true,
text: '加载中...',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.5)',
})
loading = Loading.service({
lock: true,
text: '加载中...',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.5)',
})
}
function endLoading() {
loading.close()
}
loading.close()
}

View File

@ -0,0 +1,52 @@
.tables {
min-height: 550px;
width: 100%;
background-color: transparent;
max-height: calc(100% - 98px);
overflow: auto;
}
.tables.el-table td {
border-bottom: none;
}
.tables.el-table::before {
display: none;
}
.tables.el-table th {
padding: 8px 0;
}
.tables.el-table td {
height: 50px;
padding: 5px;
}
.tables.el-table tr:nth-child(2n-1) td {
background-color: #FBFBFB !important;
}
.tables .el-table__body tr.current-row > td {
background: rgba(0, 122, 255, 0.1);
}
.el-table {
background-color: transparent;
}
.tableBtns {
display: flex;
align-items: center;
justify-content: center;
}
.tableBtns .operationText {
display: inline-flex;
margin-right: 30px;
}
.tableBtns .operationText:last-child {
margin-right: 0;
}
.operation-style {
display: flex;
align-items: center;
justify-content: center;
}
.operation-style .operationText:not(:last-child) {
margin-right: 10px;
}
.el-table--enable-row-hover .el-table__body tr:hover > td {
background-color: rgba(85, 129, 255, 0.2) !important;
}

View File

@ -35,6 +35,7 @@
.tableBtns{
display: flex;
align-items: center;
justify-content: center;
.operationText{
display: inline-flex;
margin-right: 30px;

View File

@ -2,18 +2,23 @@
<div class="fullHeight">
<div class="fullHeight">
<div class="searchBox whiteBlock">
<el-form :inline="true" size="medium" :model="formInline" class="demo-form-inline">
<el-form
:inline="true"
size="medium"
:model="formInline"
class="demo-form-inline"
>
<el-form-item label="区域">
<el-select
ref="selectRef"
v-model="selectVal"
placeholder="请选择"
style="width: 100%;"
style="width: 100%"
size="medium"
clearable
@change="selectChange"
>
<el-option style="height:auto" :value="[]">
<el-option style="height: auto" :value="[]">
<el-tree
:data="areaList"
node-key="id"
@ -34,7 +39,7 @@
clearable
@change="selectEnterpriseChange"
>
<el-option style="height:auto" :value="[]">
<el-option style="height: auto" :value="[]">
<el-tree
:data="treeList"
node-key="enterpriseId"
@ -53,7 +58,10 @@
</el-select>
</el-form-item> -->
<el-form-item :label="$t('message.sixComplete.fence.devNo')">
<el-input v-model="formInline.hardwareId" :placeholder="$t('message.sixComplete.fence.placeholder')"></el-input>
<el-input
v-model="formInline.hardwareId"
:placeholder="$t('message.sixComplete.fence.placeholder')"
></el-input>
</el-form-item>
<el-form-item :label="$t('message.sixComplete.happenTime')">
<el-date-picker
@ -68,8 +76,19 @@
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button v-permission="{key: 'dealPush_query', menuPath: '/project/aiAnalysis/dealPushManage'}" type="primary" @click="getList(1)" plain>{{ $t('message.sixComplete.query') }}</el-button>
<el-button type="warning" @click="refresh" plain>{{ $t('message.sixComplete.fresh') }}</el-button>
<el-button
v-permission="{
key: 'dealPush_query',
menuPath: '/project/aiAnalysis/dealPushManage',
}"
type="primary"
@click="getList(1)"
plain
>{{ $t("message.sixComplete.query") }}</el-button
>
<el-button type="warning" @click="refresh" plain>{{
$t("message.sixComplete.fresh")
}}</el-button>
</el-form-item>
</el-form>
<!-- <el-button type="primary" size="medium" @click="addFn"
@ -103,25 +122,54 @@
</div>
<!-- 来源 -->
<!-- @click="openDialogDetail(item)" -->
<div class="title">
<!-- {{ $t('message.sixComplete.carDense.from') + ':' }}{{ item.alarmDesc }} -->
<el-tooltip
class="item"
effect="dark"
:content="item.alarmDesc"
placement="top-start"
<div style="display: flex">
<div class="title">
<!-- {{ $t('message.sixComplete.carDense.from') + ':' }}{{ item.alarmDesc }} -->
<el-tooltip
class="item"
effect="dark"
:content="item.alarmDesc"
placement="top-start"
>
<span
>{{ $t("message.sixComplete.carDense.from") + ":"
}}{{ item.alarmDesc }}</span
>
</el-tooltip>
</div>
<div
style="
display: flex;
align-items: center;
justify-content: center;
flex: 1;
"
>
<span>{{ $t('message.sixComplete.carDense.from') + ':' }}{{ item.alarmDesc }}</span>
</el-tooltip>
</div>
<!-- 去处置 -->
<div v-permission="{key: 'dealPush_push', menuPath: '/project/aiAnalysis/dealPushManage'}" class="toDisposeOf pushBtn" @click="pushAlarm(item)">
<el-button type="primary" size="small">违章推送</el-button>
</div>
<!-- 去处置 -->
<div v-permission="{key: 'dealPush_delete', menuPath: '/project/aiAnalysis/dealPushManage'}" class="toDisposeOf alarmDeleteBtn" @click="deleteDev(item)">
<el-button type="danger" size="small">误报删除</el-button>
<!-- 去处置 -->
<div
v-permission="{
key: 'dealPush_push',
menuPath: '/project/aiAnalysis/dealPushManage',
}"
class="toDisposeOf pushBtn"
@click="pushAlarm(item)"
>
<el-button type="primary" size="small">违章推送</el-button>
</div>
<!-- 去处置 -->
<div
v-permission="{
key: 'dealPush_delete',
menuPath: '/project/aiAnalysis/dealPushManage',
}"
class="toDisposeOf alarmDeleteBtn"
@click="deleteDev(item)"
>
<el-button type="danger" size="small">误报删除</el-button>
</div>
</div>
</div>
<!-- <div @click.stop="deleteBefore(item)" class="deleteBtn">
<img src="@/assets/images/icon-delete.png" width="15px" height="15px"/>
</div> -->
@ -131,7 +179,7 @@
</div>
<div class="placeholderBox" v-if="workerList.length == 0">
<img src="@/assets/images/noData.png" alt="" />
<p>{{ $t('message.sixComplete.carDense.noWarn') }}</p>
<p>{{ $t("message.sixComplete.carDense.noWarn") }}</p>
</div>
<!-- <el-table class="tables" :data="workerList">
<el-table-column
@ -173,9 +221,22 @@
</div>
</div>
<!-- 处置记录弹框-->
<el-dialog :modal-append-to-body="false" @close="close" title="处置详情" :visible.sync="recordShow" width="667px">
<el-dialog
:modal-append-to-body="false"
@close="close"
title="处置详情"
:visible.sync="recordShow"
width="667px"
>
<div class="dialog_content">
<el-form size="medium" ref="addEditForm" :model="addEditForm" :rules="addEditRules" label-width="120px" class="dialogFormBox">
<el-form
size="medium"
ref="addEditForm"
:model="addEditForm"
:rules="addEditRules"
label-width="120px"
class="dialogFormBox"
>
<!-- <el-form-item label="处置结果" prop="handleResult">
<el-radio :disabled="isDetail" v-model="addEditForm.handleResult" :label="1">已处置</el-radio>
<el-radio :disabled="isDetail" v-model="addEditForm.handleResult" :label="2">误报忽略</el-radio>
@ -189,17 +250,56 @@
:placeholder="'请输入'"
></el-input>
</el-form-item> -->
<el-form-item label="选择违章人员" prop="workerInfoList" v-if="addEditForm.handleResult != 2">
<el-select :disabled="isDetail" filterable multiple v-model="selectList" placeholder="请选择" clearable @change="dutySelectChange">
<el-option v-for="(item, index) in workerListOptions" :key="index" :label="item.workerName" :value="item.id"> </el-option>
<el-form-item
label="选择违章人员"
prop="workerInfoList"
v-if="addEditForm.handleResult != 2"
>
<el-select
:disabled="isDetail"
filterable
multiple
v-model="selectList"
placeholder="请选择"
clearable
@change="dutySelectChange"
>
<el-option
v-for="(item, index) in workerListOptions"
:key="index"
:label="item.workerName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="扣分" prop="deductScore" v-if="addEditForm.handleResult != 2">
<el-input-number v-model="addEditForm.deductScore" :min="0" :max="100" :placeholder="'请输入'"></el-input-number>
<el-form-item
label="扣分"
prop="deductScore"
v-if="addEditForm.handleResult != 2"
>
<el-input-number
v-model="addEditForm.deductScore"
:min="0"
:max="100"
:placeholder="'请输入'"
></el-input-number>
</el-form-item>
<div class="dialog-footer" v-if="!isDetail">
<el-button class="cancleBtn" icon="el-icon-circle-close" size="medium" @click="recordShow = false">取消 </el-button>
<el-button @click="addBtn" type="primary" icon="el-icon-circle-check" size="medium">确定 </el-button>
<el-button
class="cancleBtn"
icon="el-icon-circle-close"
size="medium"
@click="recordShow = false"
>取消
</el-button>
<el-button
@click="addBtn"
type="primary"
icon="el-icon-circle-check"
size="medium"
>确定
</el-button>
</div>
</el-form>
</div>
@ -210,24 +310,25 @@
import {
aiAnalyseHardWareAlarmRecordApi,
aiAnalyseHardWareAlarmRecordEdit,
getViolatorList
} from '@/assets/js/api/equipmentCenter/electricBox'
getViolatorList,
} from "@/assets/js/api/equipmentCenter/electricBox";
import {
getAlarmDealPageApi,
violationPushDataApi,
PositiveDeletionDataApi
} from '@/assets/js/api/electricBox'
import { getDictionaryItemApi } from '@/assets/js/api/companyDiagram.js'
import { getWorkerInfoList, selectHierarchyEnterpriseListApi } from '@/assets/js/api/laborPerson.js'
PositiveDeletionDataApi,
} from "@/assets/js/api/electricBox";
import { getDictionaryItemApi } from "@/assets/js/api/companyDiagram.js";
import {
getQualityRegionListApi
} from '@/assets/js/api/quality.js'
getWorkerInfoList,
selectHierarchyEnterpriseListApi,
} from "@/assets/js/api/laborPerson.js";
import { getQualityRegionListApi } from "@/assets/js/api/quality.js";
export default {
data() {
return {
handleResultStatus: [
{name: '未处置', value: false},
{name: '已处置', value: true}
{ name: "未处置", value: false },
{ name: "已处置", value: true },
],
//
defaultProps: {
@ -245,78 +346,75 @@ export default {
selectVal: "",
selectEnterpriseVal: "",
isDetail: false,
pageType: 'list',
pageType: "list",
workerList: [],
pageInfo: {
pageNo: 1, //
pageSize: 10, //
total: 0 //
total: 0, //
},
itemId: '',
itemId: "",
formInline: {
alarmType: '',
alarmType: "",
handleDone: "",
endTime: '',
startTime: '',
hardwareId: '',
qualityRegionId: '',
enterpriseId: ''
endTime: "",
startTime: "",
hardwareId: "",
qualityRegionId: "",
enterpriseId: "",
},
dateRangeArr: [],
alarmTypeArrList: [],
recordShow: false,
addEditForm: {
workerInfoList: [],
handleResult: '',
dutyId: '',
desc: '',
deductScore: 0
handleResult: "",
dutyId: "",
desc: "",
deductScore: 0,
},
addEditRules: {
dutyId: [
{
required: true,
message: '请选择',
trigger: 'change'
}
message: "请选择",
trigger: "change",
},
],
handleResult: [
{
required: true,
message: '必填',
trigger: 'blur'
}
]
message: "必填",
trigger: "blur",
},
],
},
workerListOptions: [],
selectList: []
}
selectList: [],
};
},
mounted() {
this.selectNowDate()
this.getList()
this.getDictionaryList()
this.getDutyPerson()
this.selectNowDate();
this.getList();
this.getDictionaryList();
this.getDutyPerson();
this.getPositionList();
this.getTreeList();
},
methods: {
pushAlarm(obj) {
console.log("删除", obj);
this.$confirm("确定进行此操作吗?",
this.$confirm(
"确定进行此操作吗?",
this.$t("message.personnelPosition.beaconManage.table.Tips"),
{
confirmButtonText: this.$t(
"message.personnelPosition.confirmButtonText"
),
cancelButtonText: this.$t(
"message.personnelPosition.cancelButtonText"
),
type: "warning"
confirmButtonText: this.$t("message.personnelPosition.confirmButtonText"),
cancelButtonText: this.$t("message.personnelPosition.cancelButtonText"),
type: "warning",
}
)
.then(() => {
violationPushDataApi({ id: obj.id }).then(result => {
violationPushDataApi({ id: obj.id }).then((result) => {
if (result.success) {
this.$message.success(result.message);
this.getList();
@ -327,20 +425,17 @@ export default {
},
deleteDev(obj) {
console.log("删除", obj);
this.$confirm("确定进行此操作吗?",
this.$confirm(
"确定进行此操作吗?",
this.$t("message.personnelPosition.beaconManage.table.Tips"),
{
confirmButtonText: this.$t(
"message.personnelPosition.confirmButtonText"
),
cancelButtonText: this.$t(
"message.personnelPosition.cancelButtonText"
),
type: "warning"
confirmButtonText: this.$t("message.personnelPosition.confirmButtonText"),
cancelButtonText: this.$t("message.personnelPosition.cancelButtonText"),
type: "warning",
}
)
.then(() => {
PositiveDeletionDataApi({ id: obj.id }).then(result => {
PositiveDeletionDataApi({ id: obj.id }).then((result) => {
if (result.success) {
this.$message.success(result.message);
this.getList();
@ -372,15 +467,15 @@ export default {
///
getPositionList() {
let data = {
projectSn: this.$store.state.projectSn
}
projectSn: this.$store.state.projectSn,
};
getQualityRegionListApi(data).then((res) => {
console.log('res=================', res);
console.log("res=================", res);
if (res.code == 200) {
this.areaList = res.result
console.log(this.areaList,135456)
this.areaList = res.result;
console.log(this.areaList, 135456);
}
})
});
},
selectChange(val) {
console.log(val, 123);
@ -390,7 +485,7 @@ export default {
this.formInline.qualityRegionId = "";
}
},
selectEnterpriseChange(val){
selectEnterpriseChange(val) {
console.log(val, 123);
if (!val) {
this.selectEnterpriseVal = "";
@ -413,102 +508,102 @@ export default {
dutySelectChange(e) {
// const item = this.dutyList.find(item => item.userId === e)
// this.addEditForm.dutyUserName = item.realName
const newArray = e.map(item => ({ id: item }))
this.addEditForm.workerInfoList = newArray
console.log('下拉选择', newArray)
const newArray = e.map((item) => ({ id: item }));
this.addEditForm.workerInfoList = newArray;
console.log("下拉选择", newArray);
},
close() {
this.addEditForm = {}
this.selectList = []
this.isDetail = false
this.addEditForm = {};
this.selectList = [];
this.isDetail = false;
this.$nextTick(() => {
this.$refs.addEditForm.clearValidate()
})
this.$refs.addEditForm.clearValidate();
});
},
//
getPersonDetail(itemId) {
let data = {
projectSn: this.$store.state.projectSn,
aiAnalyseHardWareAlarmRecordId: itemId
}
getViolatorList(data).then(res => {
aiAnalyseHardWareAlarmRecordId: itemId,
};
getViolatorList(data).then((res) => {
if (res.code == 200) {
this.selectList = res.result.map(items => items.id)
console.log('回显选择人员', this.selectList)
this.selectList = res.result.map((items) => items.id);
console.log("回显选择人员", this.selectList);
} else {
this.$message.error(res.message)
this.$message.error(res.message);
}
})
});
},
//
getDutyPerson() {
let data = {
projectSn: this.$store.state.projectSn,
isFilterQualityRegionEnterprise: 1
}
getWorkerInfoList(data).then(res => {
isFilterQualityRegionEnterprise: 1,
};
getWorkerInfoList(data).then((res) => {
if (res.code == 200) {
this.workerListOptions = res.result.records
console.log('获取施工人员下拉', this.workerListOptions)
this.workerListOptions = res.result.records;
console.log("获取施工人员下拉", this.workerListOptions);
} else {
this.$message.error(res.message)
this.$message.error(res.message);
}
})
});
},
//
openDialog(item) {
this.recordShow = true
this.addEditForm = JSON.parse(JSON.stringify(item))
this.getPersonDetail(item.id)
console.log('打开处置弹窗', item)
this.recordShow = true;
this.addEditForm = JSON.parse(JSON.stringify(item));
this.getPersonDetail(item.id);
console.log("打开处置弹窗", item);
},
//
openDialogDetail(item) {
this.recordShow = true
this.isDetail = true
this.addEditForm = JSON.parse(JSON.stringify(item))
this.getPersonDetail(item.id)
console.log('打开处置弹窗', item)
this.recordShow = true;
this.isDetail = true;
this.addEditForm = JSON.parse(JSON.stringify(item));
this.getPersonDetail(item.id);
console.log("打开处置弹窗", item);
},
//
addBtn() {
let params = JSON.parse(JSON.stringify(this.addEditForm))
params.projectSn = this.$store.state.projectSn
if(this.addEditForm.handleResult == 1){
let params = JSON.parse(JSON.stringify(this.addEditForm));
params.projectSn = this.$store.state.projectSn;
if (this.addEditForm.handleResult == 1) {
params.handleDone = true;
}
this.$refs.addEditForm.validate(valid => {
this.$refs.addEditForm.validate((valid) => {
if (valid) {
console.log('保存', params)
aiAnalyseHardWareAlarmRecordEdit(params).then(result => {
console.log("保存", params);
aiAnalyseHardWareAlarmRecordEdit(params).then((result) => {
if (result.success) {
this.$message.success(result.message)
this.getList()
this.recordShow = false
this.$message.success(result.message);
this.getList();
this.recordShow = false;
}
})
});
} else {
return false
return false;
}
})
});
},
//
getDictionaryList() {
getDictionaryItemApi({
dictionaryEncoding: 'ai_analyse_hard_ware_alarm_record_type',
projectSn: this.$store.state.projectSn
}).then(res => {
dictionaryEncoding: "ai_analyse_hard_ware_alarm_record_type",
projectSn: this.$store.state.projectSn,
}).then((res) => {
if (res.result.length > 0) {
console.log('获取字典施工阶段', res.result)
this.alarmTypeArrList = res.result
console.log("获取字典施工阶段", res.result);
this.alarmTypeArrList = res.result;
}
})
});
},
// YYYY-MM-DD HH:mm:ss
selectNowDate() {
@ -518,47 +613,47 @@ export default {
day = date.getDate(),
hours = date.getHours(), //(0-23)
minutes = date.getMinutes(), //(0-59)
seconds = date.getSeconds()
month >= 1 && month <= 9 ? (month = '0' + month) : ''
day >= 0 && day <= 9 ? (day = '0' + day) : ''
hours >= 0 && hours <= 9 ? (hours = '0' + hours) : ''
minutes >= 0 && minutes <= 9 ? (minutes = '0' + minutes) : ''
seconds >= 0 && seconds <= 9 ? (seconds = '0' + seconds) : ''
seconds = date.getSeconds();
month >= 1 && month <= 9 ? (month = "0" + month) : "";
day >= 0 && day <= 9 ? (day = "0" + day) : "";
hours >= 0 && hours <= 9 ? (hours = "0" + hours) : "";
minutes >= 0 && minutes <= 9 ? (minutes = "0" + minutes) : "";
seconds >= 0 && seconds <= 9 ? (seconds = "0" + seconds) : "";
// var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds //
var timer = year + '-' + month + '-' + day + ' ' + '23:59:59'
var timer2 = year + '-' + month + '-' + day + ' ' + '00:00:00'
this.dateRangeArr = [timer2, timer]
this.formInline.startTime = this.dateRangeArr[0]
this.formInline.endTime = this.dateRangeArr[1]
console.log(timer)
var timer = year + "-" + month + "-" + day + " " + "23:59:59";
var timer2 = year + "-" + month + "-" + day + " " + "00:00:00";
this.dateRangeArr = [timer2, timer];
this.formInline.startTime = this.dateRangeArr[0];
this.formInline.endTime = this.dateRangeArr[1];
console.log(timer);
// return timer;
},
getTypeName(val) {
let text = ''
this.alarmTypeArrList.forEach(item => {
let text = "";
this.alarmTypeArrList.forEach((item) => {
if (item.data == val) {
text = item.name
text = item.name;
}
})
return text
});
return text;
},
changeTime() {
if (this.dateRangeArr) {
this.formInline.startTime = this.dateRangeArr[0]
this.formInline.endTime = this.dateRangeArr[1]
this.formInline.startTime = this.dateRangeArr[0];
this.formInline.endTime = this.dateRangeArr[1];
} else {
this.formInline.startTime = ''
this.formInline.endTime = ''
this.formInline.startTime = "";
this.formInline.endTime = "";
}
},
refresh() {
this.pageInfo.pageNo = 1
this.formInline.hardwareId = ''
this.formInline.startTime = ''
this.formInline.endTime = ''
this.formInline.alarmType = ''
this.formInline.handleDone = ""
this.dateRangeArr = []
this.pageInfo.pageNo = 1;
this.formInline.hardwareId = "";
this.formInline.startTime = "";
this.formInline.endTime = "";
this.formInline.alarmType = "";
this.formInline.handleDone = "";
this.dateRangeArr = [];
//
this.selectVal = "";
this.areaSelectVal = "";
@ -566,69 +661,73 @@ export default {
//
this.selectEnterpriseVal = "";
this.formInline.enterpriseId = "";
this.getList()
this.getList();
},
getList(val) {
if (val == 1) {
this.pageInfo.pageNo = 1
this.pageInfo.pageNo = 1;
}
let json = Object.assign(this.pageInfo, this.formInline)
json.projectSn = this.$store.state.projectSn
let json = Object.assign(this.pageInfo, this.formInline);
json.projectSn = this.$store.state.projectSn;
json.isPushed = 0;
getAlarmDealPageApi(json).then(res => {
this.workerList = res.result.records
this.pageInfo.total = res.result.total
getAlarmDealPageApi(json).then((res) => {
this.workerList = res.result.records;
this.pageInfo.total = res.result.total;
setTimeout(() => {
this.$previewRefresh()
}, 100)
})
this.$previewRefresh();
}, 100);
});
},
goBack() {
this.pageType = 'list'
this.getList()
this.pageType = "list";
this.getList();
},
// addFn() {
// this.itemId = "";
// this.pageType = "add";
// },
editBefore(item) {
this.itemId = item.id
this.pageType = 'detail'
this.itemId = item.id;
this.pageType = "detail";
},
deleteBefore(item) {
this.$confirm(this.$t('message.sixComplete.carWash.tipText') + '?', this.$t('message.sixComplete.carWash.tip'), {
confirmButtonText: this.$t('message.sixComplete.carWash.confirm'),
cancelButtonText: this.$t('message.sixComplete.carWash.cancel'),
type: 'warning'
})
this.$confirm(
this.$t("message.sixComplete.carWash.tipText") + "?",
this.$t("message.sixComplete.carWash.tip"),
{
confirmButtonText: this.$t("message.sixComplete.carWash.confirm"),
cancelButtonText: this.$t("message.sixComplete.carWash.cancel"),
type: "warning",
}
)
.then(() => {
workerSafeEducationDeleteApi({ id: item.id }).then(res => {
workerSafeEducationDeleteApi({ id: item.id }).then((res) => {
this.$message({
type: 'success',
message: this.$t('message.sixComplete.carWash.deleteSuccess') + '!'
})
this.getList()
})
type: "success",
message: this.$t("message.sixComplete.carWash.deleteSuccess") + "!",
});
this.getList();
});
})
.catch(() => {
this.$message({
type: 'info',
message: this.$t('message.sixComplete.carWash.cancelDelete')
})
})
type: "info",
message: this.$t("message.sixComplete.carWash.cancelDelete"),
});
});
},
SizeChange(val) {
console.log(val)
this.pageInfo.pageSize = val
this.getList()
console.log(val);
this.pageInfo.pageSize = val;
this.getList();
},
CurrentChange(val) {
console.log(val)
this.pageInfo.pageNo = val
this.getList()
}
}
}
console.log(val);
this.pageInfo.pageNo = val;
this.getList();
},
},
};
</script>
<style lang="less" scoped>
.backText {
@ -674,7 +773,7 @@ export default {
display: flex;
justify-content: space-between;
}
.status-style{
.status-style {
position: absolute;
top: 0px;
left: 0px;
@ -687,11 +786,11 @@ export default {
z-index: 10;
font-size: 14px;
}
.result-style{
background-color: #DA4846;
.result-style {
background-color: #da4846;
}
.no-result-style{
background-color: #5B82EE;
.no-result-style {
background-color: #5b82ee;
}
}
.title {
@ -728,13 +827,13 @@ export default {
color: #fff;
font-size: 12px;
cursor: pointer;
position: absolute;
// position: absolute;
}
.pushBtn{
.pushBtn {
right: 27%;
bottom: 4%;
}
.alarmDeleteBtn{
.alarmDeleteBtn {
right: 2%;
bottom: 4%;
}
@ -746,10 +845,12 @@ export default {
bottom: 4%;
}
//
/deep/.el-select-dropdown__item.hover,.el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
/deep/.el-select-dropdown__item.hover,
.el-select-dropdown__item.hover,
.el-select-dropdown__item:hover {
background-color: transparent;
}
.searchBox .el-form-item {
margin: 5px 15px 0px 0;
margin: 5px 15px 0px 0;
}
</style>

View File

@ -50,7 +50,8 @@
<el-table-column prop="roleDesc" :label="$t('message.roleManage.miaoshu')" align="center"></el-table-column >
<el-table-column :label="$t('message.alarmValueSet.operation')" align="center">
<template slot-scope="scope">
<div class="tableBtns" style="margin-left: 120px !important">
<!-- style="margin-left: 120px !important" -->
<div class="tableBtns" >
<div v-permission="{key: 'roleManage_edit', menuPath: '/project/configManage/roleManage'}" @click="edit(scope.row)" class="operationText">
<img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
<span>{{ $t("message.alarmValueSet.edit") }}</span>

View File

@ -80,12 +80,13 @@
<template slot-scope="scope">
<div class="tableBtns">
<el-button
v-permission="{key: 'pjzx_detail', menuPath: '/project/labor/assessmentCentent'}"
type="text"
class="operationText"
@click="detailInfoBtn(scope.row)"
>{{ $t('message.laborMange.details') }}</el-button
>
<div class="operationText" @click="editInfoBtn(scope.row)">
<div v-permission="{key: 'pjzx_edit', menuPath: '/project/labor/assessmentCentent'}" class="operationText" @click="editInfoBtn(scope.row)">
<img
src="@/assets/images/icon-edit.png"
width="15px"
@ -93,7 +94,7 @@
/>
<span>{{ $t('message.laborMange.edit') }}</span>
</div>
<div class="operationText" @click="deleteInfoBtn(scope.row)">
<div v-permission="{key: 'pjzx_delete', menuPath: '/project/labor/assessmentCentent'}" class="operationText" @click="deleteInfoBtn(scope.row)">
<img
src="@/assets/images/icon-delete.png"
width="15px"
@ -157,7 +158,7 @@
></el-input>
</el-form-item>
<el-form-item>
<el-button v-permission="{key: 'query', menuPath: '/project/labor/assessmentCentent'}" type="primary" @click="onSubmit" plain>{{
<el-button v-permission="{key: 'pjzx_query', menuPath: '/project/labor/assessmentCentent'}" type="primary" @click="onSubmit" plain>{{
$t('message.laborMange.inquire')
}}</el-button>
<el-button v-permission="{key: 'pjzx_add_blp', menuPath: '/project/labor/assessmentCentent'}" type="primary" @click="addInfoBtn" plain>{{
@ -225,6 +226,7 @@
<template slot-scope="scope">
<div class="tableBtns">
<el-button
v-permission="{key: 'pjzx_detail', menuPath: '/project/labor/assessmentCentent'}"
type="text"
class="operationText"
@click="detailInfoBtn(scope.row)"

View File

@ -79,8 +79,9 @@
</el-table-column>
<el-table-column align="center" label="操作">
<template slot-scope="scope">
<div class="tableBtns" style="margin-left: 35px;">
<div class="operationText" @click="detailBtn(scope.row)">
<!-- style="margin-left: 35px;" -->
<div class="tableBtns" >
<div v-permission="{key: 'penalize_detail', menuPath: '/project/labor/penalize'}" class="operationText" @click="detailBtn(scope.row)">
<img
src="@/assets/images/xm_num.png"
width="15px"

View File

@ -51,7 +51,7 @@
<p class="pageTitle">
承包商列表
</p>
<vue-scroll style="height: calc(100% - 30px)" v-if="level1CompanyData.length > 0">
<vue-scroll v-if="level1CompanyData.length > 0">
<el-tree
:data="level1CompanyData"
:props="defaultProps"
@ -136,7 +136,7 @@
>刷新</el-button
> -->
<el-button
v-permission="{key: 'jdsp_add', menuPath: '/project/progressManagementAg/lcbManage'}"
v-permission="{key: 'lcbManage_add', menuPath: '/project/progressManagementAg/lcbManage'}"
class="expintBtn"
size="medium"
type="primary"
@ -201,7 +201,7 @@
<el-table-column width="300" label="操作" align="center">
<template slot-scope="scope">
<el-button
v-permission="{key: 'jdsp_edit', menuPath: '/project/progressManagementAg/lcbManage'}"
v-permission="{key: 'lcbManage_edit', menuPath: '/project/progressManagementAg/lcbManage'}"
size="mini"
type="text"
icon="el-icon-edit"
@ -210,7 +210,7 @@
编辑
</el-button>
<el-button
v-permission="{key: 'jdsp_delete', menuPath: '/project/progressManagementAg/lcbManage'}"
v-permission="{key: 'lcbManage_delete', menuPath: '/project/progressManagementAg/lcbManage'}"
size="mini"
type="text"
class="delete-btn"
@ -1121,7 +1121,7 @@ export default {
display: flex;
flex-direction: column;
.treeBox {
height: 87%;
flex: 1;
background-color: rgba(216, 216, 216, 0.2);
padding-top: 10px;
margin-top: 20px;

View File

@ -145,7 +145,7 @@
<el-table-column align="center" label="操作" width="280">
<template slot-scope="scope">
<div class="tableBtns">
<div v-permission="{key: 'jdsp_pass', menuPath: '/project/progressManagementAg/progressApproval'}" @click="pass(scope.row)" class="operationText" v-if="![2,3].includes(scope.row.auditType)">
<div v-permission="{key: 'jdsp_edit', menuPath: '/project/progressManagementAg/progressApproval'}" @click="pass(scope.row)" class="operationText" v-if="![2,3].includes(scope.row.auditType)">
<img
src="@/assets/images/tableIcon/passIcon.png"
width="15px"
@ -153,7 +153,7 @@
/>
<span style="white-space: nowrap;color: #5678E8;">通过</span>
</div>
<div v-permission="{key: 'jdsp_reject', menuPath: '/project/progressManagementAg/progressApproval'}" @click="openBackDialog(scope.row)" class="operationText" v-if="![2,3].includes(scope.row.auditType)">
<div v-permission="{key: 'jdsp_edit', menuPath: '/project/progressManagementAg/progressApproval'}" @click="openBackDialog(scope.row)" class="operationText" v-if="![2,3].includes(scope.row.auditType)">
<img
src="@/assets/images/tableIcon/backApply.png"
width="15px"

View File

@ -53,8 +53,9 @@
{{ $t('message.quality.click')
}}{{ $t('message.quality.startUsing') }}
</el-button>
<!-- v-permission="{key: 'criterion_stop', menuPath: '/project/safeSame/criterion'}" -->
<el-button
v-else
v-if="data.recordStatus != 1"
type="text"
size="mini"
@click.stop="() => singleEditState(node, data, 1)"

View File

@ -320,6 +320,7 @@
<template slot-scope="scope">
<div class="tableBtns" style="justify-content: center">
<div
v-permission="{key: 'inspectionLedger_detail', menuPath: '/project/safeSame/inspectionLedger'}"
@click="newShowDatadetails(scope.row, scope.$index)"
class="operationText last"
>
@ -2081,7 +2082,6 @@
</div>
<div class="btn-box" v-if="statusCondition(detailData)">
<el-button
v-permission="{key: 'inspectionLedger_edit', menuPath: '/project/safeSame/inspectionLedger'}"
v-if="detailData.status == 3 || detailData.status == 4"
size="medium"
type="danger"
@ -2094,9 +2094,8 @@
@click="dialogDetil = false"
>取消</el-button
>
<!-- v-permission="{key: 'inspectionLedger_edit', menuPath: '/project/safeSame/inspectionLedger'}" -->
<el-button
v-permission="{key: 'inspectionLedger_edit', menuPath: '/project/safeSame/inspectionLedger'}"
v-if="detailData.status == 3 || detailData.status == 4"
size="medium"
type="primary"

View File

@ -921,7 +921,6 @@
</div>
<div class="btn-box">
<el-button
v-permission="{key: 'inspectionLedger_edit', menuPath: '/project/safeSame/recordsCenter'}"
v-if="detailData.status == 3 || detailData.status == 4"
size="medium"
type="danger"
@ -934,9 +933,8 @@
@click="dialogDetil = false"
>取消</el-button
>
<!-- v-permission="{key: 'inspectionLedger_edit', menuPath: '/project/safeSame/recordsCenter'}" -->
<el-button
v-permission="{key: 'inspectionLedger_edit', menuPath: '/project/safeSame/recordsCenter'}"
v-if="detailData.status == 3 || detailData.status == 4"
size="medium"
type="primary"