From 5e985136d59734a3821e6043fa429b7fdd420239 Mon Sep 17 00:00:00 2001
From: cqf
Date: 星期三, 15 六月 2022 17:17:22 +0800
Subject: [PATCH] 样式修改
---
src/api/sgyhpczl/hiddenDangerRegistration.js | 14 ++++++
src/views/hiddenDangerRegistration/index.vue | 72 ++++++++++++++++++-----------------
src/views/hiddenDangerRegistration/hiddenDangerAdd.vue | 24 +++++++++++-
3 files changed, 72 insertions(+), 38 deletions(-)
diff --git a/src/api/sgyhpczl/hiddenDangerRegistration.js b/src/api/sgyhpczl/hiddenDangerRegistration.js
index 75ea8f4..dea7921 100644
--- a/src/api/sgyhpczl/hiddenDangerRegistration.js
+++ b/src/api/sgyhpczl/hiddenDangerRegistration.js
@@ -188,4 +188,16 @@
params:params?params:{}
});
}
-
+//导入
+export function danger_import_do(data) {
+ return request({
+ headers: {
+ 'token': getTokenAndVerify().token,
+ 'verify': getTokenAndVerify().verify
+ },
+ url: '/taboi/excel/danger_import_do',
+ contentType: "multipart/form-data",
+ method: 'POST',
+ data,
+ });
+}
diff --git a/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue b/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue
index 8835df8..b6442e7 100644
--- a/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue
+++ b/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue
@@ -115,8 +115,28 @@
<el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
<el-table-column prop="ht_branch" align="center" label="隐患部门"></el-table-column>
<el-table-column prop="address" align="center" label="地点"></el-table-column>
- <el-table-column prop="ht_content" align="center" label="隐患内容"></el-table-column>
- <el-table-column prop="measure" align="center" label="整改措施"></el-table-column>
+ <el-table-column prop="ht_content" align="center" label="隐患内容">
+ <template slot-scope="scope">
+ <el-popover trigger="hover" placement="top">
+ <p>{{ scope.row.ht_content }}</p>
+ <div slot="reference" class="name-wrapper">{{
+ scope.row.ht_content != null && scope.row.ht_content.length > 10 ? scope.row.ht_content.substring(0, 8) + "...." : scope.row.ht_content
+ }}
+ </div>
+ </el-popover>
+ </template>
+ </el-table-column>
+ <el-table-column prop="measure" align="center" label="整改措施">
+ <template slot-scope="scope">
+ <el-popover trigger="hover" placement="top">
+ <p>{{ scope.row.measure }}</p>
+ <div slot="reference" class="name-wrapper">{{
+ scope.row.measure != null && scope.row.measure.length > 10 ? scope.row.measure.substring(0, 8) + "...." : scope.row.measure
+ }}
+ </div>
+ </el-popover>
+ </template>
+ </el-table-column>
<el-table-column prop="ht_typesub" align="center" label="隐患类别"></el-table-column>
<el-table-column prop="dangerousSource" align="center" label="关联危险源"></el-table-column>
<el-table-column prop="DTRisk_level" align="center" label="风险等级"></el-table-column>
diff --git a/src/views/hiddenDangerRegistration/index.vue b/src/views/hiddenDangerRegistration/index.vue
index 5a6057f..dabdfb3 100644
--- a/src/views/hiddenDangerRegistration/index.vue
+++ b/src/views/hiddenDangerRegistration/index.vue
@@ -140,42 +140,45 @@
</el-form-item>
</el-form>
<el-row class="title-center">
- <el-col :span="fileSpan">
+ <el-col :span="14">
<el-form ref="form" :inline="true" :model="form" label-width="100px">
<el-form-item label="EXCEL导入">
<!-- <el-input v-model="form.name" placeholder="未选择文件"></el-input>-->
<el-upload
class="upload-demo inline-block margin-right-10"
ref="upload"
+ action=""
:http-request="uploadSectionFile"
:on-preview="handlePreview"
:on-remove="handleRemove"
:file-list="fileList"
:before-upload="beforeUpload"
- :auto-upload="true"
+ :auto-upload="false"
>
<el-button type="primary" size="small" class="btns">选择文件</el-button>
+ <el-button
+ type="primary"
+ class="btns"
+ size="small"
+ icon="el-icon-bottom"
+ @click="dangerImport"
+ >导入</el-button
+ >
+ <el-button
+ type="primary"
+ class="btns"
+ size="small"
+ icon="el-icon-download"
+ @click="downloadTemplate"
+ >下载模板</el-button
+ >
</el-upload>
</el-form-item>
</el-form>
</el-col>
- <el-col :span="14-fileSpan">
- <el-button
- type="primary"
- class="btns"
- size="small"
- icon="el-icon-bottom"
- >导入</el-button
- >
- <el-button
- type="primary"
- class="btns"
- size="small"
- icon="el-icon-download"
- @click="downloadTemplate"
- >下载模板</el-button
- >
- </el-col>
+<!-- <el-col :span="14-fileSpan">-->
+<!-- -->
+<!-- </el-col>-->
<el-col :span="10" style="text-align: right">
<el-button
class="btns"
@@ -284,7 +287,7 @@
</div>
</template>
<script>
-import {getPageList,delDanger,analogy_export_do,downloadFile} from "@/api/sgyhpczl/hiddenDangerRegistration";
+import {getPageList,delDanger,analogy_export_do,downloadFile,danger_import_do} from "@/api/sgyhpczl/hiddenDangerRegistration";
import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr} from "@/api/sgyhpczl/initSelect";
export default {
data() {
@@ -474,26 +477,25 @@
return false;
}
},
+ //上传
uploadSectionFile(param) {
+ console.log(param)
let form = new FormData();
- var that = this;
form.append('file', param.file);
- //隐患延期申请附件
- form.append('type', "0");
- uploadFile(form).then(res => {
- var data = res.data;
- if (data.ok) {
- var fileName = data.data.fileName[0];
- if (!fileName.endsWith("a62b")) {
- fileName = fileName + "a62b";
- }
- var fileObj = {
- "fileName": fileName,
- "uid": param.file.uid
- }
- this.fileNameList.push(fileObj);
+ danger_import_do(form).then(res=>{
+ if (res.data.ok==1){
+ console.log(res.data)
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
}
+ }).catch(err => {
+ console.log(err)
})
+
+ },
+ //导入
+ dangerImport(){
+ this.$refs.upload.submit();
},
//下载模板
downloadTemplate(){
--
Gitblit v1.9.2