qiangmj / ebc-Mes

Commit 57c16976b425bab899d467aa618bc1b0b4b918ff

Authored by Min
1 parent c8f12186

1.处理MES表格标题悬浮提示英文-中文

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
src/components/Common/CommonTable/index.js
  View file @57c1697
... ... @@ -4575,7 +4575,7 @@ class CommonTableRc extends React.Component {
4575 4575 className={`th-div ${
4576 4576 column.bXunjianCheck ? styles.thXunjian : ""
4577 4577 }`}
4578   - title={`${column.chineseTitle}`}
  4578 + title={column.tipTitle}
4579 4579 style={styleObj}
4580 4580 >
4581 4581 {checkBoxAll}
... ...
src/utils/config.js
  View file @57c1697
... ... @@ -6,8 +6,8 @@ export const webSite = {
6 6 // faceAddress: isDev ? '//192.168.11.22:8080/xlyFace' : '//' + location.host + '/xlyFace',
7 7 fileAddress: isDev ? '//127.0.0.1:8080/xlyEntry/' : '//' + location.host + '/xlyReport/', // 接口地址
8 8 faceAddress: isDev ? '//172.19.18.26:8080/xlyFace' : '//' + location.host + '/xlyFace',
9   - ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//172.19.18.21:9543/xlyMes/' : '//' + location.host + '/xlyMes/',
10   - interfaceAddress: isDev ? '//127.0.0.1:8088/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址
  9 + ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//172.19.18.21:9543/xlyEntry/' : '//' + location.host + '/xlyEntry/',
  10 + interfaceAddress: isDev ? '//127.0.0.1:8088/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址1
11 11 // ipAddress: isDev ? '//ebc.jinjia.com:8091/xlyEntry/' : '//' + location.host + '/xlyEntry/',
12 12 // interfaceAddress: isDev ? '//ebc.jinjia.com:8091/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址
13 13 // ipAddress: isDev ? '//192.168.11.26:8080/xlyEntry/' : '//' + location.host + '/xlyEntry/',
... ...