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

Merge branch 'bjxz-cjw' into bjxz-dev

Browse Source
This commit is contained in:
Vce 2024-05-28 23:05:35 +08:00
commit 2a44f0fd0b
6 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/projectFront/emergencyDisposal/emergencyDisposal.vue
View File

@ -312,7 +312,9 @@
</div> </div>
<div style="display: flex;justify-content: center;" <div style="display: flex;justify-content: center;"
v-if="firstAidCallDetail.incidentClosedStatus == 1"> v-if="firstAidCallDetail.incidentClosedStatus == 1">
<el-button type="primary" @click="onSubmitAll()">提交救援记录</el-button> <el-button type="primary" @click="onSubmitAll()"
v-permission="{key: 'emergencyDisposal_add', menuPath: '/project/emergencyDisposal/emergencyDisposal'}"
>提交救援记录</el-button>
</div> </div>
</div> </div>
<div class="case" v-if="firstAidCallDetail.incidentClosedStatus == 2"> <div class="case" v-if="firstAidCallDetail.incidentClosedStatus == 2">

4
src/views/projectFront/inspecPoint/inspection.vue
View File

@ -107,7 +107,8 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div class="tableBtns"> <div class="tableBtns">
<div class="operationText"> <div class="operationText"
v-permission="{key: 'inspection_download', menuPath: '/project/inspecPoint/inspection'}">
<i <i
class="el-icon-download" class="el-icon-download"
style=" style="
@ -122,7 +123,6 @@
target="_blank" target="_blank"
:href="$store.state.FILEURL + scope.row.qrCode" :href="$store.state.FILEURL + scope.row.qrCode"
download download
v-permission="{key: 'inspection_download', menuPath: '/project/inspecPoint/inspection'}"
>下载巡检二维码</a >下载巡检二维码</a
> >
</div> </div>

3
src/views/projectFront/inspecPoint/selfInspect.vue
View File

@ -102,7 +102,8 @@
<el-table-column label="操作" align="center" width="280"> <el-table-column label="操作" align="center" width="280">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="operation-style"> <div class="operation-style">
<div class="operationText styleDom" @click="detailBtn(scope.row)"> <div class="operationText styleDom" @click="detailBtn(scope.row)"
v-permission="{key: 'selfInspect_detail', menuPath: '/project/inspecPoint/selfInspect'}">
<i <i
class="el-icon-tickets" class="el-icon-tickets"
style="color: #8dacfa; font-size: 16px; margin-right: 2px" style="color: #8dacfa; font-size: 16px; margin-right: 2px"

5
src/views/projectFront/quality/criterionModule/qualityProblemBank.vue
View File

@ -49,7 +49,6 @@
type="text" type="text"
size="mini" size="mini"
@click.stop="() => singleEditState(node, data, 0)" @click.stop="() => singleEditState(node, data, 0)"
v-permission="{key: 'criterion_open', menuPath: '/project/quality/criterion'}"
> >
{{ $t('message.quality.click') {{ $t('message.quality.click')
}}{{ $t('message.quality.startUsing') }} }}{{ $t('message.quality.startUsing') }}
@ -59,7 +58,7 @@
type="text" type="text"
size="mini" size="mini"
@click.stop="() => singleEditState(node, data, 1)" @click.stop="() => singleEditState(node, data, 1)"
v-permission="{key: 'criterion_stop', menuPath: '/project/quality/criterion'}"
> >
{{ $t('message.quality.click') {{ $t('message.quality.click')
}}{{ $t('message.quality.forbidden') }} }}{{ $t('message.quality.forbidden') }}
@ -188,6 +187,7 @@
size="small" size="small"
:disabled="showBatch" :disabled="showBatch"
@click="editState(0)" @click="editState(0)"
v-permission="{key: 'criterion_open', menuPath: '/project/quality/criterion'}"
>{{ >{{
$t('message.quality.batch') + $t('message.quality.startUsing') $t('message.quality.batch') + $t('message.quality.startUsing')
}}</el-button }}</el-button
@ -197,6 +197,7 @@
size="small" size="small"
:disabled="showBatch" :disabled="showBatch"
@click="editState(1)" @click="editState(1)"
v-permission="{key: 'criterion_stop', menuPath: '/project/quality/criterion'}"
>{{ >{{
$t('message.quality.batch') + $t('message.quality.forbidden') $t('message.quality.batch') + $t('message.quality.forbidden')
}}</el-button }}</el-button

1
src/views/projectFront/quality/inspectionLedger.vue
View File

@ -330,6 +330,7 @@
<div <div
@click="newShowDatadetails(scope.row, scope.$index)" @click="newShowDatadetails(scope.row, scope.$index)"
class="operationText last" class="operationText last"
v-permission="{key: 'inspectionLedger_detail', menuPath: '/project/quality/inspectionLedger'}"
> >
<i <i
class="el-icon-tickets" class="el-icon-tickets"

8
src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue
View File

@ -19,7 +19,9 @@
<el-button type="primary" size="medium" @click="add" <el-button type="primary" size="medium" @click="add"
v-permission="{key: 'deviceCentral_add', menuPath: '/project/smartSafeHat/deviceCentral'}" v-permission="{key: 'deviceCentral_add', menuPath: '/project/smartSafeHat/deviceCentral'}"
>新增</el-button> >新增</el-button>
<el-button size="medium" type="primary" @click="downloadFn()"> 下载模板</el-button> <el-button size="medium" type="primary" @click="downloadFn()"
v-permission="{key: 'deviceCentral_download', menuPath: '/project/smartSafeHat/deviceCentral'}"
> 下载模板</el-button>
<el-upload <el-upload
style="display: inline-block; margin: 0 15px" style="display: inline-block; margin: 0 15px"
class="upload-demo expintBtn" class="upload-demo expintBtn"
@ -31,7 +33,9 @@
:show-file-list="false" :show-file-list="false"
:headers="headers" :headers="headers"
> >
<el-button size="medium" type="primary">导入</el-button> <el-button size="medium" type="primary"
v-permission="{key: 'deviceCentral_import', menuPath: '/project/smartSafeHat/deviceCentral'}"
>导入</el-button>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>