Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev

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>
+        </j-input>
-        <a-modal
+        <j-modal
             title="地理位置"
             ok-text="确认"
             cancel-text="取消"
@@ -28,7 +28,7 @@
                 </el-amap>
                 {{ mapPoint }}
             </div>
-        </a-modal>
+        </j-modal>
     </div>
 </template>
 

src/components/Player/ScreenPlayer.vue

@@ -15,6 +15,7 @@
                     <j-radio-button :value="0">全屏</j-radio-button>
                 </j-radio-group>
                 <div class="screen-tool-save">
+                    <j-space>
                         <j-tooltip title="可保存分屏配置记录">
                             <AIcon type="QuestionCircleOutlined" />
                         </j-tooltip>
@@ -42,7 +43,9 @@
                                             },
                                         ]"
                                     >
-                                    <j-textarea v-model:value="formData.name" />
+                                        <j-textarea
+                                            v-model:value="formData.name"
+                                        />
                                     </j-form-item>
                                     <j-button
                                         type="primary"
@@ -96,6 +99,7 @@
                                 </template>
                             </j-dropdown-button>
                         </j-popover>
+                    </j-space>
                 </div>
             </div>
             <!-- 播放器 -->
@@ -127,7 +131,7 @@
                             >
                                 刷新
                             </div>
-                            <LivePlayer :url="item.url" autoplay />
+                            <LivePlayer :live="true" :url="item.url" autoplay />
                         </div>
                     </template>
                 </div>

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
+            CascadeApi[id ? 'update' : 'save'](params)
-                ? await CascadeApi.update(params)
+                .then(() => {
-                : await CascadeApi.save(params);
-            btnLoading.value = false;
-            if (res.success) {
                     message.success('操作成功');
                     router.back();
-            } else {
+                })
-                message.error('操作失败');
+                .finally(() => {
-            }
+                    btnLoading.value = false;
+                });
         })
         .catch((err: any) => {
             console.log('err: ', err);

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"

src/views/media/Home/index.vue

@@ -67,8 +67,8 @@
                     <span>{{ slotProps.channelNumber || 0 }}</span>
                 </template>
                 <template #state="slotProps">
-                    <a-space>
+                    <j-space>
-                        <a-badge
+                        <j-badge
                             :status="
                                 slotProps.state.value === 'online'
                                     ? 'success'
@@ -76,7 +76,7 @@
                             "
                             :text="slotProps.state.text"
                         />
-                    </a-space>
+                    </j-space>
                 </template>
             </JProTable>
         </j-modal>