修复部分国际化功能代码

imcs-ui/src/views/zuihou/resourceProductMgr/resourcesMgr/Index.vue

@@ -145,7 +145,7 @@
 	            @click="autoCode(row)"
 	          />
           </el-tooltip>
-          <el-tooltip class="item" content='详情配置' effect="dark" placement="top-start">
+          <el-tooltip class="item" :content='$t("resource.buttons.detailConf")' effect="dark" placement="top-start">
 	          <i
 	            class="el-icon-guide table-operation"
 	            style="color: #f50;"

imcs-ui/src/views/zuihou/resourceProductMgr/resourcesMgr/components/AutoCode.vue

@@ -32,7 +32,7 @@
 	  <el-table-column prop="isFinal" label='是否线终序' align="center" width="150px">
 		  <template slot-scope="{ row }">
           <el-tag>
-          	{{ row.isFinal=='1' ? "是" : "否" }}
+          	{{ row.isFinal=='1' ? $t("common.yes") : $t("common.no") }}
           </el-tag>
         </template>
 	  </el-table-column>    

imcs-ui/src/views/zuihou/resourceProductMgr/resourcesMgr/components/AutoCodeEdit.vue

@@ -20,7 +20,7 @@
       </el-form-item>
       <el-form-item label='父节点:'  v-show="isShow">
             <template>
-                <el-select v-model="tenant.parentId" placeholder="请选择" >
+                <el-select v-model="tenant.parentId" :placeholder='$t("common.pleaseSelect")' >
                     <el-option
                             v-for="item in parentIds"
                             :key="item.id"
@@ -55,7 +55,7 @@
                             </el-form-item>  
                             <el-form-item label='节点:'>
                                 <template>
-                                    <el-select v-model="tenant.command" placeholder="请选择">
+                                    <el-select v-model="tenant.command" :placeholder='$t("common.pleaseSelect")'>
                                         <el-option
                                                 v-for="item in machineNodes"
                                                 :key="item.value"
@@ -76,7 +76,7 @@
                             </el-form-item>                              
                             <el-form-item label='终点:'>
                                 <template>
-                                    <el-select v-model="tenant.targetId" placeholder="请选择">
+                                    <el-select v-model="tenant.targetId" :placeholder='$t("common.pleaseSelect")'>
                                         <el-option
                                                 v-for="item in agvNodes"
                                                 :key="item.value"
@@ -92,7 +92,7 @@
                           <div v-if=" tenant.category=='3' " >                             
                             <el-form-item label='机械手搬运设备:'>
                                 <template>
-                                    <el-select v-model="tenant.resourceId" placeholder="请选择">
+                                    <el-select v-model="tenant.resourceId" :placeholder='$t("common.pleaseSelect")'>
                                         <el-option
                                                 v-for="item in robotNodes"
                                                 :key="item.value"
@@ -104,7 +104,7 @@
                             </el-form-item> 
                             <el-form-item label='节点:'>
                                 <template>
-                                    <el-select v-model="tenant.command" placeholder="请选择" @change="actionChange">
+                                    <el-select v-model="tenant.command" :placeholder='$t("common.pleaseSelect")' @change="actionChange">
                                         <el-option
                                                 v-for="item in robotAction"
                                                 :key="item.value"
@@ -122,7 +122,7 @@
                             <el-form-item label='放目标:' v-show="!actionShow">
                                  <template>                                                                            
                                       <span v-if="!codeData.isFinal">本位置</span>                                     
-                                      <el-select v-if="codeData.isFinal"  v-model="tenant.targetId" placeholder="请选择">
+                                      <el-select v-if="codeData.isFinal"  v-model="tenant.targetId" :placeholder='$t("common.pleaseSelect")'>
                                         <el-option
                                                 v-for="item in actionTarget"
                                                 :key="item.value"
@@ -233,9 +233,9 @@ export default {
         command:'',
         resourceId:'',
         parentId: '',
-        startId:'',
-        targetId:'',
-        remark:'',
+        startId: '',
+        targetId: '',
+        remark: ''
       }
     },
     initWidth () {

imcs-ui/src/views/zuihou/resourceProductMgr/resourcesMgr/components/TenantCodeEdit.vue

@@ -73,6 +73,13 @@
           </template>
       </el-table-column> 
       <el-table-column prop="weight" label='权重' align="center" width="80px"></el-table-column>
+      <el-table-column prop="status" :label='$t("common.status.init")' align="center" width="80px">
+      	<template slot-scope="{ row }">
+          <el-tag :type="row.status=='1' ? 'danger' : 'success'">
+          	{{ row.status=='1' ? $t("common.status.valid") : $t("common.status.invalid") }}
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column
         :label="$t('table.operation')"
         fixed="right"
@@ -207,6 +214,7 @@ export default {
     addCode () {
 	      this.$refs.editCode.type = "add"
 	      this.$refs.editCode.setTenant(false, this.codeData)
+        this.$refs.editCode.switcher('0')
 	      this.msgBox.title = "新增节点"
 	      this.msgBox.isVisible = true
 	  },