Explorar o código

fix:设备资源优化库位名称显示

wang.sq@aliyun.com hai 5 meses
pai
achega
5352545960

BIN=BIN
imcs-ui/public/1706756784716.bak.jpg


BIN=BIN
imcs-ui/public/1706756784716.jpg


+ 1 - 1
imcs-ui/public/index.html

@@ -9,7 +9,7 @@
       content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
     />
     <link rel="icon" href="<%= BASE_URL %>logo.ico" />
-    <title>图南股份</title>
+    <title>中国航空发动机集团</title>
     <script>
       var _hmt = _hmt || [];
       (function() {

BIN=BIN
imcs-ui/public/logo.bak.ico


BIN=BIN
imcs-ui/public/logo.ico


BIN=BIN
imcs-ui/src/assets/logo/logo.bak.png


BIN=BIN
imcs-ui/src/assets/logo/logo.png


+ 2 - 1
imcs-ui/src/lang/zh/resource.js

@@ -171,7 +171,8 @@ export default {
 			// 【设备位置管理】列表table字段名称
 			eqPosition: {
 				no: '位置编号',
-				name: '名称',
+				name: '点位名称',
+				storgeName: '库位名称',
 				pointId: '点位ID',
 				status: '锁定状态'
 			},

+ 3 - 3
imcs-ui/src/lang/zh/zh.js

@@ -105,15 +105,15 @@ export default {
 	      social: '第三方账号登录'
 	    },
 	    shuoming: {
-	    	title: '图南股份',
+	    	title: '中国航发',
 	    	tips: '自动化平台'
 	    },
       shuoming2: {
-	    	title: '图南股份',
+	    	title: '中国航发',
 	    	tips: '舱体线平台'
 	    },
       shuoming3: {
-	    	title: '图南股份',
+	    	title: '中国航发',
 	    	tips: '框体线平台'
 	    }
   	},

+ 2 - 1
imcs-ui/src/views/zuihou/resourceProductMgr/equipmentPosition/Index.vue

@@ -63,8 +63,9 @@
       </el-table-column>
       <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
       <el-table-column prop="no" :label='$t("resource.table.eqPosition.no")' width="180px"></el-table-column>
-      <el-table-column prop="name" :label='$t("resource.table.eqPosition.name")' :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="name" :label='$t("resource.table.eqPosition.name")' :show-overflow-tooltip="true" ></el-table-column>
       <el-table-column prop="pointId" :label='$t("resource.table.eqPosition.pointId")' :show-overflow-tooltip="true" width="100px"></el-table-column>
+      <el-table-column prop="storgeName" :label='$t("resource.table.eqPosition.storgeName")' :show-overflow-tooltip="true" width="140px"></el-table-column>
       <el-table-column prop="status" :label='$t("resource.table.eqPosition.status")' align="center" width="90px">
       	<template slot-scope="{ row }">
           <el-tag :type="row.status=='1' ? 'danger' : 'success'">