ソースを参照

reactor:修复宜宾通话记录错误;

zhangchong 11 時間 前
コミット
1eeb4f7d95

+ 1 - 1
src/views/snapshot/config/safe/components/Safe-add.vue

@@ -99,7 +99,6 @@ const queryList = () => {
 			gridOptions.loading = false;
 		});
 };
-const checkTable = ref<EmptyArrayType>([]);
 const gridRef = ref<RefType>();
 // 选中事件
 const isChecked = computed(() => {
@@ -135,6 +134,7 @@ const closeDialog = () => {
 const close = () => {
 	ruleFormRef.value?.resetFields();
 	ruleFormRef.value?.resetFields();
+	state.queryParams.PhoneNumber = null;
 };
 // 新增
 const onSubmit = throttle(async (formEl: FormInstance | undefined) => {

+ 2 - 1
src/views/snapshot/config/safe/index.vue

@@ -5,7 +5,7 @@
 				<template #form>
 					<el-form :model="state.queryParams" ref="ruleFormRef" inline @submit.native.prevent :disabled="gridOptions.loading">
 						<el-form-item label="志愿者类型" prop="SafetyTypeId">
-							<el-select v-model="state.queryParams.SafetyTypeId" class="w100" placeholder="请选择审批状态" @change="handleQuery">
+							<el-select v-model="state.queryParams.SafetyTypeId" class="w100" placeholder="请选择审批状态" clearable @change="handleQuery">
 								<el-option v-for="item in statusOptions" :key="item.id" :label="item.name" :value="item.id" />
 							</el-select>
 						</el-form-item>
@@ -73,6 +73,7 @@ const state = reactive<any>({
 		IndustryName: null, // 行业类型
 		Name: null, // 关联人员
 		PhoneNumber: null, // 电话号码
+		SafetyTypeId:null, // 志愿者类型
 	},
 	total: 0, // 总条数
 });

+ 1 - 1
src/views/snapshot/info/sspConfig/components/Config-add.vue

@@ -282,7 +282,7 @@ const updateSuccessCareCell = (response: any, uploadFile: UploadFile, uploadFile
 };
 // 上传视频
 const uploadVideoRef = ref<RefType>();
-const fileList = ref<UploadFiles>([
+const fileList = ref<EmptyArrayType>([
 	/*{
 		name: '12239_1739325758.mp4',
 		url: '/file/files_indefinitely?id=08dd8555-5673-4e45-80eb-12cdc7ac8125&expires=1745739172&clientid=hotline&signature=BF5AD8DBEF553CDA7750BBDF01A07C33689FAB83DB5163CADE787E327E366DD426861371167F86296E6DE9C696F65F3C92F3742DE762EE50',

+ 16 - 6
src/views/snapshot/info/sspConfig/components/Config-detail.vue

@@ -22,21 +22,23 @@
 				<span class="mr5">是否置顶:{{ state.ruleForm.isTop ? '是' : '否' }}</span>
 				<span>是否飘窗:{{ state.ruleForm.isPopup ? '是' : '否' }}</span>
 			</p>
-			<p style="text-align: center">
+			<p style="text-align: center" >
 				<span class="mr5">结束时间:{{ formatDate(state.ruleForm.bulletinTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-				<span>来源单位:{{ state.ruleForm.sourceOrgName }}</span>
+				<span>来源部门:{{ state.ruleForm.sourceOrgName }}</span>
 			</p>
 			<!--		安全卫士	-->
 			<template v-if="state.ruleForm.bulletinTypeId === 'aqws'">
-				<p style="text-align: center">
+				<p style="text-align: center" class="mt10">
 					<span class="mr5">志愿者类型:{{ state.ruleForm?.safetyTypeNames?.join(',') }}</span>
 					<span>形式:{{ state.ruleForm.shape === 0 ? '消息' : '视频' }}</span>
 				</p>
 				<el-divider />
 				<div v-html="state.ruleForm.content" v-if="state.ruleForm.shape === 0"></div>
 				<div v-else>
-					<div>视频封面:{{ state.ruleForm?.videoCoverImgUrl }}</div>
-					<div>视频地址:{{ state.ruleForm?.videoPath }}</div>
+					<div>视频封面: <el-image style="width: 178px; height: 178px" :src="videoCoverImgUrlPath" /></div>
+					<div class="mt20">视频地址:
+						<video controls :src="videoPathAllUrl"  width="100%"/>
+					</div>
 				</div>
 			</template>
 			<template v-else>
@@ -80,7 +82,7 @@
 </template>
 
 <script setup lang="tsx" name="noticeDetail">
-import { reactive, ref } from 'vue';
+import { computed, reactive, ref } from 'vue';
 import { auditSnapshotBulletin, getSnapshotBulletinDetail } from '@/api/snapshot/info';
 import { formatDate } from '@/utils/formatTime';
 import { ElMessage, FormInstance } from 'element-plus';
@@ -151,6 +153,14 @@ const onSubmit = (formEl: FormInstance | undefined) => {
 			});
 	});
 };
+// 视频封面全路径
+const videoCoverImgUrlPath = computed(() => {
+	return state.ruleForm.videoCoverImgUrl ? `${import.meta.env.VITE_API_UPLOAD_URL}${state.ruleForm.videoCoverImgUrl}` : '';
+});
+// 视频地址全路径
+const videoPathAllUrl = computed(() => {
+	return state.ruleForm.videoPath ? `${import.meta.env.VITE_API_UPLOAD_URL}${state.ruleForm.videoPath}` : '';
+});
 // 暴露变量
 defineExpose({
 	openDialog,

+ 2 - 2
src/views/snapshot/info/sspConfig/components/Config-edit.vue

@@ -174,7 +174,7 @@
 <script setup lang="tsx" name="noticeDetail">
 import { reactive, ref, defineAsyncComponent, computed } from 'vue';
 import { throttle } from '@/utils/tools';
-import { ElMessage, FormInstance, UploadFile, UploadFiles } from 'element-plus';
+import { ElMessage, FormInstance, UploadFile, UploadFiles, UploadUserFile } from 'element-plus';
 import { disabledDate } from '@/utils/constants';
 import { ElCheckbox } from 'element-plus';
 import { editSnapshotBulletin, editSnapshotBulletinBase, getSnapshotBulletinDetail } from '@/api/snapshot/info';
@@ -287,7 +287,7 @@ const updateSuccessCareCell = (response: any, uploadFile: UploadFile, uploadFile
 };
 // 上传视频
 const uploadVideoRef = ref<RefType>();
-const fileList = ref<UploadFiles>([
+const fileList = ref<EmptyArrayType>([
 	/*{
 		name: '12239_1739325758.mp4',
 		url: '/file/files_indefinitely?id=08dd8555-5673-4e45-80eb-12cdc7ac8125&expires=1745739172&clientid=hotline&signature=BF5AD8DBEF553CDA7750BBDF01A07C33689FAB83DB5163CADE787E327E366DD426861371167F86296E6DE9C696F65F3C92F3742DE762EE50',

+ 5 - 5
src/views/tels/callLog/ybCallLog.vue

@@ -24,11 +24,11 @@
 					<el-segmented
 						:options="[
 							{
-								value: 'false',
+								value: 0,
 								label: '全部',
 							},
 							{
-								value: 'true',
+								value: 1,
 								label: '我的',
 							},
 						]"
@@ -548,7 +548,7 @@ const state = reactive<any>({
 		IsSensitiveWord: null, // 是否敏感通话
 		SortField: null,
 		SortRule: null,
-		QuerySelf: 'false', // 默认全部
+		QuerySelf: 0, // 默认全部
 	},
 	tableData: [], // 列表数据
 	loading: false, // 加载
@@ -757,7 +757,7 @@ const transferOrder = (row: any) => {
 	Local.set(`${row.otherAccept}`, row.transliterationContent);
 };
 // 转写工单  未接
-const transferOrderMissed = (row:any)=>{
+const transferOrderMissed = (row: any) => {
 	router.push({
 		name: 'orderAccept',
 		query: {
@@ -768,7 +768,7 @@ const transferOrderMissed = (row:any)=>{
 			telArea: '',
 		},
 	});
-}
+};
 // 基础信息
 const getBaseData = async () => {
 	const response = await callBaseData();