From a260146ad4d0009a94c9df5ce9d7f5117d6b95bf Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Fri, 17 Mar 2023 14:09:23 +0800
Subject: [PATCH 1/2] fix: bug#10528

---
 src/components/GeoComponent/index.vue  |   8 +-
 src/components/Player/ScreenPlayer.vue | 160 +++++++++++++------------
 src/views/media/Cascade/Save/index.vue |  20 ++--
 src/views/media/Home/index.vue         |   6 +-
 4 files changed, 98 insertions(+), 96 deletions(-)

diff --git a/src/components/GeoComponent/index.vue b/src/components/GeoComponent/index.vue
index d2b051bf..3c7eab82 100644
--- a/src/components/GeoComponent/index.vue
+++ b/src/components/GeoComponent/index.vue
@@ -1,12 +1,12 @@
 <!-- 坐标点拾取组件 -->
 <template>
     <div class="page-container">
-        <a-input allowClear v-model:value="inputPoint">
+        <j-input allowClear v-model:value="inputPoint">
             <template #addonAfter>
                 <environment-outlined @click="modalVis = true" />
             </template>
-        </a-input>
-        <a-modal
+        </j-input>
+        <j-modal
             title="地理位置"
             ok-text="确认"
             cancel-text="取消"
@@ -28,7 +28,7 @@
                 </el-amap>
                 {{ mapPoint }}
             </div>
-        </a-modal>
+        </j-modal>
     </div>
 </template>
 
diff --git a/src/components/Player/ScreenPlayer.vue b/src/components/Player/ScreenPlayer.vue
index 0bbc5e06..1be10586 100644
--- a/src/components/Player/ScreenPlayer.vue
+++ b/src/components/Player/ScreenPlayer.vue
@@ -15,87 +15,91 @@
                     <j-radio-button :value="0">全屏</j-radio-button>
                 </j-radio-group>
                 <div class="screen-tool-save">
-                    <j-tooltip title="可保存分屏配置记录">
-                        <AIcon type="QuestionCircleOutlined" />
-                    </j-tooltip>
-                    <j-popover
-                        v-model:visible="visible"
-                        trigger="click"
-                        title="分屏名称"
-                    >
-                        <template #content>
-                            <j-form
-                                ref="formRef"
-                                :model="formData"
-                                layout="vertical"
-                            >
-                                <j-form-item
-                                    name="name"
-                                    :rules="[
-                                        {
-                                            required: true,
-                                            message: '请输入名称',
-                                        },
-                                        {
-                                            max: 64,
-                                            message: '最多可输入64个字符',
-                                        },
-                                    ]"
-                                >
-                                    <j-textarea v-model:value="formData.name" />
-                                </j-form-item>
-                                <j-button
-                                    type="primary"
-                                    @click="saveHistory"
-                                    :loading="loading"
-                                    style="width: 100%; margin-top: 16px"
-                                >
-                                    保存
-                                </j-button>
-                            </j-form>
-                        </template>
-                        <j-dropdown-button
-                            type="primary"
-                            @click="visible = true"
+                    <j-space>
+                        <j-tooltip title="可保存分屏配置记录">
+                            <AIcon type="QuestionCircleOutlined" />
+                        </j-tooltip>
+                        <j-popover
+                            v-model:visible="visible"
+                            trigger="click"
+                            title="分屏名称"
                         >
-                            保存
-                            <template #overlay>
-                                <j-menu>
-                                    <j-empty
-                                        v-if="!historyList.length"
-                                        description="暂无数据"
-                                    />
-                                    <j-menu-item
-                                        v-for="(item, index) in historyList"
-                                        :key="`his${index}`"
-                                        @click="handleHistory(item)"
+                            <template #content>
+                                <j-form
+                                    ref="formRef"
+                                    :model="formData"
+                                    layout="vertical"
+                                >
+                                    <j-form-item
+                                        name="name"
+                                        :rules="[
+                                            {
+                                                required: true,
+                                                message: '请输入名称',
+                                            },
+                                            {
+                                                max: 64,
+                                                message: '最多可输入64个字符',
+                                            },
+                                        ]"
                                     >
-                                        <j-space>
-                                            <span>{{ item.name }}</span>
-                                            <j-popconfirm
-                                                title="确认删除?"
-                                                ok-text="确认"
-                                                cancel-text="取消"
-                                                @confirm="(e: any) => {
-                                                    e?.stopPropagation();
-                                                    deleteHistory(item.key);
-                                                }
-                                                "
-                                            >
-                                                <AIcon
-                                                    type="DeleteOutlined"
-                                                    @click="
-                                                        (e:any) =>
-                                                            e?.stopPropagation()
-                                                    "
-                                                />
-                                            </j-popconfirm>
-                                        </j-space>
-                                    </j-menu-item>
-                                </j-menu>
+                                        <j-textarea
+                                            v-model:value="formData.name"
+                                        />
+                                    </j-form-item>
+                                    <j-button
+                                        type="primary"
+                                        @click="saveHistory"
+                                        :loading="loading"
+                                        style="width: 100%; margin-top: 16px"
+                                    >
+                                        保存
+                                    </j-button>
+                                </j-form>
                             </template>
-                        </j-dropdown-button>
-                    </j-popover>
+                            <j-dropdown-button
+                                type="primary"
+                                @click="visible = true"
+                            >
+                                保存
+                                <template #overlay>
+                                    <j-menu>
+                                        <j-empty
+                                            v-if="!historyList.length"
+                                            description="暂无数据"
+                                        />
+                                        <j-menu-item
+                                            v-for="(item, index) in historyList"
+                                            :key="`his${index}`"
+                                            @click="handleHistory(item)"
+                                        >
+                                            <j-space>
+                                                <span>{{ item.name }}</span>
+                                                <j-popconfirm
+                                                    title="确认删除?"
+                                                    ok-text="确认"
+                                                    cancel-text="取消"
+                                                    @confirm="(e: any) => {
+                                                        e?.stopPropagation();
+                                                        deleteHistory(item.key);
+                                                    }
+                                                    "
+                                                >
+                                                    <AIcon
+                                                        type="DeleteOutlined"
+                                                        @click="
+                                                            (e:any) =>
+                                                                e?.stopPropagation()
+                                                        "
+                                                    />
+                                                </j-popconfirm>
+                                            </j-space>
+                                        </j-menu-item>
+                                    </j-menu>
+                                </template>
+                            </j-dropdown-button>
+                        </j-popover>
+                    </j-space>
                 </div>
             </div>
             <!-- 播放器 -->
diff --git a/src/views/media/Cascade/Save/index.vue b/src/views/media/Cascade/Save/index.vue
index 5b6a4572..2092882a 100644
--- a/src/views/media/Cascade/Save/index.vue
+++ b/src/views/media/Cascade/Save/index.vue
@@ -726,7 +726,7 @@ const handleSubmit = () => {
     // console.log('formData.value: ', formData.value);
     formRef.value
         .validate()
-        .then(async () => {
+        .then(() => {
             const {
                 id,
                 cascadeName,
@@ -750,16 +750,14 @@ const handleSubmit = () => {
                 ],
             };
             btnLoading.value = true;
-            const res = formData.value.id
-                ? await CascadeApi.update(params)
-                : await CascadeApi.save(params);
-            btnLoading.value = false;
-            if (res.success) {
-                message.success('操作成功');
-                router.back();
-            } else {
-                message.error('操作失败');
-            }
+            CascadeApi[id ? 'update' : 'save'](params)
+                .then(() => {
+                    message.success('操作成功');
+                    router.back();
+                })
+                .finally(() => {
+                    btnLoading.value = false;
+                });
         })
         .catch((err: any) => {
             console.log('err: ', err);
diff --git a/src/views/media/Home/index.vue b/src/views/media/Home/index.vue
index 4385da6a..c749d178 100644
--- a/src/views/media/Home/index.vue
+++ b/src/views/media/Home/index.vue
@@ -67,8 +67,8 @@
                     <span>{{ slotProps.channelNumber || 0 }}</span>
                 </template>
                 <template #state="slotProps">
-                    <a-space>
-                        <a-badge
+                    <j-space>
+                        <j-badge
                             :status="
                                 slotProps.state.value === 'online'
                                     ? 'success'
@@ -76,7 +76,7 @@
                             "
                             :text="slotProps.state.text"
                         />
-                    </a-space>
+                    </j-space>
                 </template>
             </JProTable>
         </j-modal>

From a553cdd19168fd3c2e01b3b08c2e1effd563ac1b Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Fri, 17 Mar 2023 14:25:22 +0800
Subject: [PATCH 2/2] fix: bug#10526

---
 src/components/Player/ScreenPlayer.vue        | 2 +-
 src/views/media/Device/Channel/Live/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Player/ScreenPlayer.vue b/src/components/Player/ScreenPlayer.vue
index 1be10586..33743504 100644
--- a/src/components/Player/ScreenPlayer.vue
+++ b/src/components/Player/ScreenPlayer.vue
@@ -131,7 +131,7 @@
                             >
                                 刷新
                             </div>
-                            <LivePlayer :url="item.url" autoplay />
+                            <LivePlayer :live="true" :url="item.url" autoplay />
                         </div>
                     </template>
                 </div>
diff --git a/src/views/media/Device/Channel/Live/index.vue b/src/views/media/Device/Channel/Live/index.vue
index 49bf12ed..53856333 100644
--- a/src/views/media/Device/Channel/Live/index.vue
+++ b/src/views/media/Device/Channel/Live/index.vue
@@ -25,7 +25,7 @@
                     <div class="tool-item">刷新</div>
                     <div class="tool-item" @click.stop="handleReset">重置</div>
                 </div>
-                <LivePlayer :url="url" :protocol="mediaType" autoplay />
+                <LivePlayer :live="true" :url="url" :protocol="mediaType" autoplay />
             </div>
             <MediaTool
                 @onMouseDown="handleMouseDown"