diff --git a/src/components/Common/AffixMenu.js b/src/components/Common/AffixMenu.js
index 5c0ff0b..a61f588 100644
--- a/src/components/Common/AffixMenu.js
+++ b/src/components/Common/AffixMenu.js
@@ -349,7 +349,12 @@ class AffixMenuComponent extends Component {
const columniFitWidth = commonFunc.showMessage(app.commonConst, 'columniFitWidth');/* 宽度 */
const columnbVisible = commonFunc.showMessage(app.commonConst, 'columnbVisible');/* 是否显示 */
const columnsName = commonFunc.showMessage(app.commonConst, 'columnsName');/* 字段名 */
+ const columnsReadOnly = commonFunc.showMessage(app.commonConst, 'columnsReadOnly') || '是否只读';/* 是否自读 */
+ const columnsFontColor = commonFunc.showMessage(app.commonConst, 'columnsFontColor') || '字体颜色';/* 字体颜色 */
const isDefault = commonFunc.showMessage(app.commonConst, 'isDefault');/* 是否设置默认 */
+ const BtnSure = commonFunc.showMessage(app.commonConst, 'BtnSure') || '确认';/* 按钮确认 */
+ const BtnCancel = commonFunc.showMessage(app.commonConst, 'BtnCancel') || '取消';/* 按钮取消 */
+ const selectAll = commonFunc.showMessage(app.commonConst, 'selectAll') || '全选';/* 全选 */
// eslint-disable-next-line no-unused-vars
Object.keys(modalData).forEach((child, i) => {
const splitArr = commonUtils.isNotEmptyObject(child) && commonUtils.isNotEmptyArr(child.split('_')) ? child.split('_') : [];
@@ -404,11 +409,11 @@ class AffixMenuComponent extends Component {
visible += 1;
}
}
- checkAll = 全选 this.onCheckAll(e, child, count, configId)} />;
+ checkAll = {selectAll} this.onCheckAll(e, child, count, configId)} />;
}
if (this.props.app.userinfo.sType === 'sysadmin' || true) { /* 管理员设置列是否可修改 */
columns.push({
- title: '是否只读',
+ title: columnsReadOnly,
dataIndex: 'bReadonly',
render: (text, record) => this.renderColumns(text, 'bReadonly', configId, record),
width: 80,
@@ -416,7 +421,7 @@ class AffixMenuComponent extends Component {
}
if (this.props.app.userinfo.sType === 'sysadmin' || true) { /* 管理员设置列颜色 */
columns.push({
- title: '字体颜色',
+ title: columnsFontColor,
dataIndex: 'sFontColor',
render: (text, record) => this.renderColumns(text, 'sFontColor', configId, record),
width: 80,
@@ -484,6 +489,8 @@ class AffixMenuComponent extends Component {
onCancel={this.handlePpopUpPaneCancel.bind(this)}
onOk={this.handleOk.bind(this)}
width={1000}
+ okText={BtnSure}
+ cancelText={BtnCancel}
>
{
diff --git a/src/components/Common/CommonBase.js b/src/components/Common/CommonBase.js
index a8ccabe..5eeab52 100644
--- a/src/components/Common/CommonBase.js
+++ b/src/components/Common/CommonBase.js
@@ -981,6 +981,9 @@ export default (ChildComponent) => {
* 原代码:
*/
let billNum = '';
+ let footTotalStr = '';
+ const footTotal =commonFunc.showMessage(this.props.app.commonConst, 'footTotal') ||
+ '当前显示 共${billNum}个单据 共${total}条记录';
if (dataReturn.dataset.billNum) {
billNum = `共${dataReturn.dataset.billNum}个单据 `;
}
@@ -993,8 +996,9 @@ export default (ChildComponent) => {
current: dataReturn.dataset.currentPageNo,
pageSize: pageSize,
showTotal: (total) => {
+ footTotalStr = footTotal.replace('${billNum}', dataReturn.dataset.billNum).replace('${total}', total);
return (
-
{`当前显示 ${billNum}共${total}条记录`}
+
{footTotalStr}
);
},
};
diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js
index 694c5a0..598bd7b 100644
--- a/src/components/Common/CommonTable/index.js
+++ b/src/components/Common/CommonTable/index.js
@@ -2858,6 +2858,7 @@ class CommonTableRc extends React.Component {
let sAlumitePopup = false; /* 选择电化铝 */
let bCopyMore = false; /* 复制多行 */
let bReplace = false; /* 替换数据 */
+ const setOperation = commonFunc.showMessage(props.app.commonConst, 'operation') || '操作';
const bShowTreeAdd = props.tableProps.bShowTreeAdd && this.findIsExistByControlName(props, 'BtnAdd'); /* 添加树节点 */
const bShowTreeAddChild = props.tableProps.bShowTreeAddChild && this.findIsExistByControlName(props, 'BtnAddChildNode'); /* 添加树节点 */
const bShowTreeDel = props.tableProps.bShowTreeDel && this.findIsExistByControlName(props, 'BtnDel'); /* 添加树节点 */
@@ -3185,7 +3186,7 @@ class CommonTableRc extends React.Component {
style={{
width: '100%', height: '100%', display: 'flex', justifyContent: 'left', textDecoration: 'none',
}}
- >操作 {uploadIcon ?
+ >{setOperation} {uploadIcon ?
{this.uploadRef1 = ref;}}
@@ -4344,6 +4345,8 @@ class CommonTableRc extends React.Component {
const { tableColumn, totalData, totalData1 } = this.state;
const { dNetMoney, dNetPrice } = this.props.app.decimals;
const sModelsType = commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ? this.props.app.currentPane.sModelsType : '';
+ const sumset = commonFunc.showMessage(this.props.app.commonConst, 'sumSet') || '合计';
+
let colSpan = 0;
if ((!totalData.length && !totalData1.length) || this.props.footer !== undefined) {
return (<>>);
@@ -4363,7 +4366,7 @@ class CommonTableRc extends React.Component {
let summaryCellTotal = '';
summaryCellTotal = (
- 合计
+ {sumset}
);
// if(this.props.slaveInfo) {
diff --git a/src/components/Common/PersonCenter/PersonCenter.js b/src/components/Common/PersonCenter/PersonCenter.js
index 1de4698..613beb0 100644
--- a/src/components/Common/PersonCenter/PersonCenter.js
+++ b/src/components/Common/PersonCenter/PersonCenter.js
@@ -115,8 +115,9 @@ class PersonCenter extends Component {
};
dispatch({ type: 'app/addPane', payload: { pane } });
} else if (e.key === 'clearOption') {
+ const recordDeletion = commonFunc.showMessage(this.props.app.commonConst, 'recordDeletion') || '记录删除';/* 人脸采集 */
sessionStorage.clear();
- this.clearSocket({ optName: '记录删除' });
+ this.clearSocket({ optName: recordDeletion });
commonUtils.clearStoreDropDownData();
} else if (e.key === 'about') {
this.handleShowAbout();
@@ -858,7 +859,8 @@ const PersonCenterOnlineUser = Form.create({
onlineUserState = {},
onExitTbRow,
} = props;
- const OnlineUserName = '在线用户';
+ const OnlineUsers = commonFunc.showMessage(props.app.commonConst, 'OnlineUsers');/* 在线用户 */
+ const OnlineUserName = { OnlineUsers };
// const ModifyPassword = commonFunc.showMessage(app.commonConst, 'ModifyPassword');/* 修改密码 */
const onlineUserDataNew = commonUtils.isNotEmptyObject(onlineUserData) ? onlineUserData : {};
const onlineUserConfig = {
diff --git a/src/components/FaceDetect/index.js b/src/components/FaceDetect/index.js
index f8f0243..d66842c 100644
--- a/src/components/FaceDetect/index.js
+++ b/src/components/FaceDetect/index.js
@@ -6,6 +6,7 @@ import { Progress, message } from 'antd-v4';
import * as commonServices from "../../services/services";
import config from '@/utils/config';
import './index.less';
+import * as commonFunc from "../Common/commonFunc";
let token = '92d3bf5f3edcb55c731acb11b7f28202'; // 测试的删除token
@@ -407,7 +408,8 @@ class FaceDetect extends Component {
render() {
const enable = ((this.props.enabled && this.user_id !== '' )|| this.props.actionType === 'identifyFace');
- return (
+ const faceCollection = commonFunc.showMessage(this.props.app.commonConst, 'faceCollection') || '人脸采集';/* 人脸采集 */
+ return (
<>
@@ -420,21 +422,28 @@ class FaceDetect extends Component {
{this.state.statusContent}
- {
- (this.state.currentPercent > 0) &&
- { this.state.thumbImg !== '' &&

}
+ {this.state.thumbImg !== "" &&

}
-
+
this.handleEvent(enable)} className="action-item">
- 人脸采集
+ {faceCollection}
@@ -447,7 +456,7 @@ class FaceDetect extends Component {
{/*
*/}
{/*
*/}
>
- )
+ );
}
}
diff --git a/src/routes/tab/tab.js b/src/routes/tab/tab.js
index e6640f7..3f8a528 100644
--- a/src/routes/tab/tab.js
+++ b/src/routes/tab/tab.js
@@ -75,6 +75,7 @@ import CommonNewListBill from "@/routes/common/commonNewListBill"; /* 通用单
import CommonGroupBill from "@/routes/common/commonGroupBill"; /* 通用单据页 */
import PrintPdf from "../printPdf/printPdf"; /* 单预览 */
import Feedback from '../feedback/feedback';
+import * as commonFunc from "@/components/Common/commonFunc";
/* 计算方案s */
const { confirm } = Modal;
const { TabPane } = Tabs;
@@ -269,9 +270,12 @@ function Tab({ dispatch, app }) {
}
}
if (app.diffMap && removePane[0] && app.diffMap.get(removePane[0].key)) {
+ const contentStr = commonFunc.showMessage(app.commonConst, 'isLeave') || '内容未保存,是否离开?';/* 内容未保存,是否离开? */
+ const BtnSure = commonFunc.showMessage(app.commonConst, 'BtnSure') || '确认';/* 按钮确认 */
+ const BtnCancel = commonFunc.showMessage(app.commonConst, 'BtnCancel') || '取消';/* 按钮取消 */
confirm({
icon: ,
- content: "内容未保存,是否离开?",
+ content: contentStr,
onOk() {
removeData.forEach(i => {
clearWebSocketMsg(i);
@@ -281,6 +285,8 @@ function Tab({ dispatch, app }) {
onCancel() {
console.log("取消关闭");
},
+ okText:BtnSure,
+ cancelText:BtnCancel
});
} else {
removeData.forEach(i => {