Quellcode durchsuchen

修改录制交互,搜索栏样式修改

wangfumin vor 1 Monat
Ursprung
Commit
c43c75dd2a

+ 1 - 1
src/components/head/index.vue

@@ -65,7 +65,7 @@ const show = ref(true);
 }
 
 .head-content-layer {
-  padding: 16px 154px 16px 16px;
+  padding: 16px 154px 16px 24px;
   position: relative;
 
   .head-content {

+ 31 - 2
src/view/mediaLibrary/index.vue

@@ -1,6 +1,6 @@
 <template>
   <com-head :options="[{ name: '媒体库', value: '2' }]">
-    <el-form label-width="97px" inline>
+    <el-form inline class="mesh-search-form">
       <el-form-item label="名称:">
         <el-input v-model="state.query.name" placeholder="请输入"></el-input>
       </el-form-item>
@@ -24,7 +24,7 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item class="searh-btns" style="grid-area: 1 / 4 / 2 / 4">
+      <el-form-item class="searh-btns">
         <el-button type="primary" @click="refresh">查询</el-button>
         <el-button type="primary" plain @click="queryReset">重置</el-button>
       </el-form-item>
@@ -403,4 +403,33 @@ const confirmDelete = async (row: Media) => {
   width: 100%;
   height: 100%;
 }
+
+.mesh-search-form {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-items: center;
+  column-gap: 32px;
+  row-gap: 16px;
+
+  :deep(.el-form-item) {
+    margin-right: 0;
+    margin-bottom: 0;
+  }
+  :deep(.el-form-item--label-right){
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  :deep(.el-form-item__label) {
+    padding-right: 16px;
+  }
+}
+
+.searh-btns {
+  :deep(.el-form-item__content) {
+    display: flex;
+    align-items: center;
+  }
+}
 </style>

+ 33 - 2
src/view/newFireCase/dyManager/list.vue

@@ -1,8 +1,8 @@
 <template>
   <com-head :options="listOptions" v-model="params.pagging.state.query.searchType">
-    <el-form label-width="84px" inline>
+    <el-form inline class="mesh-search-form">
       <slot name="header" />
-      <el-form-item class="searh-btns" style="grid-area: 1 / 4 / 2 / 4">
+      <el-form-item class="searh-btns">
         <el-button type="primary" @click="params.pagging.refresh">查询</el-button>
         <el-button type="primary" plain @click="params.pagging.queryReset"
           >重置</el-button
@@ -63,3 +63,34 @@ watchEffect(() => {
   }
 });
 </script>
+
+<style scoped lang="scss">
+.mesh-search-form {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-items: center;
+  column-gap: 32px;
+  row-gap: 16px;
+
+  :deep(.el-form-item) {
+    margin-right: 0;
+    margin-bottom: 0;
+  }
+  :deep(.el-form-item--label-right){
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  :deep(.el-form-item__label) {
+    padding-right: 16px;
+  }
+}
+
+.searh-btns {
+  :deep(.el-form-item__content) {
+    display: flex;
+    align-items: center;
+  }
+}
+</style>

+ 35 - 5
src/view/newFireCase/meshManager/list.vue

@@ -1,12 +1,10 @@
 <template>
   <com-head :options="listOptions" v-model="params.pagging.state.query.searchType">
-    <el-form label-width="84px" inline>
+    <el-form inline class="mesh-search-form">
       <slot name="header" />
-      <el-form-item class="searh-btns" style="grid-area: 1 / 4 / 2 / 4">
+      <el-form-item class="searh-btns">
         <el-button type="primary" @click="params.pagging.refresh">查询</el-button>
-        <el-button type="primary" plain @click="params.pagging.queryReset"
-          >重置</el-button
-        >
+        <el-button type="primary" plain @click="params.pagging.queryReset">重置</el-button>
       </el-form-item>
     </el-form>
   </com-head>
@@ -63,3 +61,35 @@ watchEffect(() => {
   }
 });
 </script>
+
+<style scoped lang="scss">
+.mesh-search-form {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-items: center;
+  column-gap: 32px;
+  row-gap: 16px;
+
+  :deep(.el-form-item--label-right){
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  :deep(.el-form-item) {
+    margin-right: 0;
+    margin-bottom: 0;
+  }
+
+  :deep(.el-form-item__label) {
+    padding-right: 16px;
+  }
+}
+
+.searh-btns {
+  :deep(.el-form-item__content) {
+    display: flex;
+    align-items: center;
+  }
+}
+</style>

+ 33 - 2
src/view/newFireCase/mix3dManager/list.vue

@@ -1,8 +1,8 @@
 <template>
   <com-head :options="listOptions" v-model="params.pagging.state.query.searchType">
-    <el-form label-width="84px" inline>
+    <el-form inline class="mesh-search-form">
       <slot name="header" />
-      <el-form-item class="searh-btns" style="grid-area: 1 / 4 / 2 / 4">
+      <el-form-item class="searh-btns">
         <el-button type="primary" @click="params.pagging.refresh">查询</el-button>
         <el-button type="primary" plain @click="params.pagging.queryReset"
           >重置</el-button
@@ -53,3 +53,34 @@ watchEffect(() => {
   }
 });
 </script>
+
+<style scoped lang="scss">
+.mesh-search-form {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-items: center;
+  column-gap: 32px;
+  row-gap: 16px;
+
+  :deep(.el-form-item) {
+    margin-right: 0;
+    margin-bottom: 0;
+  }
+  :deep(.el-form-item--label-right){
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  :deep(.el-form-item__label) {
+    padding-right: 16px;
+  }
+}
+
+.searh-btns {
+  :deep(.el-form-item__content) {
+    display: flex;
+    align-items: center;
+  }
+}
+</style>

+ 29 - 4
src/view/newFireCase/newFireDetails/components/screenShot.vue

@@ -76,8 +76,20 @@ const emit = defineEmits<{
   'start': any,
   'playVideo': [value: string | Blob],
 }>()
+const route = useRoute();
+const vueRouter = useRouter();
 const startShot = () => {
-  emit("start");
+  const targetCaseId = props.caseId ?? Number(route.params.caseId);
+  const query: any = { ...route.query, editOrShow: 'show', startShot: '1' };
+  delete query.editSub;
+  delete query.type;
+  delete query.presetKey;
+  const resolved = vueRouter.resolve({
+    name: 'fireDetails',
+    params: { caseId: targetCaseId },
+    query,
+  });
+  window.open(resolved.href, '_blank');
 }
 const files = ref<any[]>([]);
 const loading = ref(false);
@@ -188,12 +200,25 @@ const handleView = (file: any) => {
 };
 // 继续录制:将当前文件信息抛到上层以便进入录制弹窗
 const handleContinue = (file: any) => {
-  emit('start', {
+  const targetCaseId = props.caseId ?? Number(route.params.caseId);
+  const query: any = {
+    ...route.query,
+    editOrShow: 'show',
+    startShot: '1',
     videoFolderId: file?.videoFolderId || file?.filesId || file?.id,
     videoFolderName: file?.videoFolderName || file?.filesTitle || '讲解视频',
-    videoMergeUrl: file?.videoMergeUrl,
-    videoFolderCover: file?.videoFolderCover,
+    videoMergeUrl: file?.videoMergeUrl || '',
+    videoFolderCover: file?.videoFolderCover || '',
+  };
+  delete query.editSub;
+  delete query.type;
+  delete query.presetKey;
+  const resolved = vueRouter.resolve({
+    name: 'fireDetails',
+    params: { caseId: targetCaseId },
+    query,
   });
+  window.open(resolved.href, '_blank');
 };
 // 更改视频名称
 const renameVisible = ref(false);

+ 17 - 0
src/view/newFireCase/newFireDetails/index.vue

@@ -112,6 +112,23 @@ onMounted(() => {
   setTimeout(() => {
     loadCaseInfo();
   }, 0);
+
+  const startShotFlag = String((route.query as any)?.startShot || '');
+  if (startShotFlag === '1') {
+    const q: any = route.query as any;
+    startShot({
+      videoFolderId: q?.videoFolderId,
+      videoFolderName: q?.videoFolderName,
+      videoMergeUrl: q?.videoMergeUrl,
+      videoFolderCover: q?.videoFolderCover,
+    });
+    const newQuery: any = { ...route.query, startShot: '0' };
+    delete newQuery.videoFolderId;
+    delete newQuery.videoFolderName;
+    delete newQuery.videoMergeUrl;
+    delete newQuery.videoFolderCover;
+    vueRouter.replace({ path: route.path, query: newQuery });
+  }
   
   // 监听标题更新事件:由 basicInfo 自动保存成功派发
   const titleUpdateHandler = (evt: any) => {

+ 6 - 4
src/view/organization/index.vue

@@ -1,14 +1,16 @@
 <template>
   <div class="organiza">
     <div class="title">
-      <span>名称</span>
+      <span>名称</span>
       <el-input
         v-model="filterText"
         placeholder="请输入"
         @keyup.enter="handleSearch"
       />
-      <el-button type="primary" @click="handleSearch">查询</el-button>
-      <el-button type="danger" plain @click="handleReset">重置</el-button>
+      <div class="searh-btns">
+        <el-button type="primary" @click="handleSearch">查询</el-button>
+        <el-button type="danger" plain @click="handleReset">重置</el-button>
+      </div>
     </div>
 
     <div class="organiza-body">
@@ -139,7 +141,7 @@ onMounted(refresh);
     height: 106px;
     padding: 0 24px;
     color: #303133;
-    font-size: 16px;
+    font-size: 14px;
     line-height: 106px;
     font-weight: 500;
     background-color: #fff;