From 79d1e74879f8d2cb80c74d3b498d436f04e0ffce Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期四, 31 三月 2022 11:37:09 +0800
Subject: [PATCH] Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf
---
src/views/contingencyplan/uploadImg.vue | 10 ++--------
src/views/majorHazardSourceMonitoring/instrumentData/index.vue | 31 ++++++++++---------------------
src/assets/example/instrumentData.xlsx | 0
src/views/contingencyplan/index.vue | 3 ++-
src/views/contingencyplan/uploadFile.vue | 1 -
5 files changed, 14 insertions(+), 31 deletions(-)
diff --git a/src/assets/example/instrumentData.xlsx b/src/assets/example/instrumentData.xlsx
new file mode 100644
index 0000000..8c1cd15
--- /dev/null
+++ b/src/assets/example/instrumentData.xlsx
Binary files differ
diff --git a/src/views/contingencyplan/index.vue b/src/views/contingencyplan/index.vue
index 95fafe5..eadfaf8 100644
--- a/src/views/contingencyplan/index.vue
+++ b/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)
},
diff --git a/src/views/contingencyplan/uploadFile.vue b/src/views/contingencyplan/uploadFile.vue
index e4b8006..9181943 100644
--- a/src/views/contingencyplan/uploadFile.vue
+++ b/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
diff --git a/src/views/contingencyplan/uploadImg.vue b/src/views/contingencyplan/uploadImg.vue
index 5613f0c..a4aaad7 100644
--- a/src/views/contingencyplan/uploadImg.vue
+++ b/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({
diff --git a/src/views/majorHazardSourceMonitoring/instrumentData/index.vue b/src/views/majorHazardSourceMonitoring/instrumentData/index.vue
index 6e76326..09f6c2f 100644
--- a/src/views/majorHazardSourceMonitoring/instrumentData/index.vue
+++ b/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';
--
Gitblit v1.9.2