gemercheung il y a 1 an
Parent
commit
5084ccb5f6
3 fichiers modifiés avec 16 ajouts et 12 suppressions
  1. 4 1
      src/views/map/addProjectModal.vue
  2. 11 10
      src/views/map/index.vue
  3. 1 1
      src/views/map/list.vue

+ 4 - 1
src/views/map/addProjectModal.vue

@@ -29,7 +29,10 @@
   import { useI18n } from '/@/hooks/web/useI18n';
   import { AddOptOrUpdateApi, ListAllGpsApi } from '/@/api/mapOpt/list';
   import { uniqBy } from 'lodash-es';
+  import { useLocaleStore } from '/@/store/modules/locale';
 
+  const localeStore = useLocaleStore();
+  const isJA = computed(() => localeStore.getLocale === 'ja');
   const { t } = useI18n();
 
   export default defineComponent({
@@ -179,7 +182,7 @@
 
       const [registerForm, { setFieldsValue, resetFields, validate, getFieldsValue }] = useForm({
         schemas: schemas,
-        labelWidth: 100,
+        labelWidth: isJA.value ? 130 : 100,
         showActionButtonGroup: false,
 
         actionColOptions: {

+ 11 - 10
src/views/map/index.vue

@@ -358,16 +358,17 @@
         return mapper;
       });
     console.log('list', list);
-    if (list.length === 0) {
-      const project = getMarkerData(data);
-      project.forEach((pro: any) => {
-        pro.isPro = true;
-      });
-      console.log('project', project);
-      return project;
-    } else {
-      return list;
-    }
+    // if (list.length === 0) {
+    //   const project = getMarkerData(data);
+    //   project.forEach((pro: any) => {
+    //     pro.isPro = true;
+    //   });
+    //   console.log('project', project);
+    //   return project;
+    // } else {
+    //   return list;
+    // }
+    return list;
   };
   const getMarkerData = (data) => {
     return data.map((item) => {

+ 1 - 1
src/views/map/list.vue

@@ -139,7 +139,7 @@
           width: 200,
         },
         {
-          title: t('layout.map.isShow'),
+          title: t('layout.map.homeShow'),
           dataIndex: 'isShow',
           slots: { customRender: 'isShow' },
           width: 100,