From e9f07a50e85f5bd56633b8eb3b30ed02019550bb Mon Sep 17 00:00:00 2001 From: Vce Date: Sat, 13 Apr 2024 17:34:13 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=80=83=E8=AF=95?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=AD=A6=E4=B9=A0=E8=B5=84=E6=96=99=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../learningMaterial/learningMaterial.vue | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/views/projectFront/examSystem/learningMaterial/learningMaterial.vue b/src/views/projectFront/examSystem/learningMaterial/learningMaterial.vue index 3fb9556e..f5a3af9e 100644 --- a/src/views/projectFront/examSystem/learningMaterial/learningMaterial.vue +++ b/src/views/projectFront/examSystem/learningMaterial/learningMaterial.vue @@ -372,7 +372,7 @@ export default { cpsEleRecords: [], // 选修必修人员数组 studyCycle: [], // 表单日期时间范围 searchKeyWord: '', // 搜索关键字 - personType: 0, // 人员类型 + personType: 1, // 人员类型 userEnterpriseId: '1706588724057112577', // 用户所处企业Id(测试) projectSn: '', // 项目Sn @@ -429,10 +429,10 @@ export default { this.getExamSubjectList() // this.userEnterpriseId = this.$store.state.userInfo.userEnterpriseId; this.userEnterpriseId = "1706588724057112577";//测试用 - + this.personType = 1 // this.getTeamInfoList() // this.getDepartmentList() - this.loadData() // 查询班组及部门 + this.loadData() }, mounted() {}, watch:{ @@ -474,11 +474,11 @@ export default { listExamSubjectApi(data).then((res) => { if (res.code == 200) { this.examSubjectList = res.result - console.log('==========考试科目列表==========',this.listData) + console.log('==========考试科目列表==========',this.examSubjectList) } }) }, - async loadData(){ // 按顺序加载方法 查询班组及部门 + async loadData(){ // 按顺序加载方法 await this.getTeamInfoList() await this.getDepartmentList() // await this.getWorkerInfoList() @@ -722,8 +722,7 @@ export default { if(this.personType ===2) this.$refs.personTree2.filter(newArr); if(this.personType ===3) this.$refs.personTree3.filter(newArr); }, - async handleOpen() { // 打开弹窗 - this.personType = 1 + async handleOpen() { // 添加按钮 await this.getExamSubjectList() // this.getWorkerInfoList() await this.getLaborPersonList() From 54e776707b73f10ac210e35b61b65cbe5fef15b9 Mon Sep 17 00:00:00 2001 From: Vce Date: Mon, 15 Apr 2024 22:26:02 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=AE=B5=E9=80=89=E4=B8=AD=E9=BB=98=E8=AE=A4=E5=80=BC=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 4 ++-- src/views/projectFront/aiAnalysis/warningList.vue | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index f842ac40..81bde093 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -85,7 +85,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 - // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 + axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 @@ -93,7 +93,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 - axios.defaults.baseURL = 'http://47.93.215.234:9809/'//测试地址 + // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//测试地址 } else if (process.env.NODE_ENV == 'debug') { diff --git a/src/views/projectFront/aiAnalysis/warningList.vue b/src/views/projectFront/aiAnalysis/warningList.vue index 2e4a97d4..05c77aa8 100644 --- a/src/views/projectFront/aiAnalysis/warningList.vue +++ b/src/views/projectFront/aiAnalysis/warningList.vue @@ -15,6 +15,7 @@ v-model="dateRangeArr" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" + :default-time="['00:00:00', '23:59:59']" :range-separator="$t('message.sixComplete.to')" :start-placeholder="$t('message.sixComplete.start')" :end-placeholder="$t('message.sixComplete.end')" From ff3f9529fa79ddf30a642528f580a5d9e3ec8cd5 Mon Sep 17 00:00:00 2001 From: Vce Date: Thu, 18 Apr 2024 19:06:39 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=85=AC=E7=BD=91?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 3 ++- src/store/index.js | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 55018dc1..e1f7318c 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -84,8 +84,9 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 - axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 + // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 + axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁公网访问 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 diff --git a/src/store/index.js b/src/store/index.js index a2289373..c7beebc4 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,8 +48,10 @@ export default new Vuex.Store({ PAGESIZRS: [10, 20, 30, 50], // UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色 // FILEURL:' http://101.43.164.214:11111/image/',// 百色 - UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 - FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 + // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 + // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 + UPLOADURL:'http://jxj.zhgdyun.com:61212/upload/image/',// 郭圣雄 + FILEURL:'http://jxj.zhgdyun.com:61212/image/',//郭圣雄 WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地) // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试 // FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试 From 0ec2f7a18323ed5d204300303ede80280f474961 Mon Sep 17 00:00:00 2001 From: Vce Date: Fri, 19 Apr 2024 14:54:37 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/index.js | 4 ++-- src/views/projectFront/examSystem/trainRecord/trainRecord.vue | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index c7beebc4..413f32ab 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -50,8 +50,8 @@ export default new Vuex.Store({ // FILEURL:' http://101.43.164.214:11111/image/',// 百色 // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 - UPLOADURL:'http://jxj.zhgdyun.com:61212/upload/image/',// 郭圣雄 - FILEURL:'http://jxj.zhgdyun.com:61212/image/',//郭圣雄 + UPLOADURL:'http://jxj.zhgdyun.com:61212/upload/image/',// 彭杰公网 + FILEURL:'http://jxj.zhgdyun.com:61212/image/',//彭杰公网 WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地) // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试 // FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试 diff --git a/src/views/projectFront/examSystem/trainRecord/trainRecord.vue b/src/views/projectFront/examSystem/trainRecord/trainRecord.vue index 532239ad..f72a8b04 100644 --- a/src/views/projectFront/examSystem/trainRecord/trainRecord.vue +++ b/src/views/projectFront/examSystem/trainRecord/trainRecord.vue @@ -293,6 +293,7 @@ export default { }, } +