From 0615f6c8dddf1cff5368e85ce4bfa92c4deebe02 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期二, 29 十一月 2022 18:36:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/systemSetting/device/grid/components/main/index.vue | 4 ++--
src/views/operate/video/updateInterface/index.vue | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/operate/video/updateInterface/index.vue b/src/views/operate/video/updateInterface/index.vue
index fbc9ee0..60805da 100644
--- a/src/views/operate/video/updateInterface/index.vue
+++ b/src/views/operate/video/updateInterface/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="updateUser">
<el-form label-position="right" label-width="150px" :model="videoData" :rules="rules" :disabled="isDisabled" ref="user">
- <el-form-item prop="belongToId" label="鎵�灞炰簨浠剁紪鍙�">
+ <!-- <el-form-item prop="belongToId" label="鎵�灞炰簨浠剁紪鍙�">
<el-input v-model="videoData.belongToId"></el-input>
</el-form-item>
<el-form-item prop="eventSource" label="浜嬩欢鏉ユ簮">
@@ -20,7 +20,7 @@
</el-form-item>
<el-form-item prop="id" label="瑙嗛Id">
<el-input v-model="videoData.id"></el-input>
- </el-form-item>
+ </el-form-item> -->
<el-form-item prop="url" label="瑙嗛" min-width="8">
<template v-if="videoList" >
<div class="video-cover" v-for="video in videoList" :key="video">
@@ -100,6 +100,7 @@
delete params.eventSource;
delete params.id;
params.belongToId = +params.belongToId;
+ params.type="03"
if (this.isUpdate && !this.dialogData) {
videoManagement.addVideoResource(params)
.then(() => {
diff --git a/src/views/systemSetting/device/grid/components/main/index.vue b/src/views/systemSetting/device/grid/components/main/index.vue
index 48545d9..aae572d 100644
--- a/src/views/systemSetting/device/grid/components/main/index.vue
+++ b/src/views/systemSetting/device/grid/components/main/index.vue
@@ -1,8 +1,8 @@
<template>
<div class="mainContent">
- <div class="aside">
+ <!-- <div class="aside">
<department-aside />
- </div>
+ </div> -->
<div class="grid-content">
<!-- 鏁版嵁灞曠ず -->
<el-table ref="multipleTable"
--
Gitblit v1.8.0