jinx %!s(int64=2) %!d(string=hai) anos
pai
achega
c0e16ba318

+ 10 - 1
public/__langs/locales/en.json

@@ -77,6 +77,12 @@
     "tag.name": "标注",
     "components.name": "组件",
     "header.name": "头部",
+    "toast": {
+        "clickLeft": "请先在左侧点击",
+        "clickTop": "请先在上方点击",
+        "ruleConfirmTips": "起点确定完毕,请定位终点"
+    },
+    "toast.name": "提示",
     "common": {
         "high": "高",
         "middle": "中",
@@ -94,7 +100,10 @@
         "sync": "sync",
         "deleteSuccess": "删除成功",
         "copySuccess": "复制成功",
-        "syncSuccess": "同步成功"
+        "syncSuccess": "同步成功",
+        "endPoint": "终点",
+        "startPoint": "起点",
+        "measure": "测量"
     },
     "common.name": "通用",
     "code": {

+ 10 - 1
public/__langs/locales/ja.json

@@ -77,6 +77,12 @@
     "tag.name": "标注",
     "components.name": "组件",
     "header.name": "头部",
+    "toast": {
+        "clickLeft": "请先在左侧点击",
+        "clickTop": "请先在上方点击",
+        "ruleConfirmTips": "起点确定完毕,请定位终点"
+    },
+    "toast.name": "提示",
     "common": {
         "high": "高",
         "middle": "中",
@@ -94,7 +100,10 @@
         "sync": "同步",
         "deleteSuccess": "删除成功",
         "copySuccess": "复制成功",
-        "syncSuccess": "同步成功"
+        "syncSuccess": "同步成功",
+        "endPoint": "终点",
+        "startPoint": "起点",
+        "measure": "测量"
     },
     "common.name": "通用",
     "code": {

+ 10 - 1
public/__langs/locales/zh.json

@@ -77,6 +77,12 @@
     "tag.name": "标注",
     "components.name": "组件",
     "header.name": "头部",
+    "toast": {
+        "clickLeft": "请先在左侧点击",
+        "clickTop": "请先在上方点击",
+        "ruleConfirmTips": "起点确定完毕,请定位终点"
+    },
+    "toast.name": "提示",
     "common": {
         "high": "高",
         "middle": "中",
@@ -94,7 +100,10 @@
         "sync": "同步",
         "deleteSuccess": "删除成功",
         "copySuccess": "复制成功",
-        "syncSuccess": "同步成功"
+        "syncSuccess": "同步成功",
+        "endPoint": "终点",
+        "startPoint": "起点",
+        "measure": "测量"
     },
     "common.name": "通用",
     "code": {

+ 10 - 1
src/locales/en.json

@@ -77,6 +77,12 @@
     "tag.name": "标注",
     "components.name": "组件",
     "header.name": "头部",
+    "toast": {
+        "clickLeft": "请先在左侧点击",
+        "clickTop": "请先在上方点击",
+        "ruleConfirmTips": "起点确定完毕,请定位终点"
+    },
+    "toast.name": "提示",
     "common": {
         "high": "高",
         "middle": "中",
@@ -94,7 +100,10 @@
         "sync": "sync",
         "deleteSuccess": "删除成功",
         "copySuccess": "复制成功",
-        "syncSuccess": "同步成功"
+        "syncSuccess": "同步成功",
+        "endPoint": "终点",
+        "startPoint": "起点",
+        "measure": "测量"
     },
     "common.name": "通用",
     "code": {

+ 10 - 1
src/locales/ja.json

@@ -77,6 +77,12 @@
     "tag.name": "标注",
     "components.name": "组件",
     "header.name": "头部",
+    "toast": {
+        "clickLeft": "请先在左侧点击",
+        "clickTop": "请先在上方点击",
+        "ruleConfirmTips": "起点确定完毕,请定位终点"
+    },
+    "toast.name": "提示",
     "common": {
         "high": "高",
         "middle": "中",
@@ -94,7 +100,10 @@
         "sync": "同步",
         "deleteSuccess": "删除成功",
         "copySuccess": "复制成功",
-        "syncSuccess": "同步成功"
+        "syncSuccess": "同步成功",
+        "endPoint": "终点",
+        "startPoint": "起点",
+        "measure": "测量"
     },
     "common.name": "通用",
     "code": {

+ 2 - 1
src/locales/zh.json

@@ -102,7 +102,8 @@
     "copySuccess": "复制成功",
     "syncSuccess": "同步成功",
     "endPoint": "终点",
-    "startPoint": "起点"
+    "startPoint": "起点",
+    "measure": "测量"
   },
   "common.name": "通用",
   "code": {

+ 1 - 0
src/pages/DesignOption/measure.scss

@@ -71,6 +71,7 @@
         padding: 0 10px;
         word-break: keep-all;
         list-style: none;
+        color: #fff;
     }
 }
 

+ 0 - 7
src/pages/Rules/index.vue

@@ -1,12 +1,5 @@
 <!--  -->
 <template>
-    <!-- <div class="rules-box">
-        <ui-button :class="{ disabled: !next }" type="primary" @click="confirmRules"
-            >{{ $t('common.confirm') }}{{ rulesIndex >= 2 ? $t('common.endPoint') : $t('common.startPoint') }}({{ rulesIndex }}/2)</ui-button
-        >
-        <ui-button type="cancel" @click="cancelRules">{{ $t('common.cancel') }}</ui-button>
-    </div> -->
-
     <div class="rules-box">
         <button class="ui-button primary" @click="confirmRules" :class="{ disabled: !next }">{{ rulesIndex >= 2 ? $t('common.endPoint') : $t('common.startPoint') }}({{ rulesIndex }}/2)</button
         ><button class="ui-button cancel" @click="cancelRules">{{ $t('common.cancel') }}</button>

+ 1 - 3
src/pages/Viewer.vue

@@ -81,7 +81,7 @@
                 <div class="rule" :class="{ active: fileChecked, disable: fileDisable }" v-show="!fscChecked && !showBim && !dbsChecked && !bimChecked">
                     <div @click="onRuleChecked">
                         <i class="iconfont icon-note1"></i>
-                        <span>标尺</span>
+                        <span>{{ $t('common.measure') }}</span>
                     </div>
                 </div>
                 <div class="bim" :class="{ active: bimChecked, disable: bimDisable }" v-show="!fscChecked && !showBim">
@@ -554,8 +554,6 @@ const onP2Click = type => {
     flyToP1P2(points.value.p2)
 }
 const onRuleChecked = () => {
-    
-
     showRules.value = true
     window.kankan.TagManager.startMeasure()