Your Name
2022-08-24 bc2747387df0693aa46a55bb556985aaf881d843
导入
已修改11个文件
41 ■■■■■ 文件已修改
config/dev.env.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/riskLevelManage.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/riskSource.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/example/riskAnaUnit.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/example/riskControlMeasure.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/example/riskEvent.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/example/riskSource.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doublePreventAction/riskLevelManage/controlAction/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doublePreventAction/riskLevelManage/event/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
config/dev.env.js
@@ -22,11 +22,11 @@
    // BASE_API: '"http://192.168.0.8:8006"',
    // IMG_API: '"http://192.168.0.8:8006/upload/"',
    //
    BASE_API: '"http://192.168.0.69:8006"',
    IMG_API: '"http://192.168.0.69:8006/upload/"',
    // BASE_API: '"http://192.168.0.69:8006"',
    // IMG_API: '"http://192.168.0.69: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.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"',
src/api/riskLevelManage.js
@@ -69,7 +69,7 @@
        headers: {
            'Authorization': getToken()
        },
        url: process.env.BASE_API + '/riskAnaUnit/import',
        url: process.env.BASE_API + '/prevent/fileHandler/insert/riskUnitImport',
        method: 'post',
        data
    })
@@ -144,7 +144,7 @@
        headers: {
            'Authorization': getToken()
        },
        url: process.env.BASE_API + '/riskEvent/import',
        url: process.env.BASE_API + '/prevent/fileHandler/insert/eventImport',
        method: 'post',
        data
    })
@@ -222,7 +222,7 @@
        headers: {
            'Authorization': getToken()
        },
        url: process.env.BASE_API + '/riskControlMeasure/import',
        url: process.env.BASE_API + '/prevent/fileHandler/insert/measureImport',
        method: 'post',
        data
    })
src/api/riskSource.js
@@ -61,7 +61,7 @@
        headers: {
            'Authorization': getToken()
        },
        url: process.env.BASE_API + '/riskSource/import',
        url: process.env.BASE_API + '/prevent/fileHandler/insert/deviceImport',
        method: 'post',
        data
    })
src/assets/example/riskAnaUnit.xlsx
Binary files differ
src/assets/example/riskControlMeasure.xlsx
Binary files differ
src/assets/example/riskEvent.xlsx
Binary files differ
src/assets/example/riskSource.xlsx
Binary files differ
src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
@@ -31,7 +31,7 @@
            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="refreshHandle">搜索</el-button>
            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-plus" @click="showAnalyseUnitForm('','新增')">新增</el-button>
<!--            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showDepartmentChart()">图表</el-button>-->
<!--            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showImportDialog()">导入</el-button>-->
            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showImportDialog()">导入</el-button>
<!--            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="exportToExcel()">导出</el-button>-->
        </div>
        <div class="table_content">
src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
@@ -20,7 +20,7 @@
            </div>
            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="refreshHandle">搜索</el-button>
            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-plus" @click="showRiskControlMeasureForm('','新增')" v-show="showCurrent">新增</el-button>
<!--            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showImportDialog()">导入</el-button>-->
            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showImportDialog()">导入</el-button>
<!--            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" @click="exportToExcel">导出</el-button>-->
        </div>
        <div class="table_content">
src/views/doublePreventAction/riskLevelManage/event/index.vue
@@ -8,7 +8,7 @@
            </div>
            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="refreshHandle">搜索</el-button>
            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-plus" @click="showRiskEvent('','新增')">新增</el-button>
<!--            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showImportDialog()">导入</el-button>-->
            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showImportDialog()">导入</el-button>
<!--            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" @click="exportToExcel">导出</el-button>-->
        </div>
        <div class="table_content">
src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue
@@ -55,7 +55,7 @@
               <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="refreshHandle">搜索</el-button>
               <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-plus" @click="showRiskSourceForm('','新增')">新增</el-button>
<!--               <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showImportDialog()">导入</el-button>-->
               <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showImportDialog()">导入</el-button>
<!--               <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="exportToExcel()">导出</el-button>-->
           </div>
        <div class="table_content">
@@ -440,21 +440,28 @@
                        })
                    }
                    else{
                        let allData = res.data.result
                        let allData = res.data.result.map(item => {
                            return {
                                name:item.name,
                                level:this.levelList.find(i =>i.id === item.level).name,
                                depName:item.depName,
                                location:item.location,
                            }
                        })
                        import('@/vendor/Export2Excel').then((excel) => {
                            const tHeader = [
                                '生产装置名称',
                                '风险等级',
                                '可能导致的事故描述',
                                '区域位置',
                                '所属部门名称',
                                '区域位置',
                            ]
                            const filterVal = [
                                'name',
                                'level',
                                'accidentDesc',
                                'location',
                                'depName',
                                'location',
                            ]
                            const data = this.formatJson(filterVal, allData)
                            excel.export_json_to_excel({