bill 6 months ago
parent
commit
d4783a7156
7 changed files with 82 additions and 22 deletions
  1. 13 4
      src/lang/en/log.ts
  2. 13 4
      src/lang/ja/log.ts
  3. 13 4
      src/lang/zh/log.ts
  4. 12 3
      src/views/project/edit.vue
  5. 15 1
      src/views/record/columns.ts
  6. 15 5
      src/views/scene/update.vue
  7. 1 1
      vite.config.ts

+ 13 - 4
src/lang/en/log.ts

@@ -1,5 +1,14 @@
 export default {
-    "logMsgLabel": "Notes",
-    "userNameLabel": "Operator",
-    "createTimeLabel": "Operation Time"
-}
+  logMsgLabel: 'Notes',
+  userNameLabel: 'Operator',
+  createTimeLabel: 'Operation Time',
+  ADD_BIM: '新增BIM:',
+  REMOVE_ANNOTATION: '删除标注:',
+  REMOVE_PROJECT_BIM: '删除项目->删除BIM:',
+  REMOVE_PROJECT_SCENE: '删除项目->删除场景:',
+  REMOVE_SCENE: '删除场景',
+  ADD_SCENE: '添加场景',
+  REMOVE_BIM_ONLY: '删除BIM:',
+  MODIFY_BIM_NAME: '修改BIM名称:',
+  SYNC_BIM_POSITION: '同步BIM位置'
+}

+ 13 - 4
src/lang/ja/log.ts

@@ -1,5 +1,14 @@
 export default {
-    "logMsgLabel": "備考",
-    "userNameLabel": "操作者",
-    "createTimeLabel": "操作時間"
-}
+  logMsgLabel: '備考',
+  userNameLabel: '操作者',
+  createTimeLabel: '操作時間',
+  ADD_BIM: '新增BIM:',
+  REMOVE_ANNOTATION: '删除标注:',
+  REMOVE_PROJECT_BIM: '删除项目->删除BIM:',
+  REMOVE_PROJECT_SCENE: '删除项目->删除场景:',
+  REMOVE_SCENE: '删除场景',
+  ADD_SCENE: '添加场景',
+  REMOVE_BIM_ONLY: '删除BIM:',
+  MODIFY_BIM_NAME: '修改BIM名称:',
+  SYNC_BIM_POSITION: '同步BIM位置'
+}

+ 13 - 4
src/lang/zh/log.ts

@@ -1,5 +1,14 @@
 export default {
-    "logMsgLabel": "备注",
-    "userNameLabel": "操作人",
-    "createTimeLabel": "操作时间"
-}
+  logMsgLabel: '备注',
+  userNameLabel: '操作人',
+  createTimeLabel: '操作时间',
+  ADD_BIM: '新增BIM',
+  REMOVE_ANNOTATION: '删除标注',
+  REMOVE_PROJECT_BIM: '删除项目->删除BIM',
+  REMOVE_PROJECT_SCENE: '删除项目->删除场景',
+  REMOVE_SCENE: '删除场景',
+  ADD_SCENE: '添加场景',
+  REMOVE_BIM_ONLY: '删除BIM',
+  MODIFY_BIM_NAME: '修改BIM名称',
+  SYNC_BIM_POSITION: '同步BIM位置'
+}

+ 12 - 3
src/views/project/edit.vue

@@ -125,10 +125,19 @@ const rules = {
 const fromRef = ref<FormInstance>()
 const visible = ref(true)
 
+let enter = false
 const saveHandler = async () => {
-  await fromRef.value?.validate()
-  await props.onSave(toRaw(project.value))
-  visible.value = false
+  if (enter) return
+  enter = true
+  try {
+    await fromRef.value?.validate()
+    await props.onSave(toRaw(project.value))
+    visible.value = false
+  } catch (e) {
+    throw e
+  } finally {
+    enter = false
+  }
 }
 </script>
 

+ 15 - 1
src/views/record/columns.ts

@@ -4,6 +4,7 @@ import { h } from 'vue'
 import type { Record } from '@/api'
 import type { ColumnsType } from 'ant-design-vue/es/table'
 import { ui18n } from '@/lang'
+import logLang from '@/lang/en/log'
 
 export const recordColumns: ColumnsType<Record> = [
   // {
@@ -22,7 +23,20 @@ export const recordColumns: ColumnsType<Record> = [
     dataIndex: 'logMsg',
     key: 'logMsg',
     customRender({ record }) {
-      return h(EasyText, { content: record.logMsg, maxLen: 50 })
+      const ndx = record.logMsg.indexOf(':')
+      const keys = Object.keys(logLang)
+      let m: string | null = null
+      let s = record.logMsg
+      for (const key of keys) {
+        const ndx = record.logMsg.indexOf(key)
+        if (ndx === 0) {
+          s = record.logMsg.substring(key.length)
+          m = key
+        }
+      }
+      const log = m ? ui18n.t(`log.${m}`) + s : s
+
+      return h(EasyText, { content: log, maxLen: 50 })
     }
   },
   {

+ 15 - 5
src/views/scene/update.vue

@@ -36,7 +36,7 @@ import { ui18n } from '@/lang'
 
 export type SaveData = Pick<Bim, 'bimName'> & { bimPath: string }
 
-defineOptions({ name: 'update-bim-scene' })
+defineOptions({ name: 'UpdateBimScene' })
 
 const props = defineProps<{
   bim: SaveData
@@ -47,14 +47,24 @@ const props = defineProps<{
 const bim = ref({ name: props.bim.bimName, file: props.bim.bimPath })
 const visible = ref(true)
 
+let enter = false
 const saveHandler = async () => {
+  if (enter) return
+  enter = true
   if (!bim.value.name) {
+    enter = false
     return message.error(ui18n.t('scene.nameRule'))
   } else {
-    await props.onSave({
-      bimName: bim.value.name,
-      bimPath: props.bim.bimPath
-    })
+    try {
+      await props.onSave({
+        bimName: bim.value.name,
+        bimPath: props.bim.bimPath
+      })
+    } catch (e) {
+      throw e
+    } finally {
+      enter = false
+    }
   }
   visible.value = false
 }

+ 1 - 1
vite.config.ts

@@ -18,7 +18,7 @@ export default async ({ mode }) => {
       rewrite: path => path.replace(/^\/dev/, '/dev')
     },
     '/api': {
-      target: 'https://test.4dkankan.com/',
+      target: 'https://testeur.4dkankan.com',
       changeOrigin: true,
       rewrite: path => path.replace(/^\/api/, '')
     },