Skip to content

李君 / carrefour

Go to a project
Commit 2f62b669 by 李君
Options

1

1 parent 1a69cbe6
Inline Side-by-side
Showing 2 changed files with 63 additions and 9 deletions
src/api/queueManagementApi.js
...@@ -109,6 +109,10 @@ const queueManagementApi = { ...@@ -109,6 +109,10 @@ const queueManagementApi = {
getDistributeList(params, config) { getDistributeList(params, config) {
return req('get', `/queuing/waitTime/distribute`, params, config) return req('get', `/queuing/waitTime/distribute`, params, config)
}, },
getAlarmMessageLog(params, config) {
return req('PUT', `/d-cashier-alarm-message-log/${params.id}`, params, config)
},
} }
......
src/views/queueManagement/alarmEvent/index.vue
...@@ -67,6 +67,13 @@ ...@@ -67,6 +67,13 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('table.recipient')" align="center" prop="sendEmail" show-overflow-tooltip> <el-table-column :label="$t('table.recipient')" align="center" prop="sendEmail" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column :label="$t('table.judgmentStatus')" width="150" align="center" prop="checkStatus">
<template slot-scope="scope">
<span>{{scope.row.checkStatus===1?$t('table.right'):(scope.row.checkStatus===0?$t('table.wrong'):'')}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('table.judgmentContent')" align="center" prop="remark" show-overflow-tooltip>
</el-table-column>
<el-table-column :label="$t('table.operate')" align="center" width="120"> <el-table-column :label="$t('table.operate')" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" class="tab-btn" @click="getDetail(scope.row)">{{$t('button.look')}}</el-button> <el-button type="text" class="tab-btn" @click="getDetail(scope.row)">{{$t('button.look')}}</el-button>
...@@ -93,7 +100,18 @@ ...@@ -93,7 +100,18 @@
<add-dialog ref="addModel"></add-dialog> <add-dialog ref="addModel"></add-dialog>
<el-dialog :title="$t('allPages.Image')" class="manage-dialog dialog_lj imgDialog" :visible.sync="imgDialogVisible" <el-dialog :title="$t('allPages.Image')" class="manage-dialog dialog_lj imgDialog" :visible.sync="imgDialogVisible"
:close-on-click-modal="false" v-if="imgDialogVisible" @close="imgDialogVisible = false"> :close-on-click-modal="false" v-if="imgDialogVisible" @close="imgDialogVisible = false">
<div style="height: 600px;"> <div class="alermForm">
<el-form :model="alermForm" status-icon ref="alermForm">
<el-form-item :label="$t('table.judgmentStatus')" prop="checkStatus">
<el-radio v-model="alermForm.checkStatus" label="1">{{$t('table.right')}}</el-radio>
<el-radio v-model="alermForm.checkStatus" label="0">{{$t('table.wrong')}}</el-radio>
</el-form-item>
<el-form-item :label="$t('table.judgmentContent')" prop="remark">
<el-input type="textarea" v-model="alermForm.remark"></el-input>
</el-form-item>
</el-form>
</div>
<div style="height: 600px;overflow: auto;">
<div v-for="(item,index) in imgArr" :key="index"> <div v-for="(item,index) in imgArr" :key="index">
<el-image :src='picUrl+item'> <el-image :src='picUrl+item'>
</el-image> </el-image>
...@@ -101,11 +119,11 @@ ...@@ -101,11 +119,11 @@
{{item.slice(14)}} {{item.slice(14)}}
</p> </p>
</div> </div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="imgDialogVisible = false" class="dialog-btn">{{ $t('dialog.close') }}</el-button> <el-button @click="imgDialogVisible = false" class="dialog-btn">{{ $t('dialog.close') }}</el-button>
<el-button type="primary" @click="alermSubmit('alermForm')" class="dialog-btn dialog-confirm-btn">
{{ $t('dialog.confirm') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -117,6 +135,10 @@ ...@@ -117,6 +135,10 @@
export default { export default {
data() { data() {
return { return {
alermForm:{
remark:'',
checkStatus:1
},
picUrl:'', picUrl:'',
imgArr:[], imgArr:[],
imgDialogVisible:false, imgDialogVisible:false,
...@@ -159,16 +181,36 @@ ...@@ -159,16 +181,36 @@
}, },
}, },
methods: { methods: {
getDetail(row){ alermSubmit(){
if(row.screenshotPath){ this.$api.queueManagementApi.getAlarmMessageLog(this.alermForm)
this.imgArr = row.screenshotPath.split(";") .then((res) => {
this.imgDialogVisible = true let result = res.data;
if(result.code==200){
this.$message({
message: this.$t('message.editSuccess'),
type: 'success'
});
this.getTableData();
this.$refs.alermForm.resetFields();
this.imgDialogVisible = false
}else{ }else{
this.$message({ this.$message({
message: this.$t('echartsTitle.noData'), message: result.msg,
type: 'warning' type: 'error'
}); });
} }
})
},
getDetail(row){
this.alermForm = {
id:row.id,
checkStatus: row.checkStatus !== '' ? String(row.checkStatus) :'',
remark: row.remark
}
if(row.screenshotPath){
this.imgArr = row.screenshotPath.split(";")
}
this.imgDialogVisible = true
}, },
// 广场 // 广场
getMallListForTerm() { getMallListForTerm() {
...@@ -304,7 +346,14 @@ ...@@ -304,7 +346,14 @@
/deep/.el-dialog{ /deep/.el-dialog{
width: 1000px !important; width: 1000px !important;
} }
/deep/.el-form-item__label{
width: 120px !important;
}
/deep/.el-form-item__label+.el-form-item__content{
width: calc(100% - 160px) !important;
} }
}
.searchFormSocial{
/deep/.el-select{ /deep/.el-select{
width: 180px; width: 180px;
} }
...@@ -312,6 +361,7 @@ ...@@ -312,6 +361,7 @@
width: auto !important; width: auto !important;
min-width: 60px; min-width: 60px;
} }
}
/deep/.el-date-editor{ /deep/.el-date-editor{
width: 250px !important; width: 250px !important;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!