Эх сурвалжийг харах

* 数字化施工国际化

chen.cheng 4 сар өмнө
parent
commit
371377b4af

+ 4 - 3
src/components/Breadcrumb/index.vue

@@ -2,8 +2,9 @@
   <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
       <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
-        <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{ getMenuName(item.meta)}}</span>
-        <a v-else @click.prevent="handleLink(item)">{{ getMenuName(item.meta)}}</a>
+        <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1"
+              class="no-redirect">{{ getMenuName(item.meta) }}</span>
+        <a v-else @click.prevent="handleLink(item)">{{ getMenuName(item.meta) }}</a>
       </el-breadcrumb-item>
     </transition-group>
   </el-breadcrumb>
@@ -38,7 +39,7 @@ export default {
       const first = matched[0]
 
       if (!this.isDashboard(first)) {
-        matched = [{path: '/index', meta: {title: '首页'}}].concat(matched)
+        matched = [{path: '/index', meta: {title: '首页', id: "index"}}].concat(matched)
       }
 
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)

+ 27 - 3
src/i18n/en.js

@@ -14,7 +14,14 @@ export default {
     importMessage: "Whether to update existing data?",
     importFileType: "Only {fileType} format files are allowed to be imported.",
     importModeMsg: "Drag your file here or Click.",
-    export: "Export"
+    export: "Export",
+    typeInfo: "Enter {name}",
+    search: "Search",
+    reset: "Reset",
+    expand_collapse: "Expand/Collapse",
+    updateTime: "Last Modified Time",
+    createTime: "Creation Time",
+    operation: 'Operation',
   },
   session: {
     invalid: "Invalid session, or session has expired, please log in again.",
@@ -82,8 +89,25 @@ export default {
     default: "Unknown system error, please report to the administrator"
   },
   cons: {
-    index: "id",
-    pileHoleImportTitle: "Pile hole CAD data import"
+    index: "Index",
+    pileHoleImportTitle: "Pile Point CAD Data Import",
+    cadAnalysis: "CAD File Parsing...",
+    unitName: "Unit Name",
+    uploadCAD: "Upload CAD File",
+    // 分配施工机械
+    assignMachine: "Assign Construction Machine",
+    // 下载竣工图纸 工程规范用词
+    downloadFinishDrawing: "Download As-built Drawings",
+    // 上级施工单元
+    parentUnit: "Parent Construction Unit",
+    // 创建类型
+    createType: "Creation Type",
+    // 节点类型
+    nodeType: "Node Type",
+    // 设计文件类型
+    designFileType: "Design Document Type",  // 强调文档属性
+    // 施工桩机
+    machine: "Piling Machine"  // 括号补充说明施工场景
   },
   login: {
     "title": "User Login",

+ 28 - 2
src/i18n/zh.js

@@ -14,7 +14,16 @@ export default {
     importMessage: "是否更新已经存在的数据?",
     importFileType: "仅允许导入{fileType}格式文件。",
     importModeMsg: "将文件拖到此处,或点击上传。",
-    export: "导出"
+    export: "导出",
+    typeInfo: "请输入{name}",
+    search: "搜索",
+    reset: "重置",
+    expand_collapse: "展开/折叠",
+    //修改时间
+    updateTime: "修改时间",
+    createTime: "创建时间",
+    operation: '操作',
+
   },
   login: {
     title: "用户登录",
@@ -100,7 +109,24 @@ export default {
   },
   cons: {
     index: "编号",
-    pileHoleImportTitle: "桩点CAD数据导入"
+    pileHoleImportTitle: "桩点CAD数据导入",
+    cadAnalysis: "CAD文件解析...",
+    unitName: "单元名称",
+    uploadCAD: "上传CAD文件",
+    // 分配施工机械
+    assignMachine: "分配施工机械",
+    // 下载竣工图纸
+    downloadFinishDrawing: "下载竣工图纸",
+    // 上级施工单元
+    parentUnit: "上级施工单元",
+    // 创建类型
+    createType: "创建类型",
+    // 节点类型
+    nodeType: "节点类型",
+    // 设计文件类型
+    designFileType: "设计文件类型",
+    // 施工桩机
+    machine: "施工桩机",
   },
   search: "搜索",
   // 个人中心  布局设置  退出登录

+ 85 - 53
src/views/cons/consUnit/index.vue

@@ -1,17 +1,22 @@
 <template>
-  <div class="app-container" v-loading="fileAnalysisLoading" :element-loading-text="'设计文件解析中...'">
+  <div class="app-container" v-loading="fileAnalysisLoading" :element-loading-text="$t('cons.cadAnalysis')">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="单元名称" prop="deptName">
+      <el-form-item :label="$t('cons.unitName')" prop="name">
         <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入单元名称"
+          v-model="queryParams.name"
+          :placeholder="$t('common.typeInfo',{
+            name: $t('cons.unitName')
+          })"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{
+            $t('common.search')
+          }}
+        </el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.reset') }}</el-button>
       </el-form-item>
     </el-form>
 
@@ -24,7 +29,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:dept:add']"
-        >新增
+        >
+          {{ $t('common.add') }}
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -34,7 +40,8 @@
           icon="el-icon-sort"
           size="mini"
           @click="toggleExpandAll"
-        >展开/折叠
+        >
+          {{ $t('common.expand_collapse') }}
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -48,66 +55,84 @@
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
-      <el-table-column label="施工单元名称" width="200" prop="name"/>
-      <el-table-column label="强夯类型" prop="penningType"/>
-      <el-table-column label="类型" prop="type"/>
-      <el-table-column label="设计文件类型" prop="classifyType"/>
-      <el-table-column label="修改时间" align="center" prop="updateTime" width="200">
+      <el-table-column :label="$t('cons.unitName')" width="200" prop="name"/>
+      <el-table-column :label="$t('cons.nodeType')" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.cons_unit_type" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('cons.designFileType')" prop="classifyType"/>
+      <el-table-column :label="$t('common.updateTime')" align="center" prop="updateTime" width="200">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updateTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+      <el-table-column :label="$t('common.createTime')" align="center" prop="createTime" width="200">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+
+      <el-table-column :label="$t('common.operation')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            v-if="scope.row.type==='2'"
             size="mini"
             type="text"
-            icon="el-icon-upload"
-            @click="handleImport(scope.row)"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dept:edit']"
           >
-            上传设计文件
+            {{
+              $t('common.edit')
+            }}
           </el-button>
           <el-button
-            v-if="scope.row.type==='2'"
             size="mini"
             type="text"
-            icon="el-icon-set-up"
-            @click="handleAssign(scope.row)"
-            v-hasPermi="['system:dept:edit']"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['system:dept:add']"
           >
-            分配施工机械
+            {{
+              $t('common.add')
+            }}
           </el-button>
           <el-button
+            v-if="scope.row.parentId != 0"
             size="mini"
             type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dept:edit']"
-          >修改
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:dept:remove']"
+          >
+            {{
+              $t('common.delete')
+            }}
           </el-button>
+          <br/>
           <el-button
+            v-if="scope.row.type==='2'"
             size="mini"
             type="text"
-            icon="el-icon-plus"
-            @click="handleAdd(scope.row)"
-            v-hasPermi="['system:dept:add']"
-          >新增
+            icon="el-icon-upload"
+            @click="handleImport(scope.row)"
+            v-hasPermi="['system:dept:edit']"
+          >
+            {{
+              $t('cons.uploadCAD')
+            }}
           </el-button>
           <el-button
-            v-if="scope.row.parentId != 0"
+            v-if="scope.row.type==='2'"
             size="mini"
             type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dept:remove']"
-          >删除
+            icon="el-icon-set-up"
+            @click="handleAssign(scope.row)"
+            v-hasPermi="['system:dept:edit']"
+          >
+            {{
+              $t('cons.assignMachine')
+            }}
           </el-button>
           <el-button
             v-if="scope.row.type==='2'"
@@ -116,7 +141,9 @@
             icon="el-icon-download"
             @click="handleExport(scope.row)"
           >
-            下载设计文件
+            {{
+              $t('cons.downloadFinishDrawing')
+            }}
           </el-button>
         </template>
       </el-table-column>
@@ -135,8 +162,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="施工单元名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入施工单元名称"/>
+            <el-form-item label="单元名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入单元名称"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -146,13 +173,13 @@
           </el-col>
         </el-row>
         <el-row>
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="强夯类型" prop="penningType">-->
+          <!--              <el-input v-model="form.penningType" placeholder="请输入强夯类型"/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
           <el-col :span="12">
-            <el-form-item label="强夯类型" prop="penningType">
-              <el-input v-model="form.penningType" placeholder="请输入强夯类型"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="类型" prop="type">
+            <el-form-item label="节点类型" prop="type">
               <el-select v-model="form.type" placeholder="请选择节点类型">
                 <el-option
                   v-for="dict in dict.type.cons_unit_type"
@@ -163,25 +190,30 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="设计文件类型" prop="classifyType">
               <el-input v-model="form.classifyType" placeholder="请输入设计文件类型"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-
-          </el-col>
         </el-row>
+        <!--        <el-row>-->
+        <!--          <el-col :span="12">-->
+        <!--            <el-form-item label="设计文件类型" prop="classifyType">-->
+        <!--              <el-input v-model="form.classifyType" placeholder="请输入设计文件类型"/>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="12">-->
+
+        <!--          </el-col>-->
+        <!--        </el-row>-->
         <el-row>
           <el-col :span="24">
             <el-form-item label="施工桩机" prop="toMachineId">
-              <el-select style="width: 100%" v-model="form.machineId" multiple placeholder="请选择桩机">
+              <el-select style="width: 100%" v-model="form.machineId" multiple placeholder="请选择施工桩机">
                 <el-option
                   v-for="machine in machineList"
                   :key="machine.id"
-                  :label="`${machine.machineNum}(${machine.equipment})`"
+                  :label="`${machine.machineNum}(${machine.name})`"
                   :value="machine.id"
                 ></el-option>
               </el-select>