bill 1 년 전
부모
커밋
6f8c2abe45
6개의 변경된 파일10개의 추가작업 그리고 15개의 파일을 삭제
  1. 2 4
      src/app/criminal/view/example/edit.vue
  2. 1 1
      src/view/camera/bind.vue
  3. 1 0
      src/view/case/help.ts
  4. 2 2
      src/view/vrmodel/list.vue
  5. 3 7
      src/view/vrmodel/pagging.ts
  6. 1 1
      src/view/vrmodel/sceneContent.vue

+ 2 - 4
src/app/criminal/view/example/edit.vue

@@ -16,7 +16,7 @@
         type="textarea"
         :autosize="false"
         :rows="5"
-        placeholder="请输入案件名称"
+        placeholder="请输入案件信息"
       />
     </el-form-item>
     <el-form-item label="视频介绍"
@@ -36,9 +36,7 @@
           <el-icon><Upload /></el-icon>上传
         </el-button>
         <template v-slot:tip>
-          <div class="el-upload__tip">
-            注:可上传{{ size }}以内的{{ accept }}格式的文件
-          </div>
+          <div class="el-upload__tip">注:可上传{{ size }}以内的视频mp4格式的文件</div>
         </template>
         <template v-slot:file="{ file }: { file: UploadFile }">
           <div class="file" @click.stop="previewFile()">

+ 1 - 1
src/view/camera/bind.vue

@@ -55,7 +55,7 @@ const bindCamera = ref<Camera>(
 );
 
 const cameraTypes = [
-  CameraType.SWKK,
+  // CameraType.SWKK,
   CameraType.SWKJ,
   CameraType.SWSS1,
   CameraType.SWSS2,

+ 1 - 0
src/view/case/help.ts

@@ -297,6 +297,7 @@ export const openSceneUrl = async (scene: Scene, type: OpenType) => {
     pathname || "",
     SceneTypeDomain[scene.type] || window.location.href
   );
+  url.searchParams.append("lang", "zh");
   if (scene.type === SceneType.SWMX) {
     url.searchParams.append(
       "modelId",

+ 2 - 2
src/view/vrmodel/list.vue

@@ -36,13 +36,13 @@ const props = defineProps<{
 }>();
 
 const headOptions = props.options || [
-  { value: SceneType.SWKK, name: SceneTypeDesc[SceneType.SWKK] },
+  // { value: SceneType.SWKK, name: SceneTypeDesc[SceneType.SWKK] },
   { value: SceneType.SWKJ, name: SceneTypeDesc[SceneType.SWKJ] },
   { value: SceneType.SWSS, name: SceneTypeDesc[SceneType.SWSS] },
   { value: SceneType.SWSSMX, name: SceneTypeDesc[SceneType.SWSSMX] },
   { value: SceneType.SWYDSS, name: SceneTypeDesc[SceneType.SWYDSS] },
   { value: SceneType.SWYDMX, name: SceneTypeDesc[SceneType.SWYDMX] },
   { value: SceneType.SWMX, name: SceneTypeDesc[SceneType.SWMX] },
-  { value: SceneType.QJKK, name: SceneTypeDesc[SceneType.QJKK] },
+  // { value: SceneType.QJKK, name: SceneTypeDesc[SceneType.QJKK] },
 ];
 </script>

+ 3 - 7
src/view/vrmodel/pagging.ts

@@ -12,7 +12,7 @@ export const useScenePaggingParams = () => {
   const pagging = usePagging({
     get: getScenePagging,
     paramsTemlate: {
-      type: SceneType.SWKK,
+      type: SceneType.SWKJ,
       sceneName: "",
       modelTitle: "",
       deptId: "",
@@ -23,9 +23,7 @@ export const useScenePaggingParams = () => {
   const isSwmx = computed(() => pagging.state.query.type === SceneType.SWMX);
   const keyword = computed({
     get: () =>
-      isSwmx.value
-        ? pagging.state.query.modelTitle
-        : pagging.state.query.sceneName,
+      isSwmx.value ? pagging.state.query.modelTitle : pagging.state.query.sceneName,
     set: (val: string) => {
       pagging.state.query.modelTitle = val;
       pagging.state.query.sceneName = val;
@@ -53,9 +51,7 @@ export const useScenePaggingParams = () => {
     () => pagging.state.table.rows as QuoteScene[],
     (scenes, _, onCleanup) => {
       const getSteps = async () => {
-        const runs = scenes.filter(
-          (scene) => scene.status === QuoteSceneStatus.RUN
-        );
+        const runs = scenes.filter((scene) => scene.status === QuoteSceneStatus.RUN);
         if (!runs.length) return clearInterval(interval);
 
         for (const scene of runs) {

+ 1 - 1
src/view/vrmodel/sceneContent.vue

@@ -24,7 +24,7 @@
     <el-table-column label="状态" v-slot:default="{ row }: { row: QuoteScene }">
       {{ QuoteSceneStatusDesc[row.status] }}
       <template v-if="row.status === QuoteSceneStatus.RUN">
-        进度:{{ row.step || 0 }}
+        进度:{{ row.step || 0 }}%
       </template>
     </el-table-column>
     <el-table-column label="所属架构" prop="deptName"></el-table-column>