Merge pull request 'dj' (#195) from dj into master

Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/195
This commit is contained in:
2024-11-27 14:28:34 +00:00
2 changed files with 8 additions and 3 deletions

5
components.d.ts vendored
View File

@@ -26,12 +26,16 @@ declare module '@vue/runtime-core' {
ElHeader: typeof import('element-plus/es')['ElHeader']
ElIcon: typeof import('element-plus/es')['ElIcon']
ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
ElMain: typeof import('element-plus/es')['ElMain']
ElMenu: typeof import('element-plus/es')['ElMenu']
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
ElPopover: typeof import('element-plus/es')['ElPopover']
ElRadio: typeof import('element-plus/es')['ElRadio']
ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
ElRow: typeof import('element-plus/es')['ElRow']
ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
ElSelect: typeof import('element-plus/es')['ElSelect']
@@ -43,6 +47,7 @@ declare module '@vue/runtime-core' {
ElTimeline: typeof import('element-plus/es')['ElTimeline']
ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
ElTooltip: typeof import('element-plus/es')['ElTooltip']
ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
FvCheckbox: typeof import('./src/fvcomponents/fvCheckbox/index.vue')['default']
FvForm: typeof import('./src/fvcomponents/fvForm/index.vue')['default']
FvFormDialog: typeof import('./src/fvcomponents/fvFormDialog/index.vue')['default']

View File

@@ -90,14 +90,14 @@ let contentState2 = [
},
{
content: "已处理",
timestamp: "2022-07-20 20:00:00",
timestamp: "2024-07-20 20:00:00",
icon: Check,
color: "#0bbd87",
size: "large",
},
{
content: "结单",
timestamp: "2022-07-20 20:00:00",
timestamp: "2024-07-20 20:00:00",
size: "large",
icon: Check,
color: "#0bbd87",
@@ -300,7 +300,7 @@ defineExpose({
<div v-for="(info, index) in activity.data" :key="index">
<div class="timeline-row">
<span :style="{ color: '#a8abb2' }">{{
info.callIdNumber
info.destinationNumber
}}</span>
<PointTag dictType="call_status" :value="info.callState"
class="tag"/>