tanghuan/mediate-manage-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into 'stg'

Browse Source 
Main

See merge request cloud-mediate/mediate-manage-web!67
This commit is contained in:
刘翕 2025-02-24 05:37:05 +00:00
commit 580a3b16ea
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/mediation-page/components/VideoRoom.vue
View File

@ -6,7 +6,7 @@
<div class="color-F53F3F" v-if="videoRecordingSts">{{ formattedTime }}</div>
</div>
<div class="flex-row">
<div class="room-top-btn background-color-fff flex-row align-items-center border-radius-4 cursor-pointer mr-8"
<div v-if="remoteUsersViews.length == 1" class="room-top-btn background-color-fff flex-row align-items-center border-radius-4 cursor-pointer mr-8"
@click="handleClose">
<span class="mr-4">退出房间</span>
</div>

2
src/pages/mediation-page/components/caseMaterialLeft.vue
View File

@ -12,7 +12,7 @@
<a class="case-img"><img :src="reg_img(item)"/></a>
<div class="flex-column pl-8">
<a class="mt-8 f-weight500">{{item.materialType}}</a>
<a class="color-86909C">{{item.createBy + ' ' + item.createAt}}</a>
<a class="color-86909C">{{item.createAt}}</a>
</div>
</div>
<div class="color-86909C mt-8">

7
src/pages/mediation-page/components/caseVideoReservationDialog.vue
View File

@ -24,9 +24,12 @@
<div class="mr-8 color-000 f-weight600 f16">
{{item.bookingTime}}
</div>
<el-tag v-if="$util.getTimeContrast(item.bookingEndTime)" size="small" :type="queryCondition.type?'success':''">{{ queryCondition.type ? '已视频' : '待视频' }}</el-tag>
<el-tag v-if="$util.getTimeContrast(item.bookingEndTime) && item.status.code == 0" size="small" type="info">未开始</el-tag>
<el-tag v-else-if="$util.getTimeContrast(item.bookingEndTime) && item.status.code == 1" size="small" type="info">进行中</el-tag>
<el-tag v-else-if="$util.getTimeContrast(item.bookingEndTime) && item.status.code == 2" size="small" type="success">已结束</el-tag>
<el-tag v-else-if="$util.getTimeContrast(item.bookingEndTime) && item.status.code == 3" size="small" type="warning">视频失败</el-tag>
<el-tag v-else-if="$util.getTimeContrast(item.bookingEndTime) && item.status.code == 4" size="small" type="warning">已取消</el-tag>
<el-tag v-else size="small" type="warning">已过期</el-tag>
</div>
<div class="flex-row align-items-center">

8
src/pages/system-management/take-management/components/addOrEditRoleDialog.vue
View File

@ -33,9 +33,9 @@
<el-select v-model="userInfo.seatTelephone" placeholder="请选择">
<el-option
v-for="item in phoneList"
:key="item.value"
:label="item.label"
:value="item.value">
:key="item"
:label="item"
:value="item">
</el-option>
</el-select>
</el-form-item>
@ -106,7 +106,7 @@ export default {
let _this=this;
this.$refs.ruleForm.validate((valid) => {
if(valid) {
systemManageApi.seatUnbind(_this.userInfo).then(res => {
systemManageApi.seatBind(_this.userInfo).then(res => {
this.$message({
showClose: true,
message: '绑定成功！',

7
src/pages/system-management/take-management/index.vue
View File

@ -30,7 +30,7 @@
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<div class="flex-row">
<div class="f14 color-1960F4 cursor-pointer mr-8" @click="handleAddForm(scope)">解绑</div>
<div class="f14 color-1960F4 cursor-pointer mr-8" @click="handleDelete(scope)">解绑</div>
</div>
</template>
@ -105,10 +105,7 @@ export default {
}
})
},
// 新增
handleAddForm(){
this.addOrEditRoleConfig = true
},
// 删除
handleDelete(scope){
this.$confirm("确定解绑坐席电话, 是否继续?", "提示", {

2
src/pages/system-management/user-management/components/addOrEditUserDialog.vue
View File

@ -199,7 +199,7 @@ export default {
{ pattern: /^(13[0-9]{9})|(18[0-9]{9})|(14[0-9]{9})|(17[0-9]{9})|(15[0-9]{9})|(19[0-9]{9})$/, message: '请输入正确手机号码', trigger: ['blur', 'change']}
],
email: [
{ required: false, message: '请输入邮箱地址', trigger: 'blur' },
{ required: true, message: '请输入邮箱地址', trigger: 'blur' },
{ pattern: /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/, message: '请输入正确邮箱地址', trigger: ['blur', 'change']}
],