diff --git a/src/api/ysjl.js b/src/api/ysjl.js index 8b64b78..2c9238d 100644 --- a/src/api/ysjl.js +++ b/src/api/ysjl.js @@ -12,7 +12,7 @@ export default { url: '/ysjl/initYsjl', method: 'post', data: { - modelId: data.modelId, + templateId: data.templateId, renwuId: data.renwuId, neibuleibie: data.neibuleibie, sblbdm: data.sblbdm, diff --git a/src/utils/common.js b/src/utils/common.js index eefe760..f01b0a2 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -375,7 +375,7 @@ export default { jianyanrenyuan: ysjl.jianyanrenyuan, state: 'update', renwuId: ysjl.renwuId, - ysjlTemplateId: ysjl.ysjlTemplateId, + templateId: ysjl.templateId, jylb: ysjl.jianyanleibie, neibuleibie: ysjl.neibuleibie, sbzldm: ysjl.shebeizhongleidaima, @@ -432,7 +432,7 @@ export default { url: '/ysjl/initYsjl', method: 'post', data: { - modelId: query.modelId, + templateId: query.templateId, renwuId: query.renwuId, neibuleibie: query.neibuleibie, sblbdm: query.sblbdm, diff --git a/src/views/allot/components/chengya_list.vue b/src/views/allot/components/chengya_list.vue index 48d5a27..dd75837 100644 --- a/src/views/allot/components/chengya_list.vue +++ b/src/views/allot/components/chengya_list.vue @@ -476,7 +476,7 @@ export default { // 查询检验科室 getDepartment() { this.api({ - url: '/department/getAllDepartment', + url: '/department/all', method: 'get' }).then(data => { this.depts = data diff --git a/src/views/allot/components/jidian_list.vue b/src/views/allot/components/jidian_list.vue index 01b7b06..58f2b92 100644 --- a/src/views/allot/components/jidian_list.vue +++ b/src/views/allot/components/jidian_list.vue @@ -558,7 +558,7 @@ export default { // 查询检验科室 getDepartment() { this.api({ - url: '/department/getAllDepartment', + url: '/department/all', method: 'get' }).then(data => { this.depts = data diff --git a/src/views/allot/project.vue b/src/views/allot/project.vue index 047f3c0..fbeea66 100644 --- a/src/views/allot/project.vue +++ b/src/views/allot/project.vue @@ -459,7 +459,7 @@ export default { // 查询检验科室 getDepartment() { this.api({ - url: '/department/getAllDepartment', + url: '/department/all', method: 'get' }).then(data => { this.depts = data diff --git a/src/views/allot/tuihui_list.vue b/src/views/allot/tuihui_list.vue index 4c502cf..7b04647 100644 --- a/src/views/allot/tuihui_list.vue +++ b/src/views/allot/tuihui_list.vue @@ -433,7 +433,7 @@ export default { }, getDepartment() { this.api({ - url: '/department/getAllDepartment', + url: '/department/all', method: 'get' }).then(data => { this.depts = data diff --git a/src/views/assign/list.vue b/src/views/assign/list.vue index a2e65ca..9d58dbc 100644 --- a/src/views/assign/list.vue +++ b/src/views/assign/list.vue @@ -444,7 +444,7 @@ export default { // 查询检验科室 getDepartment() { this.api({ - url: '/department/getAllDepartment', + url: '/department/all', method: 'get' }).then(data => { this.depts = data diff --git a/src/views/assign/missionList.vue b/src/views/assign/missionList.vue index c20545b..3373cd3 100644 --- a/src/views/assign/missionList.vue +++ b/src/views/assign/missionList.vue @@ -469,7 +469,7 @@ export default { query: { state: 'create', renwuId: this.renwuId, - modelId: this.template.value, + templateId: this.template.value, jylb: this.jianyanleibie, neibuleibie: this.neibuleibie, departmentId: this.$store.getters.departmentId, @@ -485,7 +485,7 @@ export default { url: '/ysjl/initYsjl', method: 'post', data: { - modelId: this.template.value, + templateId: this.template.value, renwuId: this.renwuId, neibuleibie: this.neibuleibie, sblbdm: this.sbxxList.sblbdm, diff --git a/src/views/assign/old_list.vue b/src/views/assign/old_list.vue index 60e335f..350b411 100644 --- a/src/views/assign/old_list.vue +++ b/src/views/assign/old_list.vue @@ -246,7 +246,7 @@ export default { // 查询检验科室 getDepartment() { this.api({ - url: '/department/getAllDepartment', + url: '/department/all', method: 'get' }).then(data => { this.depts = data diff --git a/src/views/bggl/2000/jj/cyqp.vue b/src/views/bggl/2000/jj/cyqp.vue index dcdde03..8f47a25 100644 --- a/src/views/bggl/2000/jj/cyqp.vue +++ b/src/views/bggl/2000/jj/cyqp.vue @@ -349,7 +349,7 @@ export default { url: '/ysjl/initYsjl', method: 'post', data: { - modelId: this.$route.query.modelId, + templateId: this.$route.query.templateId, renwuId: this.$route.query.renwuId, neibuleibie: this.$route.query.neibuleibie, sblbdm: this.$route.query.sblbdm, @@ -446,7 +446,7 @@ export default { if (this.state === 'create') { url = '/jyxm/getCyJyxm' data = { - templateId: this.$route.query.modelId, + templateId: this.$route.query.templateId, order: sort } } else { diff --git a/src/views/bggl/8000/dj/dq/edit.vue b/src/views/bggl/8000/dj/dq/edit.vue index 3ccbb8d..01d2816 100644 --- a/src/views/bggl/8000/dj/dq/edit.vue +++ b/src/views/bggl/8000/dj/dq/edit.vue @@ -717,7 +717,7 @@ export default { } ], info: { - modelId: this.$route.query.modelId, + modelId: this.$route.query.templateId, sbzldm: this.$route.query.sbzldm, sblbdm: this.$route.query.sblbdm, ysjlId: this.$route.query.id, @@ -761,7 +761,7 @@ export default { url: '/ysjl/initYsjl', method: 'post', data: { - modelId: this.$route.query.modelId, + templateId: this.$route.query.templateId, renwuId: this.$route.query.renwuId, neibuleibie: this.$route.query.neibuleibie, sblbdm: this.$route.query.sblbdm, @@ -876,7 +876,7 @@ export default { if (this.state === 'create') { url = '/jyxm/getCyJyxm' data = { - templateId: this.$route.query.modelId, + templateId: this.$route.query.templateId, order: sort } } else { diff --git a/src/views/bggl/8000/dj/nd/edit.vue b/src/views/bggl/8000/dj/nd/edit.vue index 7dca75c..1e88fc5 100644 --- a/src/views/bggl/8000/dj/nd/edit.vue +++ b/src/views/bggl/8000/dj/nd/edit.vue @@ -399,7 +399,7 @@ export default { } ], info: { - modelId: this.$route.query.modelId, + modelId: this.$route.query.templateId, sbzldm: this.$route.query.sbzldm, sblbdm: this.$route.query.sblbdm, ysjlId: this.$route.query.id, @@ -442,7 +442,7 @@ export default { url: '/ysjl/initYsjl', method: 'post', data: { - modelId: this.$route.query.modelId, + templateId: this.$route.query.templateId, renwuId: this.$route.query.renwuId, neibuleibie: this.$route.query.neibuleibie, sblbdm: this.$route.query.sblbdm, @@ -543,7 +543,7 @@ export default { if (this.state === 'create') { url = '/jyxm/getCyJyxm' data = { - templateId: this.$route.query.modelId, + templateId: this.$route.query.templateId, order: sort } } else { diff --git a/src/views/bggl/8000/jj/edit.vue b/src/views/bggl/8000/jj/edit.vue index cdbd9cb..efce221 100644 --- a/src/views/bggl/8000/jj/edit.vue +++ b/src/views/bggl/8000/jj/edit.vue @@ -436,7 +436,7 @@ export default { param: {}, checkedTab: 'first', info: { - modelId: this.$route.query.modelId, + modelId: this.$route.query.templateId, sbzldm: this.$route.query.sbzldm, sblbdm: this.$route.query.sblbdm, ysjlId: this.$route.query.id, @@ -473,7 +473,7 @@ export default { url: '/ysjl/initYsjl', method: 'post', data: { - modelId: this.$route.query.modelId, + templateId: this.$route.query.templateId, renwuId: this.$route.query.renwuId, neibuleibie: this.$route.query.neibuleibie, sblbdm: this.$route.query.sblbdm, diff --git a/src/views/bggl/components/boiler_db_list.vue b/src/views/bggl/components/boiler_db_list.vue index 68027e7..e88d14f 100644 --- a/src/views/bggl/components/boiler_db_list.vue +++ b/src/views/bggl/components/boiler_db_list.vue @@ -1126,7 +1126,7 @@ export default { url: '/ysjl/initYsjl', method: 'post', data: { - modelId: this.modelId + templateId: this.templateId } }).then(data => { this.$router.push({ path: data.path + '/' + data.ysjl.id + '/create', query: { ysjl: data.ysjl, param: data.param }}) diff --git a/src/views/bjd/department_list.vue b/src/views/bjd/department_list.vue index 692cca0..787a191 100644 --- a/src/views/bjd/department_list.vue +++ b/src/views/bjd/department_list.vue @@ -271,7 +271,7 @@ export default { // 查询检验科室 getDepartment() { this.api({ - url: '/department/getAllDepartment', + url: '/department/all', method: 'get' }).then(data => { this.depts = data diff --git a/src/views/chargeBill/components/complex.vue b/src/views/chargeBill/components/complex.vue deleted file mode 100644 index 46dbdc6..0000000 --- a/src/views/chargeBill/components/complex.vue +++ /dev/null @@ -1,652 +0,0 @@ - - - - - diff --git a/src/views/common/AllotFp/index.vue b/src/views/common/AllotFp/index.vue index 5865550..e93086e 100644 --- a/src/views/common/AllotFp/index.vue +++ b/src/views/common/AllotFp/index.vue @@ -145,7 +145,7 @@ export default { }, getDepartment() { this.api({ - url: '/department/getAllDepartment', + url: '/department/all', method: 'get' }).then(data => { this.depts = data diff --git a/src/views/common/DepartmentUser/index.vue b/src/views/common/DepartmentUser/index.vue index 59c27db..e043b9e 100644 --- a/src/views/common/DepartmentUser/index.vue +++ b/src/views/common/DepartmentUser/index.vue @@ -32,7 +32,7 @@ export default { methods: { getDepartment() { this.api({ - url: '/department/getAllDepartment', + url: '/department/all', method: 'get' }).then(data => { this.depts = data diff --git a/src/views/common/SignName/index.vue b/src/views/common/SignName/index.vue index 1abf45e..9392c98 100644 --- a/src/views/common/SignName/index.vue +++ b/src/views/common/SignName/index.vue @@ -62,7 +62,7 @@ export default { methods: { getDepartment() { this.api({ - url: '/department/getAllDepartment', + url: '/department/all', method: 'get' }).then(data => { this.depts = data diff --git a/src/views/flow/definition.vue b/src/views/flow/definition.vue index 266f468..3e00e83 100644 --- a/src/views/flow/definition.vue +++ b/src/views/flow/definition.vue @@ -185,7 +185,7 @@ export default { }, getAllDepartment() { this.api({ - url: '/department/getAllDepartment', + url: '/department/all', method: 'get' }).then(data => { this.listDepartment = data diff --git a/src/views/print/1000/grant_create.vue b/src/views/print/1000/grant_create.vue index ca9969d..2f6e5d4 100644 --- a/src/views/print/1000/grant_create.vue +++ b/src/views/print/1000/grant_create.vue @@ -140,10 +140,9 @@ // import Sticky from '@/components/Sticky' import Pagination from '@/components/Pagination' import SignInfo from '../sign_info' -import ComplexBill from '@/views/chargeBill/components/complex' export default { name: 'GrantReportGlCreate', - components: { Pagination, SignInfo, ComplexBill }, + components: { Pagination, SignInfo }, data() { return { totalCount: 0, diff --git a/src/views/task/list.vue b/src/views/task/list.vue index b661301..47d18fe 100644 --- a/src/views/task/list.vue +++ b/src/views/task/list.vue @@ -28,13 +28,13 @@ - + - - - - + + + + 查询 @@ -248,8 +248,7 @@ export default { modelList: [], listQuery: { pageNum: 1, // 页码 - pageRow: 20, // 每页条数 - searchOwnRw: {} + pageRow: 20 // 每页条数 }, listQueryCopy: { pageNum: 1, // 页码 @@ -305,7 +304,7 @@ export default { getOwnList(this.listQuery).then(data => { console.log(data.list) this.list = data.list - this.totalCount = data.totalCount + this.totalCount = data.total const messagePush = this.$store.getters.messageCount for (let i = 0; i < messagePush.length; i++) { if (messagePush[i].key === 'MyTask') { @@ -532,7 +531,7 @@ export default { query: { state: 'create', renwuId: this.renwuId, - modelId: this.template.value, + templateId: this.template.value, jylb: this.jianyanleibie, neibuleibie: this.neibuleibie, departmentId: this.$store.getters.departmentId, @@ -616,7 +615,6 @@ export default { }) }, clearQuery() { - this.$set(this.listQuery, 'searchOwnRw', {}) this.getList() }, clearCopyQuery() { diff --git a/src/views/user/permission.vue b/src/views/user/permission.vue index a5685a3..aee0865 100644 --- a/src/views/user/permission.vue +++ b/src/views/user/permission.vue @@ -466,7 +466,7 @@ export default { type: 'warning' }).then(() => { this.api({ - url: '/permission/deletePermission', + url: '/permission', method: 'delete', params: { id: id diff --git a/src/views/ysjl/1000/common/dzsclJyxmBzz.js b/src/views/ysjl/1000/common/dzsclJyxmBzz.js deleted file mode 100644 index ce00d03..0000000 --- a/src/views/ysjl/1000/common/dzsclJyxmBzz.js +++ /dev/null @@ -1,954 +0,0 @@ -export default { - getHyYtRadio(jyxmData, params) { // 还原 有铜 - const bgJyxmData = [] - const yali = params.edingyali - const lushui = params.shuichulifangfa - const luxing = params.huanjingtiaojian - for (let i = 0; i < jyxmData.length; i++) { - const bgJyxm = { - id: '', - c1: '-', - c2: '', - c3: '-', - c4: '' - } - bgJyxm.id = jyxmData[i].id - if (lushui === '炉水固体碱化处理') { - if (yali >= 3.8 && yali <= 5.8) { - if (i === 0) { - bgJyxm.c3 = '9.0～11.0' - } else if (i === 1) { - bgJyxm.c3 = '5～15' - } - } else if (yali >= 5.9 && yali <= 10.0) { - if (i === 0) { - bgJyxm.c3 = '9.0～10.5' - } else if (i === 1) { - bgJyxm.c3 = '2～10' - } else if (i === 4) { - bgJyxm.c3 = '≤20' - } else if (i === 5) { - bgJyxm.c3 = '<50' - } - } else if (yali >= 10.1 && yali <= 12.6) { - if (i === 0) { - bgJyxm.c3 = '9.0～10' - } else if (i === 1) { - bgJyxm.c3 = '2～6' - } else if (i === 4) { - bgJyxm.c3 = '≤2.0' - } else if (i === 5) { - bgJyxm.c3 = '≤30' - } - } else if (yali >= 12.7 && yali <= 15.6) { - if (i === 0) { - bgJyxm.c3 = '9.0～9.7' - } else if (i === 1) { - bgJyxm.c3 = '≤3' - } else if (i === 2) { - bgJyxm.c3 = '≤1.5' - } else if (i === 4) { - bgJyxm.c3 = '≤0.45' - } else if (i === 5) { - bgJyxm.c3 = '≤20' - } - } else if (yali > 15.6) { - if (i === 0) { - bgJyxm.c3 = '9.0～9.7' - } else if (i === 1) { - bgJyxm.c3 = '≤1' - } else if (i === 2) { - bgJyxm.c3 = '≤0.4' - } else if (i === 4) { - bgJyxm.c3 = '≤0.10' - } else if (i === 5) { - bgJyxm.c3 = '≤15' - } else if (i === 8) { - bgJyxm.c3 = '<5' - } - } - } else if (lushui === '炉水全挥发处理') { - if (yali > 15.6) { - if (i === 0) { - bgJyxm.c3 = '9.0～9.7' - } else if (i === 2) { - bgJyxm.c3 = '≤0.03' - } else if (i === 4) { - bgJyxm.c3 = '≤0.08' - } else if (i === 8) { - bgJyxm.c3 = '<1.0' - } - } - } - // 还原 有铜 汽包炉 - if (luxing === '汽包炉') { - if (yali >= 3.8 && yali <= 5.8) { - if (i === 6) { - bgJyxm.c1 = '≤2.0' - } else if (i === 7) { - bgJyxm.c1 = '≤15' - } else if (i === 8) { - bgJyxm.c1 = '8.8～9.3' - } else if (i === 9) { - bgJyxm.c1 = '≤10' - } else if (i === 10) { - bgJyxm.c1 = '≤50' - } - } else if (yali >= 5.9 && yali <= 12.6) { - if (i === 7) { - bgJyxm.c1 = '≤7' - } else if (i === 8) { - bgJyxm.c1 = '8.8～9.3' - } else if (i === 9) { - bgJyxm.c1 = '≤5' - } else if (i === 10) { - bgJyxm.c1 = '≤30' - } else if (i === 12) { - bgJyxm.c1 = '≤0.30' - } else if (i === 15) { - bgJyxm.c1 = '≤500' - } - } else if (yali >= 12.7 && yali <= 15.6) { - if (i === 7) { - bgJyxm.c1 = '≤7' - } else if (i === 8) { - bgJyxm.c1 = '8.8～9.3' - } else if (i === 9) { - bgJyxm.c1 = '≤5' - } else if (i === 10) { - bgJyxm.c1 = '≤20' - } else if (i === 12) { - bgJyxm.c1 = '≤0.30' - } else if (i === 15) { - bgJyxm.c1 = '≤500' - } - } else if (yali > 15.6) { - if (i === 7) { - bgJyxm.c1 = '≤7' - } else if (i === 8) { - bgJyxm.c1 = '8.8～9.3' - } else if (i === 9) { - bgJyxm.c1 = '≤3' - } else if (i === 10) { - bgJyxm.c1 = '≤15' - } else if (i === 12) { - bgJyxm.c1 = '≤0.15' - } else if (i === 14) { - bgJyxm.c1 = '≤20' - } else if (i === 15) { - bgJyxm.c1 = '≤200' - } - } - } else if (luxing === '直流炉') { // 还原性全挥发处理 无铜系统 直流炉 - if (i === 6) { - if (yali >= 5.9 && yali <= 18.3) { - if (i === 7) { - bgJyxm.c1 = '≤7' - } else if (i === 8) { - bgJyxm.c1 = '8.8～9.3' - } else if (i === 9) { - bgJyxm.c1 = '≤3' - } else if (i === 10) { - bgJyxm.c1 = '≤10' - } else if (i === 12) { - bgJyxm.c1 = '≤0.15' - } else if (i === 13) { - bgJyxm.c1 = '≤3' - } else if (i === 14) { - bgJyxm.c1 = '≤15' - } else if (i === 15) { - bgJyxm.c1 = '≤200' - } - } else if (yali > 18.3) { - if (i === 7) { - bgJyxm.c1 = '≤7' - } else if (i === 8) { - bgJyxm.c1 = '8.8～9.3' - } else if (i === 9) { - bgJyxm.c1 = '≤2' - } else if (i === 10) { - bgJyxm.c1 = '≤5' - } else if (i === 12) { - bgJyxm.c1 = '≤0.10' - } else if (i === 13) { - bgJyxm.c1 = '≤2' - } else if (i === 14) { - bgJyxm.c1 = '≤10' - } else if (i === 15) { - bgJyxm.c1 = '≤200' - } - } - } - } - // 蒸汽质量 过热 - if (i === 11) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤15' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤5' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤3' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤2' - } - } else if (i === 12) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤20' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤15' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤15' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤10' - } - } else if (i === 13) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤0.30' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤0.15' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤0.15' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤10' - } - } else if (i === 14) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤20' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤15' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤10' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤5' - } - } else if (i === 15) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤5' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤3' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤3' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤2' - } - } - bgJyxm.c2 = jyxmData[i].c4 - bgJyxm.c4 = jyxmData[i].c8 - bgJyxmData.push(bgJyxm) - } - return bgJyxmData - }, - getHyWtRadio(jyxmData, params) { // 还原 无铜 - const bgJyxmData = [] - const yali = params.edingyali - const lushui = params.shuichulifangfa - const luxing = params.huanjingtiaojian - for (let i = 0; i < jyxmData.length; i++) { - const bgJyxm = { - id: '', - c1: '-', - c2: '', - c3: '-', - c4: '' - } - bgJyxm.id = jyxmData[i].id - if (lushui === '炉水固体碱化处理') { - if (yali >= 3.8 && yali <= 5.8) { - if (i === 0) { - bgJyxm.c3 = '9.0～11.0' - } else if (i === 1) { - bgJyxm.c3 = '5～15' - } - } else if (yali >= 5.9 && yali <= 10.0) { - if (i === 0) { - bgJyxm.c3 = '9.0～10.5' - } else if (i === 1) { - bgJyxm.c3 = '2～10' - } else if (i === 4) { - bgJyxm.c3 = '≤20' - } else if (i === 5) { - bgJyxm.c3 = '<50' - } - } else if (yali >= 10.1 && yali <= 12.6) { - if (i === 0) { - bgJyxm.c3 = '9.0～10' - } else if (i === 1) { - bgJyxm.c3 = '2～6' - } else if (i === 4) { - bgJyxm.c3 = '≤2.0' - } else if (i === 5) { - bgJyxm.c3 = '≤30' - } - } else if (yali >= 12.7 && yali <= 15.6) { - if (i === 0) { - bgJyxm.c3 = '9.0～9.7' - } else if (i === 1) { - bgJyxm.c3 = '≤3' - } else if (i === 2) { - bgJyxm.c3 = '≤1.5' - } else if (i === 4) { - bgJyxm.c3 = '≤0.45' - } else if (i === 5) { - bgJyxm.c3 = '≤20' - } - } else if (yali > 15.6) { - if (i === 0) { - bgJyxm.c3 = '9.0～9.7' - } else if (i === 1) { - bgJyxm.c3 = '≤1' - } else if (i === 2) { - bgJyxm.c3 = '≤0.4' - } else if (i === 4) { - bgJyxm.c3 = '≤0.10' - } else if (i === 5) { - bgJyxm.c3 = '≤15' - } else if (i === 8) { - bgJyxm.c3 = '<5' - } - } - } else if (lushui === '炉水全挥发处理') { - if (yali > 15.6) { - if (i === 0) { - bgJyxm.c3 = '9.0～9.7' - } else if (i === 2) { - bgJyxm.c3 = '≤0.03' - } else if (i === 4) { - bgJyxm.c3 = '≤0.08' - } else if (i === 8) { - bgJyxm.c3 = '<1.0' - } - } - } - // 还原 无铜 汽包炉 - if (luxing === '汽包炉') { - if (yali >= 3.8 && yali <= 5.8) { - if (i === 6) { - bgJyxm.c1 = '≤2.0' - } else if (i === 7) { - bgJyxm.c1 = '≤15' - } else if (i === 9) { - bgJyxm.c1 = '≤10' - } else if (i === 10) { - bgJyxm.c1 = '≤50' - } - } else if (yali >= 5.9 && yali <= 12.6) { - if (i === 7) { - bgJyxm.c1 = '≤7' - } else if (i === 8) { - bgJyxm.c1 = '9.2～9.6' - } else if (i === 9) { - bgJyxm.c1 = '≤5' - } else if (i === 10) { - bgJyxm.c1 = '≤30' - } else if (i === 12) { - bgJyxm.c1 = '≤0.30' - } else if (i === 15) { - bgJyxm.c1 = '≤500' - } - } else if (yali >= 12.7 && yali <= 15.6) { - if (i === 7) { - bgJyxm.c1 = '≤7' - } else if (i === 8) { - bgJyxm.c1 = '9.2～9.6' - } else if (i === 9) { - bgJyxm.c1 = '≤5' - } else if (i === 10) { - bgJyxm.c1 = '≤20' - } else if (i === 12) { - bgJyxm.c1 = '≤0.30' - } else if (i === 15) { - bgJyxm.c1 = '≤500' - } - } else if (yali > 15.6) { - if (i === 7) { - bgJyxm.c1 = '≤7' - } else if (i === 8) { - bgJyxm.c1 = '9.2～9.6' - } else if (i === 9) { - bgJyxm.c1 = '≤3' - } else if (i === 10) { - bgJyxm.c1 = '≤15' - } else if (i === 12) { - bgJyxm.c1 = '≤0.15' - } else if (i === 14) { - bgJyxm.c1 = '≤20' - } else if (i === 15) { - bgJyxm.c1 = '≤200' - } - } - } else if (luxing === '直流炉') { // 还原性全挥发处理 无铜系统 直流炉 - if (i === 6) { - if (yali >= 5.9 && yali <= 18.3) { - if (i === 7) { - bgJyxm.c1 = '≤7' - } else if (i === 8) { - bgJyxm.c1 = '8.8～9.3' - } else if (i === 9) { - bgJyxm.c1 = '≤3' - } else if (i === 10) { - bgJyxm.c1 = '≤10' - } else if (i === 12) { - bgJyxm.c1 = '≤0.15' - } else if (i === 13) { - bgJyxm.c1 = '≤3' - } else if (i === 14) { - bgJyxm.c1 = '≤15' - } else if (i === 15) { - bgJyxm.c1 = '≤200' - } - } else if (yali > 18.3) { - if (i === 7) { - bgJyxm.c1 = '≤7' - } else if (i === 8) { - bgJyxm.c1 = '8.8～9.3' - } else if (i === 9) { - bgJyxm.c1 = '≤2' - } else if (i === 10) { - bgJyxm.c1 = '≤5' - } else if (i === 12) { - bgJyxm.c1 = '≤0.10' - } else if (i === 13) { - bgJyxm.c1 = '≤2' - } else if (i === 14) { - bgJyxm.c1 = '≤10' - } else if (i === 15) { - bgJyxm.c1 = '≤200' - } - } - } - } - // 蒸汽质量 过热 - if (i === 11) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤15' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤5' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤3' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤2' - } - } else if (i === 12) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤20' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤15' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤15' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤10' - } - } else if (i === 13) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤0.30' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤0.15' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤0.15' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤10' - } - } else if (i === 14) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤20' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤15' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤10' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤5' - } - } else if (i === 15) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤5' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤3' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤3' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤2' - } - } - bgJyxm.c2 = jyxmData[i].c4 - bgJyxm.c4 = jyxmData[i].c8 - bgJyxmData.push(bgJyxm) - } - return bgJyxmData - }, - getYhYtRadio(jyxmData, params) { // 氧化 有铜 - const bgJyxmData = [] - const yali = params.edingyali - const lushui = params.shuichulifangfa - const luxing = params.huanjingtiaojian - for (let i = 0; i < jyxmData.length; i++) { - const bgJyxm = { - id: '', - c1: '-', - c2: '', - c3: '-', - c4: '' - } - bgJyxm.id = jyxmData[i].id - if (lushui === '炉水固体碱化处理') { - if (yali >= 3.8 && yali <= 5.8) { - if (i === 0) { - bgJyxm.c3 = '9.0～11.0' - } else if (i === 1) { - bgJyxm.c3 = '5～15' - } - } else if (yali >= 5.9 && yali <= 10.0) { - if (i === 0) { - bgJyxm.c3 = '9.0～10.5' - } else if (i === 1) { - bgJyxm.c3 = '2～10' - } else if (i === 4) { - bgJyxm.c3 = '≤20' - } else if (i === 5) { - bgJyxm.c3 = '<50' - } - } else if (yali >= 10.1 && yali <= 12.6) { - if (i === 0) { - bgJyxm.c3 = '9.0～10' - } else if (i === 1) { - bgJyxm.c3 = '2～6' - } else if (i === 4) { - bgJyxm.c3 = '≤2.0' - } else if (i === 5) { - bgJyxm.c3 = '≤30' - } - } else if (yali >= 12.7 && yali <= 15.6) { - if (i === 0) { - bgJyxm.c3 = '9.0～9.7' - } else if (i === 1) { - bgJyxm.c3 = '≤3' - } else if (i === 2) { - bgJyxm.c3 = '≤1.5' - } else if (i === 4) { - bgJyxm.c3 = '≤0.45' - } else if (i === 5) { - bgJyxm.c3 = '≤20' - } - } else if (yali > 15.6) { - if (i === 0) { - bgJyxm.c3 = '9.0～9.7' - } else if (i === 1) { - bgJyxm.c3 = '≤1' - } else if (i === 2) { - bgJyxm.c3 = '≤0.4' - } else if (i === 4) { - bgJyxm.c3 = '≤0.10' - } else if (i === 5) { - bgJyxm.c3 = '≤15' - } else if (i === 8) { - bgJyxm.c3 = '<5' - } - } - } else if (lushui === '炉水全挥发处理') { - if (yali > 15.6) { - if (i === 0) { - bgJyxm.c3 = '9.0～9.7' - } else if (i === 2) { - bgJyxm.c3 = '≤0.03' - } else if (i === 4) { - bgJyxm.c3 = '≤0.08' - } else if (i === 8) { - bgJyxm.c3 = '<1.0' - } - } - } - // 氧化 有铜 汽包炉 - if (luxing === '汽包炉') { - if (yali >= 3.8 && yali <= 5.8) { - if (i === 6) { - bgJyxm.c1 = '≤2.0' - } else if (i === 7) { - bgJyxm.c1 = '≤15' - } else if (i === 8) { - bgJyxm.c1 = '8.8～9.3' - } else if (i === 9) { - bgJyxm.c1 = '≤10' - } else if (i === 10) { - bgJyxm.c1 = '≤50' - } - } else if (yali >= 5.9 && yali <= 12.6) { - if (i === 7) { - bgJyxm.c1 = '≤10' - } else if (i === 8) { - bgJyxm.c1 = '8.8～9.3' - } else if (i === 9) { - bgJyxm.c1 = '≤5' - } else if (i === 10) { - bgJyxm.c1 = '≤30' - } else if (i === 12) { - bgJyxm.c1 = '≤0.30' - } else if (i === 15) { - bgJyxm.c1 = '≤500' - } - } else if (yali >= 12.7 && yali <= 15.6) { - if (i === 7) { - bgJyxm.c1 = '≤10' - } else if (i === 8) { - bgJyxm.c1 = '8.8～9.3' - } else if (i === 9) { - bgJyxm.c1 = '≤5' - } else if (i === 10) { - bgJyxm.c1 = '≤20' - } else if (i === 12) { - bgJyxm.c1 = '≤0.30' - } else if (i === 15) { - bgJyxm.c1 = '≤500' - } - } else if (yali > 15.6) { - if (i === 7) { - bgJyxm.c1 = '≤10' - } else if (i === 8) { - bgJyxm.c1 = '8.8～9.3' - } else if (i === 9) { - bgJyxm.c1 = '≤3' - } else if (i === 10) { - bgJyxm.c1 = '≤15' - } else if (i === 12) { - bgJyxm.c1 = '≤0.15' - } else if (i === 14) { - bgJyxm.c1 = '≤20' - } else if (i === 15) { - bgJyxm.c1 = '≤200' - } - } - } else if (luxing === '直流炉') { - if (i === 6) { - if (yali >= 5.9 && yali <= 18.3) { - if (i === 7) { - bgJyxm.c1 = '≤7' - } else if (i === 8) { - bgJyxm.c1 = '8.8～9.3' - } else if (i === 9) { - bgJyxm.c1 = '≤3' - } else if (i === 10) { - bgJyxm.c1 = '≤10' - } else if (i === 12) { - bgJyxm.c1 = '≤0.15' - } else if (i === 13) { - bgJyxm.c1 = '≤3' - } else if (i === 14) { - bgJyxm.c1 = '≤15' - } else if (i === 15) { - bgJyxm.c1 = '≤200' - } - } else if (yali > 18.3) { - if (i === 7) { - bgJyxm.c1 = '≤7' - } else if (i === 8) { - bgJyxm.c1 = '8.8～9.3' - } else if (i === 9) { - bgJyxm.c1 = '≤2' - } else if (i === 10) { - bgJyxm.c1 = '≤5' - } else if (i === 12) { - bgJyxm.c1 = '≤0.10' - } else if (i === 13) { - bgJyxm.c1 = '≤2' - } else if (i === 14) { - bgJyxm.c1 = '≤10' - } else if (i === 15) { - bgJyxm.c1 = '≤200' - } - } - } - } - // 蒸汽质量 过热 - if (i === 11) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤15' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤5' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤3' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤2' - } - } else if (i === 12) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤20' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤15' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤15' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤10' - } - } else if (i === 13) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤0.30' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤0.15' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤0.15' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤10' - } - } else if (i === 14) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤20' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤15' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤10' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤5' - } - } else if (i === 15) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤5' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤3' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤3' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤2' - } - } - bgJyxm.c2 = jyxmData[i].c4 - bgJyxm.c4 = jyxmData[i].c8 - bgJyxmData.push(bgJyxm) - } - return bgJyxmData - }, - getYhWtRadio(jyxmData, params) { // 氧化 无铜 - const bgJyxmData = [] - const yali = params.edingyali - const lushui = params.shuichulifangfa - const luxing = params.huanjingtiaojian - for (let i = 0; i < jyxmData.length; i++) { - const bgJyxm = { - id: '', - c1: '-', - c2: '', - c3: '-', - c4: '' - } - bgJyxm.id = jyxmData[i].id - if (lushui === '炉水固体碱化处理') { - if (yali >= 3.8 && yali <= 5.8) { - if (i === 0) { - bgJyxm.c3 = '9.0～11.0' - } else if (i === 1) { - bgJyxm.c3 = '5～15' - } - } else if (yali >= 5.9 && yali <= 10.0) { - if (i === 0) { - bgJyxm.c3 = '9.0～10.5' - } else if (i === 1) { - bgJyxm.c3 = '2～10' - } else if (i === 4) { - bgJyxm.c3 = '≤20' - } else if (i === 5) { - bgJyxm.c3 = '<50' - } - } else if (yali >= 10.1 && yali <= 12.6) { - if (i === 0) { - bgJyxm.c3 = '9.0～10' - } else if (i === 1) { - bgJyxm.c3 = '2～6' - } else if (i === 4) { - bgJyxm.c3 = '≤2.0' - } else if (i === 5) { - bgJyxm.c3 = '≤30' - } - } else if (yali >= 12.7 && yali <= 15.6) { - if (i === 0) { - bgJyxm.c3 = '9.0～9.7' - } else if (i === 1) { - bgJyxm.c3 = '≤3' - } else if (i === 2) { - bgJyxm.c3 = '≤1.5' - } else if (i === 4) { - bgJyxm.c3 = '≤0.45' - } else if (i === 5) { - bgJyxm.c3 = '≤20' - } - } else if (yali > 15.6) { - if (i === 0) { - bgJyxm.c3 = '9.0～9.7' - } else if (i === 1) { - bgJyxm.c3 = '≤1' - } else if (i === 2) { - bgJyxm.c3 = '≤0.4' - } else if (i === 4) { - bgJyxm.c3 = '≤0.10' - } else if (i === 5) { - bgJyxm.c3 = '≤15' - } else if (i === 8) { - bgJyxm.c3 = '<5' - } - } - } else if (lushui === '炉水全挥发处理') { - if (yali > 15.6) { - if (i === 0) { - bgJyxm.c3 = '9.0～9.7' - } else if (i === 2) { - bgJyxm.c3 = '≤0.03' - } else if (i === 4) { - bgJyxm.c3 = '≤0.08' - } else if (i === 8) { - bgJyxm.c3 = '<1.0' - } - } - } - // 氧化 无铜 汽包炉 - if (luxing === '汽包炉') { - if (yali >= 3.8 && yali <= 5.8) { - if (i === 6) { - bgJyxm.c1 = '≤2.0' - } else if (i === 7) { - bgJyxm.c1 = '≤15' - } else if (i === 9) { - bgJyxm.c1 = '≤10' - } else if (i === 10) { - bgJyxm.c1 = '≤50' - } - } else if (yali >= 5.9 && yali <= 12.6) { - if (i === 7) { - bgJyxm.c1 = '≤7' - } else if (i === 8) { - bgJyxm.c1 = '9.2～9.6' - } else if (i === 9) { - bgJyxm.c1 = '≤5' - } else if (i === 10) { - bgJyxm.c1 = '≤30' - } else if (i === 12) { - bgJyxm.c1 = '≤0.30' - } else if (i === 15) { - bgJyxm.c1 = '≤500' - } - } else if (yali >= 12.7 && yali <= 15.6) { - if (i === 7) { - bgJyxm.c1 = '≤7' - } else if (i === 8) { - bgJyxm.c1 = '9.2～9.6' - } else if (i === 9) { - bgJyxm.c1 = '≤5' - } else if (i === 10) { - bgJyxm.c1 = '≤20' - } else if (i === 12) { - bgJyxm.c1 = '≤0.30' - } else if (i === 15) { - bgJyxm.c1 = '≤500' - } - } else if (yali > 15.6) { - if (i === 7) { - bgJyxm.c1 = '≤7' - } else if (i === 8) { - bgJyxm.c1 = '9.2～9.6' - } else if (i === 9) { - bgJyxm.c1 = '≤3' - } else if (i === 10) { - bgJyxm.c1 = '≤15' - } else if (i === 12) { - bgJyxm.c1 = '≤0.15' - } else if (i === 14) { - bgJyxm.c1 = '≤20' - } else if (i === 15) { - bgJyxm.c1 = '≤200' - } - } - } else if (luxing === '直流炉') { // 还原性全挥发处理 无铜系统 直流炉 - if (i === 6) { - if (yali >= 5.9 && yali <= 18.3) { - if (i === 7) { - bgJyxm.c1 = '≤7' - } else if (i === 8) { - bgJyxm.c1 = '8.8～9.3' - } else if (i === 9) { - bgJyxm.c1 = '≤3' - } else if (i === 10) { - bgJyxm.c1 = '≤10' - } else if (i === 12) { - bgJyxm.c1 = '≤0.15' - } else if (i === 13) { - bgJyxm.c1 = '≤3' - } else if (i === 14) { - bgJyxm.c1 = '≤15' - } else if (i === 15) { - bgJyxm.c1 = '≤200' - } - } else if (yali > 18.3) { - if (i === 7) { - bgJyxm.c1 = '≤7' - } else if (i === 8) { - bgJyxm.c1 = '8.8～9.3' - } else if (i === 9) { - bgJyxm.c1 = '≤2' - } else if (i === 10) { - bgJyxm.c1 = '≤5' - } else if (i === 12) { - bgJyxm.c1 = '≤0.10' - } else if (i === 13) { - bgJyxm.c1 = '≤2' - } else if (i === 14) { - bgJyxm.c1 = '≤10' - } else if (i === 15) { - bgJyxm.c1 = '≤200' - } - } - } - } - // 蒸汽质量 过热 - if (i === 11) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤15' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤5' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤3' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤2' - } - } else if (i === 12) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤20' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤15' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤15' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤10' - } - } else if (i === 13) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤0.30' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤0.15' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤0.15' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤10' - } - } else if (i === 14) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤20' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤15' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤10' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤5' - } - } else if (i === 15) { - if (yali >= 3.8 && yali <= 5.8) { - bgJyxm.c3 = '≤5' - } else if (yali >= 5.9 && yali <= 15.6) { - bgJyxm.c3 = '≤3' - } else if (yali >= 15.7 && yali <= 18.3) { - bgJyxm.c3 = '≤3' - } else if (yali > 18.3) { - bgJyxm.c3 = '≤2' - } - } - bgJyxm.c2 = jyxmData[i].c4 - bgJyxm.c4 = jyxmData[i].c8 - bgJyxmData.push(bgJyxm) - } - return bgJyxmData - } -} diff --git a/src/views/ysjl/1000/common/glft.vue b/src/views/ysjl/1000/common/glft.vue deleted file mode 100644 index f5ddf4f..0000000 --- a/src/views/ysjl/1000/common/glft.vue +++ /dev/null @@ -1,117 +0,0 @@ - - - - - diff --git a/src/views/ysjl/1000/common/sfqk.vue b/src/views/ysjl/1000/common/sfqk.vue deleted file mode 100644 index e86fb37..0000000 --- a/src/views/ysjl/1000/common/sfqk.vue +++ /dev/null @@ -1,501 +0,0 @@ - - - - diff --git a/src/views/ysjl/1000/common/sz/dzscl.vue b/src/views/ysjl/1000/common/sz/dzscl.vue deleted file mode 100644 index ec67d69..0000000 --- a/src/views/ysjl/1000/common/sz/dzscl.vue +++ /dev/null @@ -1,968 +0,0 @@ - - - - diff --git a/src/views/ysjl/1000/common/sz/gyscl.vue b/src/views/ysjl/1000/common/sz/gyscl.vue index 11ce81f..8d0a6f0 100644 --- a/src/views/ysjl/1000/common/sz/gyscl.vue +++ b/src/views/ysjl/1000/common/sz/gyscl.vue @@ -15,10 +15,6 @@ 预览 - - @@ -440,9 +436,6 @@
- - - @@ -450,12 +443,10 @@ import Sticky from '@/components/Sticky' import SignName from '@/views/common/SignName' import Utils from '@/utils/contact' -import Ft from '@/views/ysjl/1000/common/glft' import Bzz from '../../common/gysclJyxmBzz.js' -import ComplexBill from '@/views/chargeBill/components/complex' export default { name: 'GlGysclYsjl', - components: { SignName, Sticky, Ft, ComplexBill }, + components: { SignName, Sticky }, data() { return { jlbh1: 'SJG', @@ -504,7 +495,6 @@ export default { ], multipleSelection: [], ysjlId: this.$route.query.id, - complexShow: false, tableData: [] // 存储报告检验项目 } }, @@ -543,7 +533,7 @@ export default { url: '/ysjl/initYsjl', method: 'post', data: { - modelId: this.$route.query.modelId, + templateId: this.$route.query.templateId, renwuId: this.$route.query.renwuId, neibuleibie: this.$route.query.neibuleibie, sblbdm: this.$route.query.sblbdm, @@ -580,7 +570,6 @@ export default { } }).then(data => { this.ysjl = data.ysjl - this.complexShow = true if (this.ysjl.jianyanrenyuan) { this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) } diff --git a/src/views/ysjl/1000/dj/nb/2.0/dznb.vue b/src/views/ysjl/1000/dj/nb/2.0/dznb.vue deleted file mode 100644 index 7199a63..0000000 --- a/src/views/ysjl/1000/dj/nb/2.0/dznb.vue +++ /dev/null @@ -1,828 +0,0 @@ - - - diff --git a/src/views/ysjl/1000/dj/nb/2.0/gynb.vue b/src/views/ysjl/1000/dj/nb/2.0/gynb.vue deleted file mode 100644 index c242bf4..0000000 --- a/src/views/ysjl/1000/dj/nb/2.0/gynb.vue +++ /dev/null @@ -1,694 +0,0 @@ - - - diff --git a/src/views/ysjl/1000/dj/nb/dznb.vue b/src/views/ysjl/1000/dj/nb/dznb.vue deleted file mode 100644 index 38fc02f..0000000 --- a/src/views/ysjl/1000/dj/nb/dznb.vue +++ /dev/null @@ -1,810 +0,0 @@ - - - diff --git a/src/views/ysjl/1000/dj/nb/gynb.vue b/src/views/ysjl/1000/dj/nb/gynb.vue index b30d2ad..715f8ea 100644 --- a/src/views/ysjl/1000/dj/nb/gynb.vue +++ b/src/views/ysjl/1000/dj/nb/gynb.vue @@ -15,7 +15,6 @@ 预览 - @@ -27,9 +26,8 @@ - - - - + - + @@ -41,6 +39,18 @@ 编号重复 + + + + + + + + + + + + @@ -57,49 +67,37 @@ - - - - - - - - - - - - - - + + - - + + - + - + - - + + - - + + @@ -111,28 +109,16 @@ - - - - - - - - - - - - @@ -141,21 +127,26 @@ + + + + + + +
性能参数 - - - + + + + + - - - - - - @@ -278,6 +269,14 @@ + + + + + + + + @@ -288,74 +287,32 @@ - - - - - + + + + - - + +
- - - - - - - - - - - - - - - - - + + + + + - - + @@ -377,18 +331,15 @@ import Sticky from '@/components/Sticky' import SignName from '@/views/common/SignName' import Utils from '@/utils/contact' import merge from 'webpack-merge' -import Ft from '@/views/ysjl/1000/common/glft' -import ComplexBill from '@/views/chargeBill/components/complex' export default { name: 'GlGynbYsjl', - components: { SignName, Sticky, Ft, ComplexBill }, + components: { SignName, Sticky }, data() { return { - jlbh1: 'GN(', - jlbh2: new Date().getFullYear(), - jlbh3: ')', - jlbh4: '', + jlbh1: 'GN', + jlbh2: '(' + new Date().getFullYear() + ')', + jlbh3: '', ysjl: { shiyongdanwei: '' }, @@ -403,14 +354,23 @@ export default { users: [], checkedTab: 'first', ysjlId: this.$route.query.id, - complexShow: false + // 表格合并相关 + // 参与列合并的字段，在这里增加即可 + cols: [ + { + name: 'jianyanxiang', // 参与计算的列名，必须和el-table-column prop=''值一致 + getValue(row) { // 该列用于比较的值的获取方法 + return row.jianyanxiang + } + } + ] } }, computed: { jilubianhao: function() { let bianhao if (!this.ysjl.jilubianhao) { - return this.jlbh1 + this.jlbh2 + this.jlbh3 + '-' + this.jlbh4 + return this.jlbh1 + this.jlbh2 + '-' + this.jlbh3 } else { bianhao = this.ysjl.jilubianhao } @@ -418,8 +378,8 @@ export default { } }, watch: { - jlbh4: function(val) { - this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + this.jlbh3 + '-' + val + jlbh3: function(val) { + this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id) }, jilubianhao: function(newValue) { @@ -438,7 +398,7 @@ export default { this.getMaxBh() } else { this.getYsjl(this.$route.query.id) - this.getJyxmById() + this.getJyxm(1) } this.getUserList() }, @@ -457,7 +417,7 @@ export default { }, // 查询最大记录编号 getMaxBh() { - const aheadPart = this.jlbh1 + '' + this.jlbh2 + '' + this.jlbh3 + const aheadPart = this.jlbh1 + this.jlbh2 this.api({ url: '/ysjl/gainCurrentBh', method: 'get', @@ -466,7 +426,7 @@ export default { hinderPart: '' } }).then(data => { - this.jlbh4 = data + this.jlbh3 = data }) }, initYsjl() { @@ -474,7 +434,7 @@ export default { url: '/ysjl/initYsjl', method: 'post', data: { - modelId: this.$route.query.modelId, + templateId: this.$route.query.templateId, renwuId: this.$route.query.renwuId, neibuleibie: this.$route.query.neibuleibie, sblbdm: this.$route.query.sblbdm, @@ -485,22 +445,17 @@ export default { }).then(data => { this.ysjl = data.ysjl this.param = (data.param !== null && data.param !== undefined) ? data.param : {} + this.ysjl.jianyanjieshuriqi = this.formatter.dateFormat('YYYY-MM-dd') this.getXcjyrq() this.ysjl.jilubianhao = this.jilubianhao this.ysjl.baogaobianhao = null // 避免从设备中取值导致信息错误 this.ysjl.jianyanjielun = '符合要求' this.param.jiezhi = '水' this.ysjl.jigouhezhunzhenghao = process.env.VUE_APP_HZZBH - this.ysjl.jianyanyiju = '《锅炉安全技术监察规程》、《锅炉定期检验规则》' this.ysjl.beizhu = '/' this.ysjl.xiacijianyanriqishuoming = '/' this.ysjl.anzhuangdidian = this.ysjl.shiyongdanweiDizhi this.$set(this.param, 'qita', '/') - if (this.$route.query.sblbdm === '1100') { - this.$set(this.param, 'edinggonglv', 't/h') - } else { - this.$set(this.param, 'edinggonglv', 'MW') - } // 制造日期、投用日期、上次检验日期设置成正确的日期格式 this.ysjl.zhizaoriqi = this.common.checkDateFormat(this.ysjl.zhizaoriqi) this.ysjl.touyongriqi = this.common.checkDateFormat(this.ysjl.touyongriqi) @@ -509,14 +464,13 @@ export default { }, getYsjl(id) { this.api({ - url: '/ysjl/getYsjlById', + url: '/ysjl', method: 'get', params: { ysjlId: id } }).then(data => { - this.ysjl = data.ysjl - this.complexShow = true + this.ysjl = data if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) { this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) } @@ -547,7 +501,15 @@ export default { if (this.state === 'create') { url = '/jyxm/getCyJyxm' data = { - templateId: this.$route.query.modelId, + templateId: this.$route.query.templateId, + order: sort + } + } else { + url = '/jyxm/getCyJyxmByYsjl' + data = { + ysjlId: this.ysjlId, + isReport: false, + templateId: this.$route.query.templateId, order: sort } } @@ -556,40 +518,31 @@ export default { method: 'get', params: data }).then(data => { - for (let i = 0; i < data.length; i++) { - const sybjSRow = {} - this.$set(sybjSRow, 'C1', data[i].jianyanxiang) - this.$set(sybjSRow, 'C2', '√') - this.$set(sybjSRow, 'C3', data[i].jianyanneirong) - this.$set(sybjSRow, 'C4', '√') - this.$set(sybjSRow, 'C5', data[i].jianyanjieguo) - this.$set(sybjSRow, 'C6', '√') - this.$set(sybjSRow, 'C7', data[i].xiangmuleibie) - this.$set(sybjSRow, 'C8', '√') - if (data[i].gongzuojianzheng) { - this.$set(sybjSRow, 'C9', data[i].gongzuojianzheng) - this.$set(sybjSRow, 'C10', '√') - } - this.sybjSData.push(sybjSRow) - } - }) - }, - getJyxmById() { - this.api({ - url: '/jyxm/getJyxmInfoByYsjl', - method: 'get', - params: { - ysjlId: this.ysjlId, - type: 'jyxm' + if (this.state === 'create') { + data.forEach(row => { + this.sybjSData.push({ + id: row.id, + jianyanxiang: row.jianyanxiang, + jianyanneirong: row.jianyanneirong, + D1: row.jianyanjieguo + }) + }) + } else { + data.forEach(row => { + this.sybjSData.push({ + id: row.id, + jianyanxiang: row.jianyanxiang, + jianyanneirong: row.jianyanneirong, + D1: row.D1 + }) + }) } - }).then(data => { - data = JSON.parse(data) - this.sybjSData = data[0] + this.tableJs.getData(this.cols, undefined, this.sybjSData) }) }, getUserList() { this.api({ - url: '/user/getAllUserList', + url: '/user/all', method: 'get' }).then(data => { this.users = data @@ -597,26 +550,31 @@ export default { }, saveYsjl: function(operation) { if (operation === 'add') { - if (this.jlbh4.trim() === '') { + if (this.jlbh3.trim() === '') { this.$message({ message: '请先确认记录编号是否完整！', type: 'warning' }) return false } } // 把第一个检验项目表中的检验结果单独放到字段中 this.tableData = [] - this.tableData.push(this.sybjSData) - let url = '' + this.tableData.push(this.sybjSData.map(row => { + return { + id: row.id, + D1: row.D1 + } + })) + let method = '' this.ysjl.bglx = 1 this.ysjl.cjState = 'ysjl' - this.ysjl.zfState = '0' + this.ysjl.zfState = 0 this.ysjl.jianyanxiangmu = 'gynb' this.ysjl.jlprintState = 0 if (this.ysjl.jianyanjielun === '不符合要求') { this.ysjl.xiacijianyanriqi = null } if (operation === 'add') { - this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + this.jlbh3 + '-' + this.jlbh4 - url = '/ysjl/saveYsjl' + this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + this.jlbh3 + method = 'post' } else if (operation === 'build') { if (this.ysjl.jianyanrenyuan === null || this.ysjl.jianyanrenyuan === '') { this.$message({ @@ -632,9 +590,9 @@ export default { }) return false } - url = '/ysjl/updateYsjl' + method = 'put' } else if (operation === 'upd') { - url = '/ysjl/updateYsjl' + method = 'put' } if (this.isRepeat) { this.$message({ message: '记录编号重复，请先修改记录编号再保存', type: 'error' }) @@ -644,13 +602,15 @@ export default { if (valid) { const jyxm = JSON.stringify(this.tableData) this.api({ - url: url, - method: 'post', + url: '/ysjl', + method: method, data: { ysjl: this.ysjl, param: this.param, - jyxm: jyxm, - bgjyxm: jyxm, + cyJyxm: { + jyxm: jyxm, + bgjyxm: jyxm + }, flag: operation } }).then(data => { @@ -660,17 +620,11 @@ export default { this.$message({ message: '保存成功, 请前往待办记录中查看。', type: 'success' }) this.ysjl.id = data this.param.ysjlId = data - // 修改16版任务状态 - this.common.updStateByNew(this.ysjl.renwuId, '2', false) // 刷新路由网址 this.$store.dispatch('delCurrentViews', { view: this.$route, $router: this.$router }) - // this.$router.push({ - // path: '/ysjl/1000/nb/gynb' + '/' + this.ysjl.id, - // query: { state: 'update', id: this.ysjl.id, departmentId: this.ysjl.departmentId, jianyanrenyuan: this.ysjl.jianyanrenyuan } - // }) } else if (operation === 'upd') { this.$message({ message: '更新成功', type: 'success' }) // 替换路由中的参数 @@ -711,9 +665,9 @@ export default { }) }, getXcjyrq() { - var dateTemp = this.ysjl.jianyanjieshuriqi.split('-') - const xcjyrq = new Date((Number(dateTemp[0]) + 2) + '-' + dateTemp[1] + '-' + dateTemp[2]) - this.ysjl.xiacijianyanriqi = xcjyrq.setDate(xcjyrq.getDate() - 1) + const xcjyrq = new Date(this.ysjl.jianyanjieshuriqi) + xcjyrq.setFullYear(xcjyrq.getFullYear() + 2, xcjyrq.getMonth(), xcjyrq.getDate() - 1) + this.ysjl.xiacijianyanriqi = this.formatter.dateFormat('YYYY-MM-dd', xcjyrq) }, setYsjlData(data) { this.ysjl.sfdId = data diff --git a/src/views/ysjl/1000/dj/sy/2.0/sysy.vue b/src/views/ysjl/1000/dj/sy/2.0/sysy.vue deleted file mode 100644 index 55b4677..0000000 --- a/src/views/ysjl/1000/dj/sy/2.0/sysy.vue +++ /dev/null @@ -1,643 +0,0 @@ - - - - diff --git a/src/views/ysjl/1000/dj/sy/sysy.vue b/src/views/ysjl/1000/dj/sy/sysy.vue index 65b38fb..26ad209 100644 --- a/src/views/ysjl/1000/dj/sy/sysy.vue +++ b/src/views/ysjl/1000/dj/sy/sysy.vue @@ -15,7 +15,6 @@ 预览 - @@ -62,20 +61,20 @@ - + - - + + - - + + @@ -117,8 +116,8 @@ - - + +