From 4ac37c5d182334cd26344e9bb541b4bed55bc843 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 1 Dec 2020 18:50:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmapNew/config/skinCode/haerbin_01.js | 14 +++++-----
src/scripts/errorTip.js | 6 +++++
src/utils/baseUrl.js | 4 +--
.../competitionManage/bankList/index.vue | 27 ++++++++++---------
.../competitionManage/bankList/preImport.vue | 5 ++--
src/views/system/companyManage/manager.vue | 2 +-
6 files changed, 32 insertions(+), 26 deletions(-)
create mode 100644 src/scripts/errorTip.js
diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js
index b624b709f..57364c7a8 100644
--- a/src/jmapNew/config/skinCode/haerbin_01.js
+++ b/src/jmapNew/config/skinCode/haerbin_01.js
@@ -678,7 +678,7 @@ class SkinCode extends defaultStyle {
trainCrewNumOffset: { x:50, y: 25}
},
travelNum: {
- trainTravelNumOffset: { x:48, y:3}
+ trainTravelNumOffset: { x:9, y:3}
},
trainNumber: {
targetCodePrefix: '000', // 目的地码前缀
@@ -687,16 +687,16 @@ class SkinCode extends defaultStyle {
trainNumberOffset: { x: 48, y: 3 }// 目的地码偏移量
},
trainServer: {
- serviceNumberPrefix: '00', // 服务号(表号)前缀
- defaultServiceNumber: 'BB', // 默认服务号（表号）
- trainServerOffset: { x: 35, y: 3 }, // 列车服务号偏移
+ serviceNumberPrefix: '000', // 服务号(表号)前缀
+ defaultServiceNumber: 'BBB', // 默认服务号（表号）
+ trainServerOffset: { x: 33, y: 3 }, // 列车服务号偏移
fontColor: '#00C300'
},
trainTarget: {
- tripNumberPrefix: '000', // 车次号前缀
+ tripNumberPrefix: '00', // 车次号前缀
defaultDirectionCode: '', // 默认车次号1
- defaultTripNumber: 'CCC', // 默认车次号2
- trainTargetOffset: { x: 10, y: 3 }, // 列车车次号偏移
+ defaultTripNumber: 'CC', // 默认车次号2
+ trainTargetOffset: { x: 53, y: 3 }, // 列车车次号偏移
fontColor: '#00C300'
},
trainTargetNumber: {
diff --git a/src/scripts/errorTip.js b/src/scripts/errorTip.js
new file mode 100644
index 000000000..d08104b56
--- /dev/null
+++ b/src/scripts/errorTip.js
@@ -0,0 +1,6 @@
+export default {
+ 10002: '您权限已领取权限！',
+ 10003: '您的权限数量不足！',
+ 10013: '很抱歉，未查找到您的权限！',
+ 10014: '很抱歉，您的权限暂不可用！'
+};
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index c0569ef83..798608c73 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,11 +2,11 @@ export function getBaseUrl() {
let BASE_API;
if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud';
- BASE_API = 'https://test.joylink.club/jlcloud';
+ // BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.8.107:9000'; // 袁琪
// BASE_API = 'http://192.168.8.129:9000'; // 旭强
// BASE_API = 'http://192.168.8.119:9000'; // 张赛
- // BASE_API = 'http://192.168.8.110:9000'; // 杜康
+ BASE_API = 'http://192.168.8.110:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
// BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛
diff --git a/src/views/competitionManage/bankList/index.vue b/src/views/competitionManage/bankList/index.vue
index 12768ef3b..84700e212 100644
--- a/src/views/competitionManage/bankList/index.vue
+++ b/src/views/competitionManage/bankList/index.vue
@@ -310,20 +310,21 @@ export default {
},
exportTemplate() {
const wb = XLSX.utils.book_new();
- const data1 = [{A: '序号', B: '题型', C:'题目', D:'选项', E: '', F: '', G: '', H: '答案'}];
- const data2 = [{A: '', B: '', C:'', D:'A', E: 'B', F: 'C', G: 'D', H: ''}];
- const data3 = [{A: '1', B: '判断', C:'题目一', D:'', E: '', F: '', G: '', H: '√'}];
- const data4 = [{A: '2', B: '判断', C:'题目二', D:'', E: '', F: '', G: '', H: '×'}];
- const data5 = [{A: '3', B: '单选', C:'题目三', D:'选项A', E: '选项B', F: '选项C', G: '选项D', H: 'A'}];
- const data6 = [{A: '4', B: '多选', C:'题目四', D:'选项A', E: '选项B', F: '选项C', G: '选项D', H: 'ABCD'}];
- const data7 = [{A: '5', B: '填空', C:'题目五', D:'', E: '', F: '', G: '', H: '第一空答案&&第二空答案&&第三空答案'}];
- const data8 = [{A: '6', B: '问答', C:'题目六', D:'', E: '', F: '', G: '', H: '问答题答案'}];
- const data = [...data1, ...data2, ...data3, ...data4, ...data5, ...data6, ...data7, ...data8];
+ const data1 = [{A: '序号', B: '题型', C:'题目', D:'答案', E: '', F: '', G: '', H: ''}];
+ const data2 = [{A: '', B: '', C:'', D:'', E: 'A', F: 'B', G: 'C', H: 'D'}];
+ const data3 = [{A: '1', B: '判断', C:'题目一', D:'√', E: '', F: '', G: '', H: ''}];
+ const data4 = [{A: '2', B: '判断', C:'题目二', D:'×', E: '', F: '', G: '', H: ''}];
+ const data5 = [{A: '3', B: '单选', C:'题目三', D:'A', E: '选项A', F: '选项B', G: '选项C', H: '选项D'}];
+ const data6 = [{A: '4', B: '多选', C:'题目四', D:'ABCD', E: '选项A', F: '选项B', G: '选项C', H: '选项D'}];
+ // const data7 = [{A: '5', B: '填空', C:'题目五', D:'第一空答案&&第二空答案&&第三空答案', E: '', F: '', G: '', H: ''}];
+ // const data8 = [{A: '6', B: '问答', C:'题目六', D:'问答题答案', E: '', F: '', G: '', H: '问答题答案'}];
+ // const data = [...data1, ...data2, ...data3, ...data4, ...data5, ...data6, ...data7, ...data8];
+ const data = [...data1, ...data2, ...data3, ...data4, ...data5, ...data6];
const ws = XLSX.utils.json_to_sheet(data, {skipHeader:true});
ws['!merges'] = [
{
- s: {c: 3, r: 0},
- e: {c: 6, r: 0}
+ s: {c: 4, r: 0},
+ e: {c: 7, r: 0}
},
{
s: {c: 0, r: 0},
@@ -338,8 +339,8 @@ export default {
e: {c: 2, r: 1}
},
{
- s: {c: 7, r: 0},
- e: {c: 7, r: 1}
+ s: {c: 3, r: 0},
+ e: {c: 3, r: 1}
}
];
ws['!cols'] = [
diff --git a/src/views/competitionManage/bankList/preImport.vue b/src/views/competitionManage/bankList/preImport.vue
index f5b576de8..78334b35f 100644
--- a/src/views/competitionManage/bankList/preImport.vue
+++ b/src/views/competitionManage/bankList/preImport.vue
@@ -196,7 +196,6 @@ export default {
importQuestionBand(this.$store.state.race.preTheoryData, this.companyId).then(resp => {
this.$store.dispatch('race/setPreTheoryData', []);
// this.$message.success('导入题库成功!');
-
this.$alert(`本次导入：
${judgeNum}道判断题;
${selectNum}道选择题;
${multiNum}道多选题;
`, '导入题库成功!', {
dangerouslyUseHTMLString: true,
type: 'success',
@@ -204,8 +203,8 @@ export default {
});
this.$router.go(-1);
this.loading = false;
- }).catch(()=>{
- this.$message.error('导入题库失败！');
+ }).catch((error)=>{
+ this.$messageBox(error.message);
this.loading = false;
});
},
diff --git a/src/views/system/companyManage/manager.vue b/src/views/system/companyManage/manager.vue
index 1b3035883..d10cd935d 100644
--- a/src/views/system/companyManage/manager.vue
+++ b/src/views/system/companyManage/manager.vue
@@ -25,6 +25,7 @@ export default {
},
queryForm: {
labelWidth: '80px',
+ beforeQuery: this.addParams,
reset: true,
queryObject: {
name: {
@@ -43,7 +44,6 @@ export default {
},
queryList: {
query: getUserList,
- beforeQuery: this.addParams,
onSelectionChange: this.handleSelectionChange,
selectAllClick: this.selectAllClick,
selectCheckShow: true,