shj
2022-03-31 79d1e74879f8d2cb80c74d3b498d436f04e0ffce
Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf
已修改4个文件
已添加1个文件
45 ■■■■■ 文件已修改
src/assets/example/instrumentData.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
src/views/contingencyplan/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/contingencyplan/uploadFile.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/contingencyplan/uploadImg.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/majorHazardSourceMonitoring/instrumentData/index.vue 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/example/instrumentData.xlsx
Binary files differ
src/views/contingencyplan/index.vue
@@ -150,7 +150,8 @@
      uploadImgSuccess(res){
          let file = {
              fileUrl : res.fileUrl,
              fileName : res.fileName
              fileName : res.fileName,
              url:res.url
          }
          this.fileList.push(file)
      },
src/views/contingencyplan/uploadFile.vue
@@ -73,7 +73,6 @@
  methods: {
      downLoadFile(fileUrl){
          console.log(123,fileUrl)
          let a = document.createElement('a')
          // a.href = this.defaultUrl+`/upload/downloadNew?path=`+encodeURI(fileUrl)
          a.href = process.env.BASE_API + '/upload/'+fileUrl
src/views/contingencyplan/uploadImg.vue
@@ -93,17 +93,11 @@
                    if (res.data.code==200){
                        this.fileUrl = res.data.result.fileUrl
                        this.fileName = res.data.result.fileName
                        this.fileList.push(
                            {
                                fileUrl: res.data.result.fileUrl,
                                fileName:res.data.result.fileName,
                                url:process.env.IMG_API + 'emergencyPlan/'+res.data.result.fileName
                            }
                        )
                        this.$nextTick(() => {
                            this.$emit('uploadImgSuccess', {
                                fileName: this.fileName,
                                fileUrl: this.fileUrl
                                fileUrl: this.fileUrl,
                                url:process.env.IMG_API + 'emergencyPlan/'+res.data.result.fileName
                            });
                        });
                        this.$message({
src/views/majorHazardSourceMonitoring/instrumentData/index.vue
@@ -7,27 +7,12 @@
                        <el-input v-model="listQuery.filter.equipmentName" clearable></el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="8" style="text-align: center">
                    <el-button type="primary" icon="el-icon-search" @click="find()" class="btns"
                    >搜索</el-button
                    >
                    <el-button
                        type="primary"
                        icon="el-icon-plus"
                        class="btns"
                        @click="handleClick('', '新增')"
                    >新增</el-button
                    >
                    <el-button
                        type="primary"
                        icon="el-icon-plus"
                        class="btns"
                        @click="importData()"
                    >导入</el-button
                    >
                    <el-button type="primary" icon="el-icon-refresh" @click="reset()" class="btns"
                    >重置</el-button
                    >
                <el-col :span="10" style="text-align: center">
                    <el-button type="primary" icon="el-icon-search" @click="find()" class="btns">搜索</el-button>
                    <el-button type="primary" icon="el-icon-refresh" @click="reset()" class="btns">重置</el-button>
                    <el-button type="primary" icon="el-icon-plus" class="btns" @click="handleClick('', '新增')">新增</el-button>
                    <el-button type="primary" icon="el-icon-plus" class="btns" @click="importData()">导入</el-button>
                    <el-button type="primary"  class="btns" @click="exportTemplate()">下载导入模板</el-button>
                </el-col>
            </el-row>
        </el-form>
@@ -174,6 +159,7 @@
    } from "@/api/majorEquipmentData.js";
    import { majorEquipmentErt } from "@/api/majorEquipment.js";
    import XLSX from 'xlsx'
    const exampleFile = require('@/assets/example/instrumentData.xlsx')
    export default {
        data() {
            return {
@@ -241,6 +227,9 @@
            this.initMajorEquipment()
        },
        methods: {
            exportTemplate(){
                window.open(exampleFile, '_blank')
            },
            importData(){
                let input = document.createElement('input'); input.type = 'file';