From c1df656dee7e75d109d2bee05f0c129e13e9367a Mon Sep 17 00:00:00 2001
From: panzy <225@qq.com>
Date: Sat, 21 May 2022 06:49:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shf' into shf
---
src/views/troubleshooting/index.vue | 444 ++++++++++++++++++++++--------------------------------
1 files changed, 183 insertions(+), 261 deletions(-)
diff --git a/src/views/troubleshooting/index.vue b/src/views/troubleshooting/index.vue
index 8879d09..8bd210f 100644
--- a/src/views/troubleshooting/index.vue
+++ b/src/views/troubleshooting/index.vue
@@ -4,61 +4,27 @@
ref="form"
:inline="true"
class="inquire"
- :model="form"
+ :model="listQuery.form"
label-width="100px"
>
<el-form-item label="地点">
- <el-input
- v-model="listQuery.form.address"
- style="width: 202px"
- placeholder="请输入内容"
- ></el-input>
+ <el-input v-model="listQuery.form.ADDRESS" style="width: 202px" placeholder="请输入内容"></el-input>
</el-form-item>
<el-form-item label="主持人">
- <el-input
- v-model="listQuery.form.ht_content"
- style="width: 202px"
- placeholder="请输入内容"
- ></el-input>
+ <el-input v-model="listQuery.form.HOST" style="width: 202px" placeholder="请输入内容"></el-input>
</el-form-item>
<el-form-item label="召开时间">
<el-col :span="11">
- <el-date-picker
- type="date"
- placeholder="选择日期"
- v-model="listQuery.form.check_dateStart"
- style="width: 100%"
- value-format="yyyy-MM-dd"
- ></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.Conference_TimeStart" style="width: 100%" value-format="yyyy-MM-dd"></el-date-picker>
</el-col>
<el-col style="text-align: center" :span="2">-</el-col>
<el-col :span="11">
- <el-date-picker
- type="date"
- placeholder="选择日期"
- v-model="listQuery.form.check_dateEnd"
- style="width: 100%"
- value-format="yyyy-MM-dd"
- ></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.Conference_TimeEnd" style="width: 100%" value-format="yyyy-MM-dd"></el-date-picker>
</el-col>
</el-form-item>
<el-form-item style="text-align: center; padding: 0 50px">
- <el-button
- type="primary"
- class="btns"
- size="small"
- icon="el-icon-search"
- @click="getPageList()"
- >查询</el-button
- >
- <el-button
- type="primary"
- class="btns"
- size="small"
- icon="el-icon-refresh-right"
- @click="reset()"
- >重置</el-button
- >
+ <el-button type="primary" class="btns" size="small" icon="el-icon-search" @click="getPageList()">查询</el-button>
+ <el-button type="primary" class="btns" size="small" icon="el-icon-refresh-right" @click="reset()">重置</el-button>
</el-form-item>
</el-form>
<el-row class="title-center">
@@ -72,47 +38,30 @@
<div v-if="listQuery.type==0">
<el-col :span="10">
<el-row>
- <el-col :span="7" :offset="7" style="text-align: right;"
- ><span style="line-height: 36px; font-size: 14px; color: #606266;margin-right:10px;font-weight: bold;"
- >请选择上报方式</span
- ></el-col
- >
+ <el-col :span="7" :offset="7" style="text-align: right;">
+ <span style="line-height: 36px; font-size: 14px; color: #606266;margin-right:10px;font-weight: bold;">请选择上报方式</span>
+ </el-col>
<el-col :span="10">
- <el-select
- v-model="listQuery.form.check_main_branch"
- placeholder="请选择"
- @change="changeJCDW"
- >
- <el-option
- v-for="item in JCDWList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- <el-button type="primary" class="btns" size="small"
- >上报</el-button
- >
+ <el-select v-model="listQuery.form.check_main_branch" placeholder="请选择" @change="changeUpType">
+ <el-option v-for="item in upTypeList" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="6">
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.Conference_TimeStart" style="width: 100%" value-format="yyyy-MM-dd"></el-date-picker>
+ </el-col>
+ <el-col style="text-align: center" :span="2">至</el-col>
+ <el-col :span="6">
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.Conference_TimeEnd" style="width: 100%" value-format="yyyy-MM-dd"></el-date-picker>
+ </el-col>
+ <el-col :span="10">
+ <el-button type="primary" class="btns" size="small">上报</el-button>
</el-col>
</el-row>
</el-col>
<el-col :span="4" style="text-align: right">
- <el-button
- class="btns"
- type="primary"
- size="small"
- icon="el-icon-plus"
- >添加</el-button
- >
- <el-button
- class="btns"
- type="primary"
- size="small"
- icon="el-icon-close"
- @click="sendBath()"
- >批量删除</el-button
- >
+ <el-button class="btns" type="primary" size="small" icon="el-icon-plus">添加</el-button>
+ <el-button class="btns" type="primary" size="small" icon="el-icon-close" @click="sendBath()">批量删除</el-button>
</el-col>
</div>
<div v-if="listQuery.type==1">
@@ -128,73 +77,56 @@
</el-row>
<el-row class="title-center">
<el-col :span="10">
- <el-radio-group v-model="radio1">
+ <el-radio-group v-model="listQuery.form.CONFERENCE_PROFESSIONAL" @change="changeType2">
<el-radio-button label="0">全部</el-radio-button>
- <el-radio-button label="1">综合</el-radio-button>
- <el-radio-button label="2">生产</el-radio-button>
- <el-radio-button label="3">设备</el-radio-button>
- <el-radio-button label="4">电器</el-radio-button>
- <el-radio-button label="5">仪表</el-radio-button>
- <el-radio-button label="6">消防</el-radio-button>
- <el-radio-button label="7">安全管理</el-radio-button>
- <el-radio-button label="8">其他</el-radio-button>
+ <el-radio-button label="综合">综合</el-radio-button>
+ <el-radio-button label="生产">生产</el-radio-button>
+ <el-radio-button label="设备">设备</el-radio-button>
+ <el-radio-button label="电器">电器</el-radio-button>
+ <el-radio-button label="仪表">仪表</el-radio-button>
+ <el-radio-button label="消防">消防</el-radio-button>
+ <el-radio-button label="安全管理">安全管理</el-radio-button>
+ <el-radio-button label="其他">其他</el-radio-button>
</el-radio-group>
</el-col>
</el-row>
- <el-table
- :data="tableData"
- style="width: 100%"
- @selection-change="changeBox"
- >
- <el-table-column
- type="selection"
- width="55"
- align="center"
- ></el-table-column>
- <el-table-column
- v-if="listQuery.type==2"
- prop="number"
- label="会议单位"
- align="center"
- width="120"
- ></el-table-column>
- <el-table-column
- prop="number"
- label="召开时间"
- align="center"
- width="120"
- ></el-table-column>
- <el-table-column
- prop="check_branch"
- label="地点"
- align="center"
- width="120"
- ></el-table-column>
- <el-table-column
- prop="check_man"
- label="主持人"
- align="center"
- width="120"
- ></el-table-column>
- <el-table-column
- prop="checktype"
- label="会议专业"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="checktype"
- label="会议摘要"
- align="center"
- ></el-table-column>
- <el-table-column prop="DTRisk_level" label="会议纪要" align="center">
- </el-table-column>
- <el-table-column prop="date" v-if="listQuery.type==0" label="基本操作" align="center">
- <template slot-scope="scope">
- <el-button @click="updateClick(scope.row)" type="text" size="small">编辑</el-button>
- <el-button @click="updateClick(scope.row)" type="text" size="small">保存</el-button>
- <el-button @click="deleteClick(scope.row)" type="text" size="small">删除</el-button>
- </template>
- </el-table-column>
+ <el-table :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center"></el-table-column>
+ <el-table-column v-if="listQuery.type==2" prop="communityname" label="会议单位" align="center" width="120"></el-table-column>
+ <el-table-column prop="CONFERENCE_TIME" label="召开时间" :formatter="formatColumnDate" align="center" width="120"></el-table-column>
+ <el-table-column prop="ADDRESS" label="地点" align="center" width="120"></el-table-column>
+ <el-table-column prop="HOST" label="主持人" align="center" width="120"></el-table-column>
+ <el-table-column prop="CONFERENCE_PROFESSIONAL" label="会议专业" align="center" width="120"></el-table-column>
+ <el-table-column prop="meeting_content" label="会议摘要" align="center"></el-table-column>
+ <el-table-column prop="realFileName" label="会议纪要" align="center">
+ <template slot-scope="scope" >
+ <el-upload
+ class="upload-demo"
+ ref="upload"
+ v-if="listQuery.type==0"
+ :http-request="uploadSectionFile"
+ :on-preview="handlePreview"
+ :on-remove="handleRemove"
+ :file-list="fileList"
+ :before-upload="beforeUpload"
+ :auto-upload="true">
+ <el-button slot="trigger" size="small" type="primary" class="btns">上传附件</el-button>
+ </el-upload>
+ <div v-else
+ v-for="item in scope.row.realFileName">
+ <el-link type="primary" @click="downloadFile(subFile(item))">
+ {{subFile(item)}}
+ </el-link>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="date" v-if="listQuery.type==0" label="基本操作" align="center">
+ <template slot-scope="scope">
+ <el-button @click="updateClick(scope.row)" type="text" size="small">编辑</el-button>
+ <el-button @click="updateClick(scope.row)" type="text" size="small">保存</el-button>
+ <el-button @click="deleteClick(scope.row)" type="text" size="small">删除</el-button>
+ </template>
+ </el-table-column>
</el-table>
<div style="text-align: right">
<el-pagination
@@ -212,61 +144,43 @@
</div>
</template>
<script>
-import { getPageList, analogy_export_do } from "@/api/sgyhpczl/oneFromanotherN";
+import {getPageList, dowloand_do} from "@/api/sgyhpczl/troubleshooting";
+import {uploadFile} from "@/api/sgyhpczl/hiddenDangerRectification";
+
import {
- initJCBM,
initYHLX,
- initJCLB,
- initYHJB,
} from "@/api/sgyhpczl/initSelect";
export default {
- data() {
- return {
- listQuery: {
- page: 1,
- limit: 10,
- type: 0,
- form: {},
- },
- radio1: 0,
- table1: true,
- table2: false,
+ data() {
+ return {
+ listQuery: {
+ page: 1,
+ limit: 10,
+ type: 0,//type=0 待上报 type=1 已上报 type=2 上级公司会议
+ form: {
+ CONFERENCE_PROFESSIONAL: '0'
+ },
+ },
+ table1: true,
+ table2: false,
- currentPage: 1,
- pageSize: 10,
- recordTotal: 0,
- XFDWList: [],
- YHLBList: [],
- YHJBList: [],
- JCLBList: [],
- tableData: [],
- selectedList: [],
- listLoading: false,
- selfInspectVisible: false,
- selfInspectForm: {
- id: "",
- markUserName: "",
- markDate: "",
- remark: "",
- },
- selfInspectFormRules: {
- markUserName: [
- { required: true, message: "自查人不能为空", trigger: "blur" },
- ],
- markDate: [
- { required: true, message: "自查时间不能为空", trigger: "blur" },
- ],
- },
- };
+ currentPage: 1,
+ pageSize: 10,
+ recordTotal: 0,
+ YHLXList:[],
+ tableData: [],
+ selectedList: [],
+ listLoading: false,
+ fileList:[],
+ upTypeList:[{label:"按勾选上报",value:0},{label:"按时间上报",value:1}],
+ upTimeShow: false,
+ };
},
- mounted() {
- this.getPageList();
- this.initJCLB();
- this.initXFDW();
- this.initYHJB();
- this.initYHLB();
- },
+ mounted() {
+ this.getPageList();
+ this.initYHLX();
+ },
methods: {
sendBath() {
this.$router.push({
@@ -292,58 +206,20 @@
this.table2 = false;
}
},
- initXFDW() {
- initJCBM(1).then((res) => {
- if (res.data.ok == 1) {
- this.XFDWList = res.data.data;
- } else {
- this.$message({
- type: "error",
- message: res.data.msg,
- duration: 3000,
- });
- }
- });
- },
- initYHLB() {
- initYHLX().then((res) => {
- if (res.data.ok == 1) {
- this.YHLBList = res.data.data;
- } else {
- this.$message({
- type: "error",
- message: res.data.msg,
- duration: 3000,
- });
- }
- });
- },
- initYHJB() {
- initYHJB().then((res) => {
- if (res.data.ok == 1) {
- this.YHJBList = res.data.data;
- } else {
- this.$message({
- type: "error",
- message: res.data.msg,
- duration: 3000,
- });
- }
- });
- },
- initJCLB() {
- initJCLB().then((res) => {
- if (res.data.ok == 1) {
- this.JCLBList = res.data.data;
- } else {
- this.$message({
- type: "error",
- message: res.data.msg,
- duration: 3000,
- });
- }
- });
- },
+ initYHLX(){
+ initYHLX().then(res=>{
+ if (res.data.ok==1){
+ this.YHLXList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ changeUpType(val){
+ if (val == 1){
+ this.upTimeShow = true
+ }
+ },
checkTime() {
if (
this.listQuery.form.check_dateStart != null &&
@@ -429,33 +305,79 @@
this.listQuery.type = val;
this.getPageList();
},
+ changeType2(val){
+ this.listQuery.form.CONFERENCE_PROFESSIONAL = val;
+ this.getPageList();
+ },
handleSelectionChange(val) {
this.selectedList = [];
val.forEach((item) => {
this.selectedList.push(item);
});
},
- exportData() {
- var requestData = this.listQuery;
- //删除分页参数
- this.$delete(requestData, "page");
- this.$delete(requestData, "limit");
- analogy_export_do(requestData)
- .then((res) => {
- var blob = new Blob([res.data]);
- var downloadElement = document.createElement("a");
- var href = window.URL.createObjectURL(blob); //创建下载的链接
- downloadElement.href = href;
- downloadElement.download = "内部举一反三.xlsx"; //下载后文件名
- document.body.appendChild(downloadElement);
- downloadElement.click(); //点击下载
- document.body.removeChild(downloadElement); //下载完成移除元素
- window.URL.revokeObjectURL(href); //释放掉blob对象
- })
- .catch((err) => {
- console.log(err);
- });
- },
+ uploadSectionFile(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 + param.file.realFileName;
+ }
+ that.ruleForm.realFileName = that.ruleForm.realFileName + "," + fileName;
+ }
+ }).error(res => {
+ this.$message({
+ type: 'error',
+ message: '附件上传失败，请重试！'
+ });
+ })
+ },
+ downloadFile(path){
+ let params = {
+ type: 1,
+ fileName: path,
+ };
+ dowloand_do(params).then((res) => {
+ if (res.data.ok == 1) {
+ this.$notify({
+ title: "成功",
+ message: res.data,
+ type: "success",
+ duration: 2000,
+ });
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ },
+ subFile(fileName){
+ return fileName.substring(fileName.indexOf("fileName=")+9)
+ },
+ handleRemove(file, fileList) {
+ console.log(file, fileList)
+ },
+ handlePreview(file) {
+ console.log(file)
+ },
+ beforeUpload(file) {
+ var FileExt = file.name.replace(/.+\./, "");
+ if (['jpg', 'png', 'bmp', 'gif', 'jpeg'].indexOf(FileExt.toLowerCase()) === -1) {
+ this.$message({
+ type: 'warning',
+ message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片！'
+ });
+ return false;
+ }
+ },
//日期格式转换
formatColumnDate(row, column) {
// 获取单元格数据
--
Gitblit v1.9.2