admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/assets/js/http.js
View File

@ -6,8 +6,8 @@ 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 = ''
@ -84,9 +84,9 @@ if (process.env.NODE_ENV == 'development') {
// 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://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/' //嘉兴王江泾公用码头
@ -157,8 +157,8 @@ axios.interceptors.request.use(
// Message.error('加载超时');
return Promise.reject(error)
}
)
// 响应拦截器
)
// 响应拦截器
axios.interceptors.response.use(
(response) => {
tryHideFullScreenLoading()
@ -240,8 +240,8 @@ axios.interceptors.response.use(
}
}
}
)
/**
)
/**
* get方法，对应get请求
* @param {String} url [请求的url地址]
* @param {Object} params [请求时携带的参数]
@ -260,8 +260,7 @@ function logout() {
name: '工作站',
id: 1,
url: '/projectV2/taskList',
menuList: [
{
menuList: [{
id: 100000,
menuName: '任务清单',
path: '/projectV2/taskList',

52
src/assets/style/table.css Normal file
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;
}

1
src/assets/style/table.less
View File

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

511
src/views/projectFront/aiAnalysis/dealPushManage.vue
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,6 +122,7 @@
</div>
<!-- 来源 -->
<!-- @click="openDialogDetail(item)" -->
<div style="display: flex">
<div class="title">
<!-- {{ $t('message.sixComplete.carDense.from') + ':' }}{{ item.alarmDesc }} -->
<el-tooltip
@ -111,17 +131,45 @@
:content="item.alarmDesc"
placement="top-start"
>
<span>{{ $t('message.sixComplete.carDense.from') + ':' }}{{ item.alarmDesc }}</span>
<span
>{{ $t("message.sixComplete.carDense.from") + ":"
}}{{ item.alarmDesc }}</span
>
</el-tooltip>
</div>
<div
style="
display: flex;
align-items: center;
justify-content: center;
flex: 1;
"
>
<!-- 去处置 -->
<div v-permission="{key: 'dealPush_push', menuPath: '/project/aiAnalysis/dealPushManage'}" class="toDisposeOf pushBtn" @click="pushAlarm(item)">
<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)">
<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,7 +845,9 @@ 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 {

3
src/views/projectFront/configManage/roleManage.vue
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>

8
src/views/projectFront/laborManage/assessmentCentent.vue
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)"

5
src/views/projectFront/laborManage/penalize.vue
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"

10
src/views/projectFront/progressManagementAg/lcbManage.vue
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;

4
src/views/projectFront/progressManagementAg/progressApproval.vue
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"

3
src/views/projectFront/safeSame/criterionModule/qualityProblemBank.vue
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)"

5
src/views/projectFront/safeSame/inspectionLedger.vue
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"

4
src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue
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"