From fb80f4719b548390e3d4fbf1ff8a630b6b0f198b Mon Sep 17 00:00:00 2001 From: Your Name <123456> Date: 星期四, 23 六月 2022 09:35:27 +0800 Subject: [PATCH] 'lct' --- src/api/riskLevelManage.js | 6 +++--- src/views/doublePreventAction/riskLevelManage/controlAction/index.vue | 29 +++++++++++++++++++++++++++-- config/dev.env.js | 8 ++++---- src/assets/example/riskControlMeasure.xlsx | 0 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/config/dev.env.js b/config/dev.env.js index 7853535..613dfcc 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -19,15 +19,15 @@ // BASE_API: '"http://192.168.0.35:8006"', // IMG_API: '"http://192.168.0.35:8006/upload/"', - // BASE_API: '"http://192.168.0.8:8006"', - // IMG_API: '"http://192.168.0.8:8006/upload/"', + BASE_API: '"http://192.168.0.8:8006"', + IMG_API: '"http://192.168.0.8:8006/upload/"', // BASE_API: '"http://192.168.0.35:8006"', // IMG_API: '"http://192.168.0.35:8006/upload/"', // BASE_API: '"http://192.168.0.62:8006"', // IMG_API: '"http://192.168.0.62:8006/upload/"', - BASE_API: '"http://222.92.213.22:8006/zhongtai"', - IMG_API: '"http://222.92.213.22:8006/zhongtai/upload/"', + // BASE_API: '"http://222.92.213.22:8006/zhongtai"', + // IMG_API: '"http://222.92.213.22:8006/zhongtai/upload/"', // NANO_API: '"http://222.92.213.22:8006/nanoweb"', // ZT_API:'"http://123.56.127.115:8011"' // BASE_API: '"http://localhost:8006"', diff --git a/src/api/riskLevelManage.js b/src/api/riskLevelManage.js index ca6e9c2..c030fc5 100644 --- a/src/api/riskLevelManage.js +++ b/src/api/riskLevelManage.js @@ -52,7 +52,7 @@ 'Authorization': getToken() }, url: process.env.BASE_API + '/riskAnaUnit/export', - method: 'post', + method: 'get', }) } @@ -117,7 +117,7 @@ 'Authorization': getToken() }, url: process.env.BASE_API + '/riskEvent/export', - method: 'post', + method: 'get', }) } @@ -183,7 +183,7 @@ 'Authorization': getToken() }, url: process.env.BASE_API + '/riskControlMeasure/export', - method: 'post', + method: 'get', }) } diff --git a/src/assets/example/riskControlMeasure.xlsx b/src/assets/example/riskControlMeasure.xlsx index 61cc31e..024f3a7 100644 --- a/src/assets/example/riskControlMeasure.xlsx +++ b/src/assets/example/riskControlMeasure.xlsx Binary files differ diff --git a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue index 6b12c45..fcd773a 100644 --- a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue +++ b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue @@ -59,6 +59,10 @@ </el-table-column> <el-table-column label="检查类型" prop="hazardLiablePerson" align="center"> </el-table-column> + <el-table-column label="周期" prop="timeEffect" align="center"> + </el-table-column> + <el-table-column label="单位" prop="timeUnit" align="center"> + </el-table-column> <el-table-column label="创建人" prop="createBy" align="center"> </el-table-column> <el-table-column label="创建时间" prop="createTime" align="center"> @@ -141,6 +145,20 @@ <el-form-item label="隐患排查内容" prop="troubleshootContent"> <el-input type="textarea" :rows="4" v-model="riskControlMeasureForm.troubleshootContent" class="analyseUnit_input"></el-input> </el-form-item> + <el-form-item label="周期" prop="timeEffect"> + <el-input v-model="riskControlMeasureForm.timeEffect" type="number" class="analyseUnit_input"></el-input> + </el-form-item> + <el-form-item label="单位" prop="timeUnit"> + <el-select v-model="riskControlMeasureForm.timeUnit" class="analyseUnit_input"> + <el-option + v-for="item in timeUnitList" + :key="item.id" + :value="item.name" + :label="item.name" + > + </el-option> + </el-select> + </el-form-item> </el-form> <div align="right"> <el-button @click="riskControlMeasureVisible = false">取消</el-button> @@ -206,6 +224,7 @@ classifyOneList:[], classifyTwoList:[], riskControlMeasureIdList:[], + timeUnitList:[{id:1,name:'天'},{id:1,name:'周'},{id:1,name:'月'},], listLoading: false, showCurrent:true, showOther:false, @@ -227,6 +246,8 @@ classify2: [{ required: true, message: '管控措施分类2不能为空', trigger: 'change' }], classify3: [{ required: true, message: '管控措施分类3不能为空', trigger: 'blur' }], troubleshootContent: [{ required: true, message: '隐患排查内容不能为空', trigger: 'change' }], + timeEffect: [{ required: true, message: '周期不能为空', trigger: 'blur' }], + timeUnit: [{ required: true, message: '单位不能为空', trigger: 'change' }], }, riskControlMeasureForm:{ id: null, @@ -243,7 +264,9 @@ createBy: "", updateBy: "", riskEvent: { - } + }, + timeEffect:"", + timeUnit:"", }, listQuery:{ pageIndex:1, @@ -354,7 +377,9 @@ createBy: "", updateBy: "", riskEvent: { - } + }, + timeEffect:"", + timeUnit:"", } }else{ this.title = '修改' -- Gitblit v1.9.2