瀏覽代碼

feat(组件): 修改bug

tangning 2 年之前
父節點
當前提交
1c468815b0

+ 3 - 0
src/App.vue

@@ -26,4 +26,7 @@
     padding: 0;
     padding: 0;
   }
   }
 }
 }
+.ant-calendar-picker{
+  min-width: 385px;
+}
 </style>
 </style>

+ 1 - 5
src/views/device/detailsMoadl.vue

@@ -72,11 +72,7 @@ export default defineComponent({
               label: t('routes.product.outType.0'),
               label: t('routes.product.outType.0'),
               value: '0',
               value: '0',
               key: '0',
               key: '0',
-            },{
-                  label: t('routes.product.outType.4'),
-                  value: '4',
-                  key: '4',
-             },
+            },
             {
             {
               label: t('routes.product.outType.1'),
               label: t('routes.product.outType.1'),
               value: '1',
               value: '1',

+ 22 - 4
src/views/device/index.vue

@@ -251,10 +251,6 @@ import { lte } from 'lodash';
                   value: 0,
                   value: 0,
                   key: '0',
                   key: '0',
                 },{
                 },{
-                  label: t('routes.product.outType.4'),
-                  value: 4,
-                  key: '4',
-                },{
                   label: t('routes.product.outType.1'),
                   label: t('routes.product.outType.1'),
                   value: 1,
                   value: 1,
                   key: '1',
                   key: '1',
@@ -299,6 +295,28 @@ import { lte } from 'lodash';
             },
             },
           },
           },
           {
           {
+            field: 'bindStatus',
+            component: 'Select',
+            label: '绑定状态',
+            colProps: {
+              xl: 6,
+              xxl: 6,
+            },
+            componentProps: {
+              options: [
+                {
+                  label: '未绑定',
+                  value: 0,
+                  key: '0',
+                },{
+                  label: '已绑定',
+                  value: 1,
+                  key: '1',
+                }
+              ],
+            },
+          },
+          {
             field: 'userName',
             field: 'userName',
             component: 'Input',
             component: 'Input',
             label: '绑定账号',
             label: '绑定账号',

+ 20 - 15
src/views/productOperation/cameraScene.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-  <PageWrapper contentBackground>
+  <PageWrapper contentBackground>{{ isDev }}
     <template #footer >
     <template #footer >
       <a-tabs v-model:activeKey="tableType" @change="changeTable">
       <a-tabs v-model:activeKey="tableType" @change="changeTable">
         <a-tab-pane :key="0" tab="四维看看" :disabled="loading"/>
         <a-tab-pane :key="0" tab="四维看看" :disabled="loading"/>
@@ -12,9 +12,10 @@
         <template #toolbar>
         <template #toolbar>
           <!-- <a-button type="primary" @click="exportExcel"> 导出1</a-button> -->
           <!-- <a-button type="primary" @click="exportExcel"> 导出1</a-button> -->
         </template>
         </template>
-
+        
         <template #href="{ record }">
         <template #href="{ record }">
-          <a v-if="record.sceneName" target="_blank" :href="record.thumb">{{record.sceneName}}</a>
+          <a v-if="record.sceneName && isDev" target="_blank" :href="`/livestream/?m=${record.sceneNumList && record.sceneNumList[0]}lang=zh&isTour=1`">{{record.sceneName}}</a>
+          <span v-else-if="record.sceneName">{{record.sceneName}}</span>
           <span v-else>-</span>
           <span v-else>-</span>
         </template>
         </template>
         <template #action="{ record }">
         <template #action="{ record }">
@@ -131,6 +132,8 @@
       const permissionStore = usePermissionStore();
       const permissionStore = usePermissionStore();
       const { getCheckPerm } = permissionStore;
       const { getCheckPerm } = permissionStore;
       const loading = ref(false);
       const loading = ref(false);
+      const isDev = window.location.hostname.includes('eur')
+      console.log('isDev',isDev)
       const tableType = ref<Recordable>(0); //0看看 、1看见、2深时
       const tableType = ref<Recordable>(0); //0看看 、1看见、2深时
       const columns: BasicColumn[] = [
       const columns: BasicColumn[] = [
         {
         {
@@ -338,12 +341,25 @@
               xl: 7,
               xl: 7,
               xxl: 7,
               xxl: 7,
             },
             },
+          },
+          {
+            field: 'userName',
+            label: '绑定账号',
+            component: 'Input',
+            componentProps: {
+              maxLength: 100,
+            },
+            colProps: {
+              xl: 7,
+              xxl: 7,
+            },
           },{
           },{
             field: 'timeList',
             field: 'timeList',
             label: '拍摄时间段',
             label: '拍摄时间段',
             component: 'RangePicker',
             component: 'RangePicker',
             componentProps: {
             componentProps: {
               maxLength: 100,
               maxLength: 100,
+              width:'385px',
               format: 'YYYY-MM-DD',
               format: 'YYYY-MM-DD',
               valueFormat: 'YYYY-MM-DD',
               valueFormat: 'YYYY-MM-DD',
               showTime: true,
               showTime: true,
@@ -353,18 +369,6 @@
               xxl: 8,
               xxl: 8,
             },
             },
           },
           },
-          {
-            field: 'userName',
-            label: '绑定账号',
-            component: 'Input',
-            componentProps: {
-              maxLength: 100,
-            },
-            colProps: {
-              xl: 7,
-              xxl: 7,
-            },
-          },
         ],
         ],
       };
       };
       function cancelDownload() {
       function cancelDownload() {
@@ -530,6 +534,7 @@
         downloadOption,
         downloadOption,
         cancelDownload,
         cancelDownload,
         getTypeCheckPerm,
         getTypeCheckPerm,
+        isDev,
       };
       };
     },
     },
   });
   });

+ 1 - 1
src/views/productOperation/livestream.vue

@@ -4,7 +4,7 @@
       <!-- <a-button type="primary" @click="exportExcel"> 导出1</a-button> -->
       <!-- <a-button type="primary" @click="exportExcel"> 导出1</a-button> -->
     </template>
     </template>
     <template #href="{ record }">
     <template #href="{ record }">
-          <a v-if="record.roomTitle" target="_blank" :href="record.share">{{record.roomTitle}}</a>
+          <a v-if="record.roomTitle" target="_blank" :href="`/livestream/?m=${1}&lang=zh&isTour=1`">{{record.roomTitle}}</a>
           <span v-else>-</span>
           <span v-else>-</span>
     </template>
     </template>
     <template #action="{ record }">
     <template #action="{ record }">