diff --git a/src/assets/i18n/langs/cn/companyAdmin/extendInfo.js b/src/assets/i18n/langs/cn/companyAdmin/extendInfo.js index 42774a65..62294d30 100644 --- a/src/assets/i18n/langs/cn/companyAdmin/extendInfo.js +++ b/src/assets/i18n/langs/cn/companyAdmin/extendInfo.js @@ -1,3 +1,4 @@ +const newLocal = '总投资额(万元)'; export default { projectExtension:'项目扩展信息表', contractSigning:'合同签订', @@ -18,6 +19,9 @@ export default { editProjectFormRules: { contractPrice: [ { required: true, message: "请输入合同额", trigger: "change" }, + ], + investmentPrice: [ + { required: true, message: "请输入投资额", trigger: "change" }, ], contractSignTime: [ { required: true, message: "请选择合同签订日期", trigger: "change" }, @@ -48,5 +52,6 @@ export default { ], }, modifySuccessfully:"修改成功", - contractPrice:'合同额(万元)' + contractPrice:'施工合同额(万元)', + investmentPrice:'总投资额(万元)' } \ No newline at end of file diff --git a/src/assets/i18n/langs/en/cooperationUnit.js b/src/assets/i18n/langs/en/cooperationUnit.js index f30efa87..a982ee16 100644 --- a/src/assets/i18n/langs/en/cooperationUnit.js +++ b/src/assets/i18n/langs/en/cooperationUnit.js @@ -31,4 +31,5 @@ subpackage9:'总承包单位', subpackage10:'勘查单位', subpackage11:'设计单位', subpackage12:'其它', +subpackage13:'全部类型', } \ No newline at end of file diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 6778e31c..1d5eb6a7 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -84,10 +84,10 @@ 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://182.90.224.237:51234' //郭圣雄远程 - // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 + axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 diff --git a/src/store/index.js b/src/store/index.js index 6b73c4f7..771de580 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -61,18 +61,18 @@ export default new Vuex.Store({ // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 // FILEURL:'http://42.180.188.17:11211/image/',//测试 - // BASEURL: baseUrl - // ? baseUrl - // : window.location.protocol + "//" + window.location.host + "/", //正式环境 - // UPLOADURL: - // window.location.protocol + - // "//" + - // window.location.host + - // "/upload/image", //正式环境 - // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 + BASEURL: baseUrl + ? baseUrl + : window.location.protocol + "//" + window.location.host + "/", //正式环境 + UPLOADURL: + window.location.protocol + + "//" + + window.location.host + + "/upload/image", //正式环境 + FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) - // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址 + WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址 // WORKFLOWURL: 'http://42.180.188.17:19098/#/workspace/forms',//鞍钢测试平台工作流地址 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl diff --git a/src/views/jxjadmin/registerAudit.vue b/src/views/jxjadmin/registerAudit.vue index 2e07175b..bf108c66 100644 --- a/src/views/jxjadmin/registerAudit.vue +++ b/src/views/jxjadmin/registerAudit.vue @@ -220,7 +220,7 @@ - +
diff --git a/src/views/projectFront/carManage/carManage.vue b/src/views/projectFront/carManage/carManage.vue index 4cce1ee5..f9e05c05 100644 --- a/src/views/projectFront/carManage/carManage.vue +++ b/src/views/projectFront/carManage/carManage.vue @@ -783,6 +783,7 @@ diff --git a/src/views/projectFront/dangerousBigProject/addPlan.vue b/src/views/projectFront/dangerousBigProject/addPlan.vue index 396a42a4..efc1d26c 100644 --- a/src/views/projectFront/dangerousBigProject/addPlan.vue +++ b/src/views/projectFront/dangerousBigProject/addPlan.vue @@ -95,8 +95,8 @@ :props="props" clearable> --> - - + - + - + diff --git a/src/views/projectFront/emergencyDisposal/emergencyDisposal.vue b/src/views/projectFront/emergencyDisposal/emergencyDisposal.vue index c690d8da..4f71d731 100644 --- a/src/views/projectFront/emergencyDisposal/emergencyDisposal.vue +++ b/src/views/projectFront/emergencyDisposal/emergencyDisposal.vue @@ -4,7 +4,7 @@
- + diff --git a/src/views/projectFront/emergencyDisposal/emergencyPush.vue b/src/views/projectFront/emergencyDisposal/emergencyPush.vue index eb811384..87c39a51 100644 --- a/src/views/projectFront/emergencyDisposal/emergencyPush.vue +++ b/src/views/projectFront/emergencyDisposal/emergencyPush.vue @@ -4,7 +4,7 @@
- + diff --git a/src/views/projectFront/emergencyDisposal/reliefApprove.vue b/src/views/projectFront/emergencyDisposal/reliefApprove.vue index 14e3e097..395a4d3a 100644 --- a/src/views/projectFront/emergencyDisposal/reliefApprove.vue +++ b/src/views/projectFront/emergencyDisposal/reliefApprove.vue @@ -4,7 +4,7 @@
- + diff --git a/src/views/projectFront/examSystem2/examManagement/examManagement.vue b/src/views/projectFront/examSystem2/examManagement/examManagement.vue index ed444c61..06874568 100644 --- a/src/views/projectFront/examSystem2/examManagement/examManagement.vue +++ b/src/views/projectFront/examSystem2/examManagement/examManagement.vue @@ -83,7 +83,7 @@
手动抽题
-
+
随机抽题
@@ -575,11 +575,11 @@ export default { "randomQuestion.name"(){ console.log(this.randomQuestion.name); this.clearFilter(); - this.getList({ - pageNo: 1, - pageSize: 99999, - questionName: "", - questionSubjectId: this.randomQuestion.name, + this.getList({ + pageNo: 1, + pageSize: 99999, + questionName: "", + questionSubjectId: this.randomQuestion.name, }) }, }, @@ -595,6 +595,15 @@ export default { // this.loadData() // 查询班组及部门 }, methods: { + openRandom(){ + this.dialogVisible3 = true + this.getList({ + pageNo: 1, + pageSize: 99999, + questionName: "", + questionSubjectId: this.randomQuestion.name, + }) + }, cancel2(){ // this.examForm.checkQuestionType = null this.dialogVisible2 = false @@ -856,38 +865,30 @@ export default { this.$message.success('新增成功') this.handleClose() this.getRecordList() + this.clearFilter() }) } else { // this.examForm.questions = this.$refs.questionListTable.selection; if(this.$refs.questionListTable){ this.examForm.questions = this.$refs.questionListTable.selection; } else { - // if(this.examForm.checkQuestionType === 1){ - let arr = []; - this.questionList.map(item => { - this.examForm.questions.split(',').map(item2 => { - if(item.id === item2){ - // arr.push({id: item.id,type: item.type}) - arr.push(item) - } - }) + let arr = []; + this.questionList.map(item => { + this.examForm.questions.split(',').map(item2 => { + if(item.id === item2){ + // arr.push({id: item.id,type: item.type}) + arr.push(item) + } }) - this.examForm.questions = arr; - // }else{ - console.log("==========================") - console.log(this.examForm) - console.log("==========================") - // } + }) + this.examForm.questions = arr; } console.log("123123131231231313123123") console.log(this.examForm) console.log("123123131231231313123123") - if(this.examForm.checkQuestionType === 2){ + if(this.examForm.checkQuestionType === 2 && this.randomQuestionList.length === 0){ this.randomQuestionList = this.examForm.questions } - console.log(this.randomQuestionList) - console.log("123123131231231313123123") - console.log(this.randomQuestionList.map(item => item.id).join(',')) let examInfo = { checkQuestionType:this.examForm.checkQuestionType, @@ -903,8 +904,10 @@ export default { id:item.id, } }), - radio:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 1).length : this.randomQuestion.examSingle.count, - multi:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 2).length : this.randomQuestion.examMultiple.count, + // radio:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 1).length : this.randomQuestion.examSingle.count, + // multi:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 2).length : this.randomQuestion.examMultiple.count, + radio:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 1).length : this.randomQuestionList.filter(item => item.type === 1).length, + multi:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 2).length : this.randomQuestionList.filter(item => item.type === 2).length } // examInfo.questions = this.examForm.checkQuestionType == 1 ? this.examForm.questions.map(item => item.id).join(',') : this.randomQuestionList.map(item => item.id).join(','), examInfo.id = this.examForm.id @@ -913,6 +916,7 @@ export default { this.$message.success('编辑成功') this.handleClose() this.getRecordList() + this.clearFilter() } }) } diff --git a/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue b/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue index 7ed64d4f..fe138faf 100644 --- a/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue +++ b/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue @@ -190,13 +190,13 @@ - + - + diff --git a/src/views/projectFront/materialManage/materialEntryManage.vue b/src/views/projectFront/materialManage/materialEntryManage.vue index 58d9d5ce..c4ca8a96 100644 --- a/src/views/projectFront/materialManage/materialEntryManage.vue +++ b/src/views/projectFront/materialManage/materialEntryManage.vue @@ -77,6 +77,11 @@ align="center" label="批次" > + + - +
+
{{ $t("message.extendInfo.contractPrice") }} {{ projectDetail.contractPrice }}
+ +
+ + {{ $t("message.extendInfo.investmentPrice") }} + + {{ projectDetail.investmentPrice }} +
+
{{ $t("message.extendInfo.contractSigning") }} @@ -92,6 +101,10 @@
+
+ + +
@@ -174,6 +187,25 @@ :placeholder="$t('message.extendInfo.pleaseEnter')" > --> + + + + - diff --git a/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue b/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue index 8a45d79c..9e124514 100644 --- a/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue +++ b/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue @@ -4,7 +4,7 @@ - + diff --git a/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue b/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue index 7af7bfcc..8e7ab006 100644 --- a/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue +++ b/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue @@ -9,7 +9,7 @@ > - + diff --git a/src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue b/src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue index 75a9b659..fc355db0 100644 --- a/src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue +++ b/src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue @@ -65,7 +65,7 @@ - + diff --git a/src/views/projectFront/specialWork/blindPlugWork.vue b/src/views/projectFront/specialWork/blindPlugWork.vue index 2ec26c68..32f3ab96 100644 --- a/src/views/projectFront/specialWork/blindPlugWork.vue +++ b/src/views/projectFront/specialWork/blindPlugWork.vue @@ -8,7 +8,7 @@ - + diff --git a/src/views/projectFront/specialWork/confinedSpaceWork.vue b/src/views/projectFront/specialWork/confinedSpaceWork.vue index 3f4dce19..82719de5 100644 --- a/src/views/projectFront/specialWork/confinedSpaceWork.vue +++ b/src/views/projectFront/specialWork/confinedSpaceWork.vue @@ -8,7 +8,7 @@ - + diff --git a/src/views/projectFront/specialWork/disconnectionWork.vue b/src/views/projectFront/specialWork/disconnectionWork.vue index 6e4ad37c..ba595b51 100644 --- a/src/views/projectFront/specialWork/disconnectionWork.vue +++ b/src/views/projectFront/specialWork/disconnectionWork.vue @@ -8,7 +8,7 @@ - + diff --git a/src/views/projectFront/specialWork/fireWork.vue b/src/views/projectFront/specialWork/fireWork.vue index ca43a79f..b4d5b5bd 100644 --- a/src/views/projectFront/specialWork/fireWork.vue +++ b/src/views/projectFront/specialWork/fireWork.vue @@ -8,7 +8,7 @@ - + diff --git a/src/views/projectFront/specialWork/riggingOutWork.vue b/src/views/projectFront/specialWork/riggingOutWork.vue index 17ada650..21b6ba13 100644 --- a/src/views/projectFront/specialWork/riggingOutWork.vue +++ b/src/views/projectFront/specialWork/riggingOutWork.vue @@ -8,7 +8,7 @@ - + diff --git a/src/views/projectFront/specialWork/startBuildingWork.vue b/src/views/projectFront/specialWork/startBuildingWork.vue index 3fa1f06f..de14ffd2 100644 --- a/src/views/projectFront/specialWork/startBuildingWork.vue +++ b/src/views/projectFront/specialWork/startBuildingWork.vue @@ -8,7 +8,7 @@ - + diff --git a/src/views/projectFront/specialWork/temporaryPowerWork.vue b/src/views/projectFront/specialWork/temporaryPowerWork.vue index a0ae88fe..de1c5457 100644 --- a/src/views/projectFront/specialWork/temporaryPowerWork.vue +++ b/src/views/projectFront/specialWork/temporaryPowerWork.vue @@ -8,7 +8,7 @@ - + diff --git a/src/views/projectFront/specialWork/towerOverWork.vue b/src/views/projectFront/specialWork/towerOverWork.vue index b8634ddd..f91f6794 100644 --- a/src/views/projectFront/specialWork/towerOverWork.vue +++ b/src/views/projectFront/specialWork/towerOverWork.vue @@ -8,7 +8,7 @@ - + @@ -152,7 +152,7 @@ - +