Compare commits

...

3 Commits

Author SHA1 Message Date
10537acdb9 fix: 指挥 2024-03-25 18:10:24 +08:00
c58c6684ae Merge remote-tracking branch 'origin/main' 2024-03-25 18:09:29 +08:00
dc8acccb6d fix: 会议管理录像上传改改 2024-03-25 18:09:22 +08:00
2 changed files with 8 additions and 19 deletions

View File

@ -94,7 +94,6 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['qcfgjManage:dock:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -105,7 +104,6 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['qcfgjManage:dock:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -116,7 +114,6 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['qcfgjManage:dock:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -126,7 +123,6 @@
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['qcfgjManage:dock:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@ -172,14 +168,12 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['qcfgjManage:dock:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['qcfgjManage:dock:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>

View File

@ -94,7 +94,6 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['qcfgjManage:dock:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -105,7 +104,6 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['qcfgjManage:dock:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -116,7 +114,6 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['qcfgjManage:dock:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -126,7 +123,6 @@
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['qcfgjManage:dock:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@ -134,7 +130,7 @@
<el-table v-loading="loading" :data="dockList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dockList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="会议标题" align="center" prop="productName" width="130"/> <el-table-column label="会议标题" align="center" prop="productName" width="160"/>
<el-table-column label="会议描述" align="center" prop="batchInfo" /> <el-table-column label="会议描述" align="center" prop="batchInfo" />
<el-table-column label="开始时间" align="center" prop="lengthInfo" width="160"> <el-table-column label="开始时间" align="center" prop="lengthInfo" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
@ -154,7 +150,7 @@
<!-- <span>{{ parseTime(scope.row.detectTime, '{y}-{m}-{d}') }}</span>--> <!-- <span>{{ parseTime(scope.row.detectTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="链接地址" align="center" prop="remark" width="160"/> <el-table-column label="链接地址" align="center" prop="remark"/>
<el-table-column label="会议状态" align="center" prop="detectResult" width="110"> <el-table-column label="会议状态" align="center" prop="detectResult" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.rescue_meeting_status" :value="scope.row.detectResult"/> <dict-tag :options="dict.type.rescue_meeting_status" :value="scope.row.detectResult"/>
@ -173,21 +169,18 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['qcfgjManage:dock:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['qcfgjManage:dock:remove']"
>删除</el-button> >删除</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-video-camera" icon="el-icon-video-camera"
@click="playVideo(scope.row)" @click="playVideo(scope.row)"
v-hasPermi="['machinery:image:edit']"
>查看视频</el-button> >查看视频</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -247,7 +240,7 @@
<el-input v-model="form.remark" placeholder="请输入会议链接地址" /> <el-input v-model="form.remark" placeholder="请输入会议链接地址" />
</el-form-item> </el-form-item>
<el-form-item label="会议状态" prop="detectResult"> <el-form-item label="会议状态" prop="detectResult">
<el-select v-model="queryParams.detectResult" placeholder="请选择当前会议状态" clearable style="width: 100%"> <el-select v-model="form.detectResult" placeholder="请选择当前会议状态" clearable style="width: 100%">
<el-option <el-option
v-for="dict in dict.type.rescue_meeting_status" v-for="dict in dict.type.rescue_meeting_status"
:key="dict.value" :key="dict.value"
@ -344,6 +337,8 @@ export default {
// //
rules: { rules: {
}, },
//
fileInfoList: [],
fileList: [], fileList: [],
// //
upload: { upload: {
@ -362,7 +357,7 @@ export default {
}, },
isShow: false, isShow: false,
imageInfo: '', videoUrl: '',
baseUrl: process.env.VUE_APP_BASE_API, baseUrl: process.env.VUE_APP_BASE_API,
}; };
}, },
@ -376,7 +371,7 @@ export default {
// src // src
let url1 = row.imageInfo; let url1 = row.imageInfo;
// this.videoUrl=this.baseUrl+"/profile/upload/2023/10/24/_20231024154211A001.mp4"; // this.videoUrl=this.baseUrl+"/profile/upload/2023/10/24/_20231024154211A001.mp4";
this.imageInfo = this.baseUrl + url1; this.videoUrl = this.baseUrl + url1;
}, },
/** /**
* 关闭视频 * 关闭视频
@ -384,7 +379,7 @@ export default {
closeDialog () { closeDialog () {
// //
this.isShow = false this.isShow = false
this.imageInfo = '' // this.videoUrl = '' //
}, },
// //
submit() { submit() {