fix: BUG修改
This commit is contained in:
parent
398989a331
commit
0b3cd8bd42
@ -157,7 +157,7 @@
|
||||
|
||||
<el-table-column
|
||||
:label="$t('message.deviceManage.operation')"
|
||||
align="center" width="160px"
|
||||
align="center" width="280px"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<div class="tableBtns">
|
||||
@ -165,6 +165,14 @@
|
||||
</div>
|
||||
<div @click="bao(scope.row)" class="operationText"><img src="@/assets/images/bao.png" alt="">{{$t('message.alarmValueSet.bjz')}}
|
||||
</div>-->
|
||||
<!-- <div @click="showDetail(scope.row.id)" class="operationText">
|
||||
<img
|
||||
src="@/assets/images/tableIcon/showReply.png"
|
||||
width="15px"
|
||||
height="15px"
|
||||
/>
|
||||
<span>下发详情</span>
|
||||
</div> -->
|
||||
<div v-permission="{key: 'clgl_edit', menuPath: '/project/carManage/carManage'}" @click="edit(scope.row)" class="operationText">
|
||||
<img
|
||||
src="@/assets/images/icon-edit.png"
|
||||
@ -487,6 +495,83 @@
|
||||
</el-form>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<!-- 下发详情 -->
|
||||
<el-dialog
|
||||
:modal-append-to-body="false"
|
||||
title="下发详情"
|
||||
:close-on-click-modal="false"
|
||||
:visible.sync="issueTeamDialog"
|
||||
width="740px"
|
||||
>
|
||||
<div class="dialog_content">
|
||||
<div class="table_wrap whiteBlock">
|
||||
<el-table class="tables" :data="issuePointList">
|
||||
<el-table-column
|
||||
type="index"
|
||||
width="50"
|
||||
align="center"
|
||||
:label="$t('message.personnelPosition.beaconManage.table.index')"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="detail"
|
||||
label="任务名称"
|
||||
align="center"
|
||||
></el-table-column>
|
||||
<el-table-column prop="isSuccess" label="执行结果" align="center">
|
||||
<template v-slot="{ row }">{{
|
||||
row.isSuccess === 1 ? "成功" : "失败"
|
||||
}}</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
:label="
|
||||
$t('message.personnelPosition.beaconManage.table.operation')
|
||||
"
|
||||
align="center"
|
||||
width="150"
|
||||
>
|
||||
<template v-slot="{ row }">
|
||||
<div
|
||||
class="operationText"
|
||||
@click="retryEvent(row.id)"
|
||||
v-if="row.isSuccess === 0"
|
||||
>
|
||||
<span style="color: #5381f6">重试</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <div slot="empty">{{$t('message.personnelPosition.empty')}}</div> -->
|
||||
</el-table>
|
||||
<!-- <el-pagination
|
||||
class="pagerBox"
|
||||
@size-change="handleSizeChange"
|
||||
@current-change="handleCurrentChange"
|
||||
:current-page="issuePage.pageNo"
|
||||
:page-sizes="$store.state.PAGESIZRS"
|
||||
:page-size="issuePage.pageSize"
|
||||
layout="total, sizes, prev, pager, next"
|
||||
:total="Number(total)"
|
||||
background
|
||||
></el-pagination> -->
|
||||
<!-- <div class="dialog-footer">
|
||||
<el-button
|
||||
class="cancleBtn"
|
||||
@click="issueTeamDialog = false"
|
||||
icon="el-icon-circle-close"
|
||||
size="medium"
|
||||
>{{ $t("message.laborMange.cancel") }}</el-button
|
||||
>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-circle-check"
|
||||
@click="issueTeamDialog = false"
|
||||
size="medium"
|
||||
>{{ $t("message.laborMange.confirm") }}</el-button
|
||||
>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<!-- <img :preview="showImgUrl" :src="showImgUrl" alt="">-->
|
||||
</div>
|
||||
</template>
|
||||
@ -501,7 +586,9 @@ import {
|
||||
getCarCameraListApi,
|
||||
} from "../../../assets/js/api/carManage";
|
||||
import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage";
|
||||
import { getWorkerInfoList, getEnterpriseInfoList } from "@/assets/js/api/laborPerson";
|
||||
import { getWorkerInfoList, getEnterpriseInfoList,
|
||||
xmglXzHikvisionSyncGetNewestList,
|
||||
xmglXzHikvisionSyncRetryAPI, } from "@/assets/js/api/laborPerson";
|
||||
import store from '@/store'
|
||||
export default {
|
||||
data() {
|
||||
@ -713,6 +800,13 @@ export default {
|
||||
carNumber: "",
|
||||
isBlack: "",
|
||||
appWorkerList: [],
|
||||
issueTeamDialog: false,
|
||||
issuePage: {
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
},
|
||||
whoId: "",
|
||||
issuePointList: [],
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
@ -725,13 +819,32 @@ export default {
|
||||
this.getBlackWhiteBoole()
|
||||
},
|
||||
methods: {
|
||||
// 展示下发详情
|
||||
async showDetail(id) {
|
||||
this.issueTeamDialog = true;
|
||||
this.whoId = id;
|
||||
this.getNewestList();
|
||||
},
|
||||
async getNewestList() {
|
||||
const res = await xmglXzHikvisionSyncGetNewestList({
|
||||
// pageNo:this.issuePage.pageNo,
|
||||
// pageSize:this.issuePage.pageSize,
|
||||
whoId: this.whoId,
|
||||
});
|
||||
console.log(res, "---------------------");
|
||||
this.issuePointList = res.result;
|
||||
},
|
||||
async retryEvent(id) {
|
||||
const res = await xmglXzHikvisionSyncRetryAPI({
|
||||
id: id,
|
||||
});
|
||||
console.log(res);
|
||||
},
|
||||
getBlackWhiteBoole(){
|
||||
let clgl = {key: 'clgl_blackWhiteList', menuPath: '/project/carManage/carManage'}
|
||||
console.log('1111111111111111111111111',this.checkPermission(clgl) );
|
||||
this.editPermission = this.checkPermission(clgl);
|
||||
},
|
||||
|
||||
|
||||
// 获取企业分级列表
|
||||
getEnterpriseListFn() {
|
||||
getEnterpriseInfoList({
|
||||
|
||||
@ -80,7 +80,7 @@
|
||||
>
|
||||
<span class="custom-tree-node" slot-scope="{ node, data }">
|
||||
<span>{{ data.enterpriseName }}</span>
|
||||
<div class="flex2" v-if="checkedId == data.id">
|
||||
<!-- <div class="flex2" v-if="checkedId == data.id">
|
||||
<img
|
||||
v-permission="{key: 'rygl_editCompany', menuPath: '/project/labor/personManage'}"
|
||||
src="@/assets/images/icon-edit.png"
|
||||
@ -94,7 +94,7 @@
|
||||
class="icon"
|
||||
@click="deleteEnterpriseInfo(data)"
|
||||
/>
|
||||
</div>
|
||||
</div> -->
|
||||
</span>
|
||||
</el-tree>
|
||||
<!-- <div v-if="enterpriseTreeData.length == 0" style="margin-top: 50%">
|
||||
@ -687,7 +687,7 @@
|
||||
<div class="dialog-footer">
|
||||
<el-button
|
||||
class="cancleBtn"
|
||||
@click="addEnterpriseDialog = false"
|
||||
@click="imgImportDialog = false"
|
||||
icon="el-icon-circle-close"
|
||||
size="medium"
|
||||
>{{ $t("message.laborMange.cancel") }}</el-button
|
||||
|
||||
@ -143,7 +143,8 @@ export default {
|
||||
},
|
||||
];
|
||||
|
||||
let iframe = document.getElementById("myIframe");
|
||||
// let iframe = document.getElementById("myIframe");
|
||||
let iframe = this.$refs.myIframeRef;
|
||||
iframe.contentWindow.postMessage(
|
||||
{
|
||||
type: "emitData",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user