Browse Source

修复下载压缩包问题,优化成员管理管理员密码不显示

李富豪 1 year ago
parent
commit
673f2683b5

+ 0 - 1
Web/src/components/airport/components/InfoModal.vue

@@ -526,7 +526,6 @@ const windSpeed = computed(() => {
     if (info.wind_speed === '--') {
       return info.wind_speed;
     } else {
-      // return info.wind_speed.toFixed(2) + ' m/s';
       return (info.wind_speed / 10).toFixed(1) + ' m/s';
     }
   } else {

+ 3 - 2
Web/src/hooks/use-g-map-trajectory.ts

@@ -83,9 +83,10 @@ export function useGMapTrajectory() {
       });
       distances.push(distanceText);
     }
-    root.$map.add([startMarker, polyline, ...text, ...circles, ...distances]);
+    const other=[startMarker, polyline, ...text, ...circles, ...distances];
+    root.$map.add(other);
     // 自动缩放地图到合适的视野级别
-    root.$map.setFitView([startMarker, polyline]);
+    root.$map.setFitView(other);
   }
 
   // 绘制动态轨迹

+ 1 - 1
Web/src/pages/page-web/projects/media/detail/index.vue

@@ -242,7 +242,7 @@ const onClickBatchDownload = async () => {
       id: state.selectedRowKeys.join(',')
     });
     const data = new Blob([bold], { type: 'application/zip' });
-    downloadFile(data, state.dirName);
+    downloadFile(data, state.dirName + '.zip');
   } catch (e) {
     console.error(e);
   } finally {

+ 2 - 2
Web/src/pages/page-web/projects/media/index/index.vue

@@ -250,7 +250,7 @@ const onClickBatchDownload = async () => {
       id: state.selectedRowKeys.join(',')
     });
     const data = new Blob([bold], { type: 'application/zip' });
-    downloadFile(data, moment().format('YYYY-MM-DD HH:mm:ss'));
+    downloadFile(data, moment().format('YYYY-MM-DD HH:mm:ss') + '.zip');
   } catch (e) {
     console.error(e);
   } finally {
@@ -286,7 +286,7 @@ const onClickDownload = async (record: any) => {
   try {
     const bold = await apis.batchDownloadMediaFile({ id: record.id });
     const data = new Blob([bold], { type: 'application/zip' });
-    downloadFile(data, record.dir_name);
+    downloadFile(data, record.dir_name + '.zip');
   } catch (e) {
     console.error(e);
   } finally {

+ 8 - 3
Web/src/pages/page-web/projects/member/index.vue

@@ -6,7 +6,7 @@
         :rowClassName="rowClassName" :dataSource="state.list" :pagination="paginationConfig">
         <!-- 操作 -->
         <template #action="{ record }">
-          <div style="color: #2d8cf0">
+          <div style="color: #2d8cf0" v-if="record.user_type !== 'Web'">
             <a-tooltip title="显示密码" v-if="!record.password">
               <EyeOutlined @click="onClickLookPassword(record.user_id)" />
             </a-tooltip>
@@ -129,8 +129,13 @@ const columns = [
     title: '密码',
     dataIndex: 'password',
     width: 100,
-    customRender: ({ text }: any) => {
-      return text || '****';
+    customRender: ({ text, record }: any) => {
+      console.log(record, 'record');
+      if (record.user_type === 'Web') {
+        return '--';
+      } else {
+        return text || '****';
+      }
     }
   },
   {