Merge branch 'master' of http://106.55.241.82:3000/lzf/zhbsq-vue-web into master

src/api/portal/APICONFIG/APICONFIG.js

@@ -0,0 +1,81 @@
+import request from '@/utils/request'
+
+// 查询数据接口api配置列表
+export function listAPICONFIG(query) {
+  return request({
+    url: '/APICONFIG/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询数据接口api配置所有列表
+export function listAllAPICONFIG(query) {
+  return request({
+    url: '/APICONFIG/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询数据接口api配置详细
+export function getAPICONFIG(id) {
+  return request({
+    url: '/APICONFIG/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增数据接口api配置
+export function addAPICONFIG(data) {
+  return request({
+    url: '/APICONFIG/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改数据接口api配置
+export function updateAPICONFIG(data) {
+  return request({
+    url: '/APICONFIG/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除数据接口api配置
+export function delAPICONFIG(id) {
+  return request({
+    url: '/APICONFIG/remove/' + id,
+    method: 'get'
+  })
+}
+//导出
+export function exportAPICONFIG(id) {
+  return request({
+    url: '/APICONFIG/export/' + id,
+    method: 'post',
+    responseType: "blob"
+  })
+
+
+}//导入
+export function uploadAPICONFIG(file) {
+  return request({
+    url: '/APICONFIG/upload/',
+    method: 'post',
+    data:file
+  })
+  
+}
+
+
+// // 导入
+// export function upload(data) {
+//   return request({
+//     url: '/common/upload/',
+//     method: 'post',
+//     data:data
+//   })
+// }

src/api/portal/GATHER/GATHER.js

@@ -60,3 +60,43 @@ export function getInfoByColl(id) {
     method: 'get'
   })
 }
+
+
+
+// 上报
+export function approve(data) {
+  return request({
+    url: '/gather/approve/',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 提交审核
+export function report(data) {
+  return request({
+    url: '/gather/report/',
+    method: 'post',
+    data: data
+  })
+}
+
+// 下载导入模板
+export function download(id) {
+  return request({
+    url: '/gather/download/' + id,
+    method: 'get',
+    responseType: "blob",
+  })
+}
+
+
+// 导入
+export function upload(data) {
+  return request({
+    url: '/gather/upload/',
+    method: 'post',
+    data:data
+  })
+}

src/api/portal/GATHERWARNING/GATHERWARNING.js

@@ -51,3 +51,22 @@ export function delGATHERWARNING(id) {
     method: 'get'
   })
 }
+
+// 处理预警  解除
+export function deal(id) {
+  return request({
+    url: '/gather/WARNING/deal/{id}' + id,
+    method: 'get'
+  })
+}
+
+
+// 取消预警
+export function cancel(id) {
+  return request({
+    url: '/gather/WARNING/cancel/{id}' + id,
+    method: 'get'
+  })
+}
+
+

src/api/portal/news/NEWS.js

@@ -89,3 +89,15 @@ export function newCommit(CbNewsVo) {
     data:CbNewsVo
   })
 }
+
+
+// 获取文件流
+export function downloadpic(data) {
+  return request({
+    url: '/common/download?delete=false&fileName=' + data ,
+    method: 'get',
+    responseType: "blob"
+  })
+}
+
+

src/api/portal/task/task.js

@@ -63,3 +63,13 @@ export function goback(data) {
 }
 
 
+// 获取文件流
+export function downloadpic(data) {
+  return request({
+    url: '/common/download?delete=false&fileName=' + data ,
+    method: 'get',
+    responseType: "blob"
+  })
+}
+
+

src/views/APICONFIG/index.vue

@@ -0,0 +1,665 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
+      <el-form-item label="是否启用" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择是否启用"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="dict in statusList"
+            :key="dict.value + 'statusList'"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="接口链接状态" prop="linkStatus">
+        <el-select
+          v-model="queryParams.linkStatus"
+          placeholder="请选择接口链接状态"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="dict in linkStatusList"
+            :key="dict.value + 'linkStatusList'"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['business:APICONFIG:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['business:APICONFIG:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['business:APICONFIG:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          size="mini"
+          icon="el-icon-upload"
+          @click="openUpload = true"
+          v-hasPermi="['business:APICONFIG:export']"
+          >导入</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          plain
+          size="mini"
+          icon="el-icon-download"
+          @click="handleDownload()"
+          :disabled="radio === '' ? true : false"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="APICONFIGList"
+      @selection-change="handleSelectionChange"
+      @row-click="showRow"
+    >
+    <el-table-column label="选择" width="70" center>
+        <template scope="scope">
+          <el-radio
+            class="radio"
+            v-model="radio"
+            :label="scope.$index"
+            @change.native="getCurrentRow(scope.row)"
+            >{{ "" }}</el-radio
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="接口编号" align="center" prop="apiCode">
+        <template slot-scope="scope">
+          {{ scope.row.apiCode }}
+        </template>
+      </el-table-column>
+      <el-table-column label="接口名称" align="center" prop="apiName">
+        <template slot-scope="scope">
+          {{ scope.row.apiName }}
+        </template>
+      </el-table-column>
+      <el-table-column label="接口url" align="center" prop="apiUrl">
+        <template slot-scope="scope">
+          {{ scope.row.apiUrl }}
+        </template>
+      </el-table-column>
+      <el-table-column label="是否启用" align="center" prop="status">
+        <template slot-scope="scope">
+          <span v-if="scope.row.status == 1">启用</span>
+          <span v-else-if="scope.row.status == 0">不启用</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="配置协议" align="center" prop="accord">
+        <template slot-scope="scope">
+          {{ scope.row.accord }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="是否启用分布式线程"
+        align="center"
+        prop="hadoopFlag"
+      >
+        <template slot-scope="scope">
+          <span v-if="scope.row.hadoopFlag == 1">启用</span>
+          <span v-else-if="scope.row.hadoopFlag == 0">不启用</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否数据加密" align="center" prop="thickenFlag">
+        <template slot-scope="scope">
+          <span v-if="scope.row.thickenFlag == 1">启用</span>
+          <span v-else-if="scope.row.thickenFlag == 0">不启用</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="接口链接状态" align="center" prop="linkStatus">
+        <template slot-scope="scope">
+          <span v-if="scope.row.linkStatus == 1">成功</span>
+          <span v-else-if="scope.row.linkStatus == 0">失败</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark">
+        <template slot-scope="scope">
+          {{ scope.row.remark }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:APICONFIG:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:APICONFIG:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改数据接口api配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="70%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="接口编号" prop="apiCode">
+          <el-input
+            v-model="form.apiCode"
+            placeholder="请输入接口编号"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="接口名称" prop="apiName">
+          <el-input
+            v-model="form.apiName"
+            placeholder="请输入接口名称"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="接口url" prop="apiUrl">
+          <el-input
+            v-model="form.apiUrl"
+            placeholder="请输入接口url"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item label="是否启用" prop="status">
+          <el-select
+            v-model="form.status"
+            placeholder="请选择是否启用"
+            clearable
+            filterable
+          >
+            <el-option
+              v-for="dict in statusList"
+              :key="dict.value + 'statusList'"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="配置协议" prop="accord">
+          <el-input
+            v-model="form.accord"
+            placeholder="请输入配置协议"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item label="是否启用分布式线程">
+          <el-radio-group v-model="form.hadoopFlag">
+            <el-radio
+              v-for="dict in hadoopFlagList"
+              :key="dict.value + 'hadoopFlagList'"
+              :label="dict.value"
+              >{{ dict.label }}</el-radio
+            >
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="是否数据加密">
+          <el-radio-group v-model="form.thickenFlag">
+            <el-radio
+              v-for="dict in thickenFlagList"
+              :key="dict.value + 'thickenFlagList'"
+              :label="dict.value"
+              >{{ dict.label }}</el-radio
+            >
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="接口链接状态">
+          <el-radio-group v-model="form.linkStatus">
+            <el-radio
+              v-for="dict in linkStatusList"
+              :key="dict.value + 'linkStatusList'"
+              :label="dict.value"
+              >{{ dict.label }}</el-radio
+            >
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+
+    <!-- 上传文件对话框 -->
+    <el-dialog
+      center
+      title="导入"
+      :visible.sync="openUpload"
+      width="50%"
+      append-to-body
+    >
+      <el-form
+        ref="uploadForm"
+        :model="uploadForm"
+        :rules="rules"
+        label-width="120px"
+      >
+        <el-form-item label="文件" prop="linkUrl">
+          <el-upload
+            class="upload-demo"
+            ref="upload"
+            action="#"
+            :http-request="httprequest"
+            :before-upload="uploadFile"
+            :file-list="fileList"
+            :auto-upload="false"
+            :limit="1"
+          >
+            <el-button slot="trigger" size="small" type="primary"
+              >选取文件</el-button
+            >
+          </el-upload>
+         
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitUpload">导 入</el-button>
+        <el-button @click="cancel">取 消</el-button>
+        <!-- <el-button @click="cancel">取 消</el-button> -->
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listAPICONFIG,
+  getAPICONFIG,
+  delAPICONFIG,
+  addAPICONFIG,
+  updateAPICONFIG,
+  exportAPICONFIG, //导出
+  uploadAPICONFIG, //导入
+  upload,
+} from "@/api/portal/APICONFIG/APICONFIG.js";
+
+import { saveAs } from "file-saver";
+import { getToken } from "@/utils/auth";
+import axios from "axios";
+//我好困
+
+export default {
+  name: "APICONFIG",
+  data() {
+    return {
+      fileList:[],
+      uploadForm:{
+        fileName:''
+      },
+      openUpload: false,
+      //是否启用(1=启用,0=不启用)
+      statusList: [
+        { label: "启用", value: "1" },
+        { label: "不启用", value: "0" },
+      ],
+      //接口链接状态(1=成功,0=失败)
+      linkStatusList: [
+        { label: "成功", value: "1" },
+        { label: "失败", value: "0" },
+      ],
+      //是否启用分布式线程
+      hadoopFlagList: [
+        { label: "启用", value: "1" },
+        { label: "不启用", value: "0" },
+      ],
+      //是否数据加密
+      thickenFlagList: [
+        { label: "启用", value: "1" },
+        { label: "不启用", value: "0" },
+      ],
+      //接口链接状态
+      thickenFlagList: [
+        { label: "成功", value: "1" },
+        { label: "失败", value: "0" },
+      ],
+
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      rowData: {},
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 数据接口api配置表格数据
+      APICONFIGList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        delFlag: null,
+        deptId: null,
+        apiCode: null,
+        apiName: null,
+        apiUrl: null,
+        request: null,
+        status: null,
+        accord: null,
+        hadoopFlag: null,
+        thickenFlag: null,
+        linkStatus: null,
+        remark: null,
+      },
+      radio:'',
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [{ required: true, message: "$comment不能为空", trigger: "blur" }],
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" },
+        ],
+        deptId: [
+          { required: true, message: "部门标识不能为空", trigger: "blur" },
+        ],
+        apiCode: [
+          { required: true, message: "接口编号不能为空", trigger: "blur" },
+        ],
+        apiName: [
+          { required: true, message: "接口名称不能为空", trigger: "blur" },
+        ],
+        apiUrl: [
+          { required: true, message: "接口url不能为空", trigger: "blur" },
+        ],
+        request: [
+          { required: true, message: "请求参数示例不能为空", trigger: "blur" },
+        ],
+        status: [
+          {
+            required: true,
+            message: "是否启用(1=启用,0=不启用)不能为空",
+            trigger: "blur",
+          },
+        ],
+        accord: [
+          { required: true, message: "配置协议不能为空", trigger: "blur" },
+        ],
+        hadoopFlag: [
+          {
+            required: true,
+            message: "是否启用分布式线程(1=启用,0=不启用)不能为空",
+            trigger: "blur",
+          },
+        ],
+        thickenFlag: [
+          {
+            required: true,
+            message: "是否数据加密(1=启用,0=不启用)不能为空",
+            trigger: "blur",
+          },
+        ],
+        linkStatus: [
+          {
+            required: true,
+            message: "接口链接状态(1=成功,0=失败)不能为空",
+            trigger: "blur",
+          },
+        ],
+        remark: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    submitUpload() {
+      this.$refs.upload.submit();
+    },
+    //导入
+    uploadFile(file) {
+      let formData = new FormData();
+      formData.append("file", file);
+      formData.append("type", this.uploadForm.type);
+      uploadAPICONFIG(formData)
+      this.cancel()
+      this.openUpload = false
+    },
+    httprequest() {},
+    /** 查询数据接口api配置列表 */
+    getList() {
+      this.loading = true;
+      listAPICONFIG(this.queryParams).then((response) => {
+        this.APICONFIGList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.openUpload = false;
+      this.reset();
+    },
+    getCurrentRow(val) {
+      console.log(val);
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        delFlag: null,
+        deptId: null,
+        apiCode: null,
+        apiName: null,
+        apiUrl: null,
+        request: null,
+        status: null,
+        accord: null,
+        hadoopFlag: null,
+        thickenFlag: null,
+        linkStatus: null,
+        remark: null,
+      };
+      this.fileList = []
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加数据接口api配置";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getAPICONFIG(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改数据接口api配置";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateAPICONFIG(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAPICONFIG(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('确定删除吗?')
+        .then(function () {
+          return delAPICONFIG(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 点击导入按钮操作 */
+    handleupload() {
+      uploadAPICONFIG(this.uploadForm.fileName)
+      this.cancel()
+      this.openUpload = false
+    },
+    /** 导出按钮操作 */
+    // handleExport(id) {
+    //   exportAPICONFIG(id).then(res=>{
+        
+    //   })
+    // },
+      /** 导出按钮操作 */
+      showRow(row) {
+      //赋值给radio
+      this.radio = this.APICONFIGList.indexOf(row);
+      this.rowData = row;
+    },
+    handleDownload() {
+      let row = this.rowData;
+      axios({
+        url: process.env.VUE_APP_BASE_API + "/APICONFIG/export/",
+        method: "post",
+        responseType: "blob",
+        data:row,
+        headers: {
+          Authorization: "Bearer " + getToken(),
+        },
+      }).then((res) => {
+        // const temp = res.headers["content-disposition"]
+        //   .split(";")[1]
+        //   .split("filename=")[1];
+        // const fileName = decodeURIComponent(temp);
+        const blob = new Blob([res.data]);
+        saveAs(blob, row.apiName+'.xlsx');
+        this.getList();
+      });
+    },
+    
+  },
+};
+</script>

src/views/GATHER/index.vue

@@ -84,14 +84,30 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
+        <el-button type="success" plain size="mini" @click="openUpload = true"
+          >导入</el-button
+        >
+
+        <!-- <el-upload
+          :show-file-list="false"
+          :http-request="httprequest"
+          :before-upload="uploadFile"
+          class="upload-demo"
+          action="#"
+          :auto-upload="true"
+          :on-change="handleChange"
+          :file-list="fileList"
+        >
+          <el-button type="success" plain size="mini">导入</el-button>
+        </el-upload> -->
+      </el-col>
+      <el-col :span="1.5">
         <el-button
-          type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
-          @click="handleExport"
-          v-hasPermi="['business:GATHER:export']"
-          >导出</el-button
+          @click="handleDownload()"
+          :disabled="radio === '' ? true : false"
+          >下载导入模板</el-button
         >
       </el-col>
       <right-toolbar
@@ -104,8 +120,26 @@
       v-loading="loading"
       :data="GATHERList"
       @selection-change="handleSelectionChange"
+      @row-click="showRow"
     >
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- @current-change="handleCurrentChange" -->
+      <el-table-column label="选择" width="70" center>
+        <template scope="scope">
+          <el-radio
+            class="radio"
+            v-model="radio"
+            :label="scope.$index"
+            @change.native="getCurrentRow(scope.row)"
+            >{{ "" }}</el-radio
+          >
+        </template>
+      </el-table-column>
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <el-table-column label="单位名称" align="center" prop="deptId_dictText">
+        <template slot-scope="scope">
+          {{ scope.row.deptId_dictText }}
+        </template>
+      </el-table-column>
       <el-table-column label="数据类型" align="center" prop="type">
         <template slot-scope="scope">
           <span v-if="scope.row.type == 0">量化指标数据</span>
@@ -131,10 +165,10 @@
       </el-table-column>
       <el-table-column label="审核状态" align="center" prop="approveStatus">
         <template slot-scope="scope">
-          <span v-if="scope.row.reportStatus == 0">未审核</span>
-          <span v-if="scope.row.reportStatus == 1">审核中</span>
-          <span v-if="scope.row.reportStatus == 2">审核通过</span>
-          <span v-if="scope.row.reportStatus == 3">审核拒绝</span>
+          <span v-if="scope.row.approveStatus == 0">未提交审核</span>
+          <span v-if="scope.row.approveStatus == 1">审核中</span>
+          <span v-if="scope.row.approveStatus == 2">审核通过</span>
+          <span v-if="scope.row.approveStatus == 3">审核拒绝</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -143,12 +177,68 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
+          <!-- <el-button
+            style="margin: 0 2px"
+            size="mini"
+            type="text"
+            @click="handleDownload(scope.row)"
+            >下载导入模板</el-button
+          > -->
           <el-button
+            style="margin: 0 2px"
+            v-if="scope.row.collStatus == 0"
             size="mini"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:GATHER:edit']"
+            >录入</el-button
+          >
+
+          <el-popconfirm
+            title="确定上报吗？"
+            @confirm="handleReport(scope.row)"
+          >
+            <el-button
+              style="margin: 0 2px"
+              v-if="scope.row.reportStatus == 0 && scope.row.collStatus == 1"
+              size="mini"
+              slot="reference"
+              type="text"
+              >上报</el-button
+            >
+          </el-popconfirm>
+
+          <el-popconfirm
+            title="确定提交吗？"
+            @confirm="handleApprove(scope.row)"
+          >
+            <el-button
+              style="margin: 0 2px"
+              v-if="scope.row.approveStatus == 0 && scope.row.collStatus == 1"
+              size="mini"
+              type="text"
+              slot="reference"
+              >提交审核</el-button
+            >
+          </el-popconfirm>
+          <el-button
+            style="margin: 0 2px"
+            v-if="scope.row.collStatus == 1"
+            size="mini"
+            type="text"
+            @click="handleDetail(scope.row, 0)"
+            >查看</el-button
+          >
+
+          <el-button
+            style="margin: 0 2px"
+            v-if="
+              scope.row.collStatus == 1 &&
+              scope.row.reportStatus == 0 &&
+              scope.row.approveStatus == 0
+            "
+            size="mini"
+            type="text"
+            @click="handleDetail(scope.row, 1)"
             >修改</el-button
           >
         </template>
@@ -163,16 +253,93 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改数据采集对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
-      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
+    <!-- 上传文件对话框 -->
+    <el-dialog
+      center
+      title="导入"
+      :visible.sync="openUpload"
+      width="50%"
+      append-to-body
+    >
+      <el-form
+        ref="uploadForm"
+        :model="uploadForm"
+        :rules="rules"
+        label-width="120px"
+      >
+        <el-form-item label="数据类型" prop="type">
+          <el-select
+            v-model="uploadForm.type"
+            placeholder="请选择数据类型"
+            clearable
+            filterable
+          >
+            <el-option
+              v-for="dict in typeList"
+              :key="dict.value + 'typeList'"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="文件" prop="linkUrl" v-show="uploadForm.type">
+          <el-upload
+            class="upload-demo"
+            ref="upload"
+            action="#"
+            :http-request="httprequest"
+            :before-upload="uploadFile"
+            :file-list="fileList"
+            :auto-upload="false"
+            :limit="1"
+          >
+            <el-button slot="trigger" size="small" type="primary"
+              >选取文件</el-button
+            >
+          </el-upload>
+          <!-- <el-upload
+            :http-request="httprequest"
+            :before-upload="uploadFile"
+            :limit="1"
+            class="upload-demo"
+            action="#"
+            :auto-upload="true"
+            :on-change="handleChange"
+            :file-list="fileList"
+          >
+            <el-button size="small" type="primary">点击上传</el-button>
+          </el-upload> -->
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitUpload">导 入</el-button>
+        <el-button @click="cancel">取 消</el-button>
+        <!-- <el-button @click="cancel">取 消</el-button> -->
+      </div>
+    </el-dialog>
+
+    <!-- 录入数据采集对话框 -->
+    <el-dialog
+      center
+      :title="title"
+      :visible.sync="open"
+      width="80%"
+      append-to-body
+    >
+      <el-tabs
+        v-if="this.form.type == 0"
+        v-model="activeName"
+        type="border-card"
+        @tab-click="handleClick"
+      >
         <el-tab-pane
           v-for="(item, index) in tabList"
           :key="index + 'tabs'"
           :label="item.normName"
           :name="item.normName"
         >
-          <el-form :model="form" label-width="150px">
+          <el-form :model="form" label-width="200px">
             <!-- :rules="rules" ref="form" -->
             <el-form-item
               v-for="(listItem, listIndex) in form.feeLists"
@@ -181,9 +348,9 @@
               v-if="listItem.normId == item.normId"
               :required="true"
             >
-            <!-- 这里科研失败！想动态绑定校验规则的 -->
-            <!-- :prop="listItem.normfeeId" -->
-            <!-- :rules="rules.listItem.normfeeId" -->
+              <!-- 这里科研失败！想动态绑定校验规则的 -->
+              <!-- :prop="listItem.normfeeId" -->
+              <!-- :rules="rules.listItem.normfeeId" -->
               <el-input
                 v-model="listItem.collCalue"
                 :placeholder="'请输入' + listItem.normfeeName"
@@ -192,7 +359,7 @@
           </el-form>
 
           <!-- 这里是第二种写法 -->
-          <!-- <el-form :model="form" label-width="150px">
+          <!-- <el-form :model="form" label-width="300px">
             <el-form-item
               v-for="(listItem, listIndex) in item.list"
               :key="listIndex + 'item.list'"
@@ -206,70 +373,118 @@
           </el-form> -->
         </el-tab-pane>
       </el-tabs>
-      <!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="数据类型" prop="type">
-          <el-select
-            v-model="form.type"
-            placeholder="请选择数据类型"
-            filterable
-          >
-            <el-option
-              v-for="dict in typeList"
-              :key="dict.value + 'typeList2'"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="采集状态" prop="collStatus">
-          <el-select
-            v-model="form.collStatus"
-            placeholder="请选择采集状态"
-            clearable
-            filterable
-          >
-            <el-option
-              v-for="dict in collStatus"
-              :key="dict.value + 'collStatus2'"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="上报状态" prop="reportStatus">
-          <el-select
-            v-model="form.reportStatus"
-            placeholder="请选择上报状态"
-            clearable
-            filterable
-          >
-            <el-option
-              v-for="dict in reportStatus"
-              :key="dict.value + 'reportStatus2'"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="审核状态" prop="approveStatus">
-          <el-select
-            v-model="form.approveStatus"
-            placeholder="请选择审核状态"
-            clearable
-            filterable
-          >
-            <el-option
-              v-for="dict in approveStatus"
-              :key="dict.value + 'approveStatus2'"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
+
+      <el-form
+        :model="form"
+        label-width="200px"
+        v-else-if="this.form.type == 1"
+      >
+        <!-- :rules="rules" ref="form" -->
+        <el-form-item
+          v-for="(listItem, listIndex) in form.feeLists"
+          :key="listItem.normfeeId"
+          :label="listItem.normfeeName"
+          :required="true"
+        >
+          <!-- 这里科研失败！想动态绑定校验规则的 -->
+          <!-- :prop="listItem.normfeeId" -->
+          <!-- :rules="rules.listItem.normfeeId" -->
+          <el-input
+            v-model="listItem.collCalue"
+            :placeholder="'请输入' + listItem.normfeeName"
+          ></el-input>
         </el-form-item>
-      </el-form> -->
+      </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm('add')">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
+        <!-- <el-button @click="cancel">取 消</el-button> -->
+      </div>
+    </el-dialog>
+
+    <!-- 查看或修改 -->
+    <el-dialog
+      center
+      :title="title"
+      :visible.sync="openDetail"
+      width="80%"
+      append-to-body
+    >
+      <el-tabs
+        v-if="this.form.type == 0"
+        v-model="activeName"
+        type="border-card"
+        @tab-click="handleClick"
+      >
+        <el-tab-pane
+          v-for="(item, index) in tabList"
+          :key="index + 'tabs'"
+          :label="item.normName"
+          :name="item.normName"
+        >
+          <el-form :model="form" label-width="200px">
+            <!-- :rules="rules" ref="form" -->
+            <el-form-item
+              v-for="(listItem, listIndex) in form.feeLists"
+              :key="listItem.normfeeId"
+              :label="listItem.normfeeName"
+              v-if="listItem.normId == item.normId"
+              :required="true"
+            >
+              <!-- 这里科研失败！想动态绑定校验规则的 -->
+              <!-- :prop="listItem.normfeeId" -->
+              <!-- :rules="rules.listItem.normfeeId" -->
+              <el-input
+                :disabled="!edit"
+                v-model="listItem.collCalue"
+                :placeholder="'请输入' + listItem.normfeeName"
+              ></el-input>
+            </el-form-item>
+          </el-form>
+
+          <!-- 这里是第二种写法 -->
+          <!-- <el-form :model="form" label-width="150px">
+            <el-form-item
+              v-for="(listItem, listIndex) in item.list"
+              :key="listIndex + 'item.list'"
+              :label="listItem.normfeeName"
+            >
+              <el-input
+                v-model="listItem.collCalue"
+                :placeholder="'请输入' + listItem.normfeeName"
+              ></el-input>
+            </el-form-item>
+          </el-form> -->
+        </el-tab-pane>
+      </el-tabs>
+
+      <el-form
+        :model="form"
+        label-width="200px"
+        v-else-if="this.form.type == 1"
+      >
+        <!-- :rules="rules" ref="form" -->
+        <el-form-item
+          v-for="(listItem, listIndex) in form.feeLists"
+          :key="listItem.normfeeId"
+          :label="listItem.normfeeName"
+          :required="true"
+        >
+          <!-- 这里科研失败！想动态绑定校验规则的 -->
+          <!-- :prop="listItem.normfeeId" -->
+          <!-- :rules="rules.listItem.normfeeId" -->
+          <el-input
+            :disabled="!edit"
+            v-model="listItem.collCalue"
+            :placeholder="'请输入' + listItem.normfeeName"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm('edit')" v-if="edit"
+          >确 定</el-button
+        >
+        <el-button type="primary" @click="cancel">返 回</el-button>
       </div>
     </el-dialog>
   </div>
@@ -283,12 +498,20 @@ import {
   addGATHER,
   updateGATHER,
   getInfoByColl,
+  approve,
+  report,
+  download,
+  upload,
 } from "@/api/portal/GATHER/GATHER.js";
+import { saveAs } from "file-saver";
+import { getToken } from "@/utils/auth";
+import axios from "axios";
 
 export default {
   name: "GATHER",
   data() {
     return {
+      edit: Boolean, //false 查看  true修改
       tabList: [],
       feeLists: [],
       activeName: "",
@@ -334,6 +557,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      openDetail: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -357,12 +581,82 @@ export default {
       rules: {
         // id: [{ required: true, message: "$comment不能为空", trigger: "blur" }],
       },
+      //设置文件名字
+      setFileName: "",
+      radio: "",
+      rowData: {},
+      fileList: [],
+      uploadForm: {},
+      openUpload: false,
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    submitUpload() {
+      this.$refs.upload.submit();
+    },
+    httprequest() {},
+    getCurrentRow(val) {
+      console.log(val);
+    },
+    handleCurrentChange(val, index) {
+      this.currentRow = val;
+      this.$emit("data", val.pkg);
+    },
+    handleChange(file, fileList) {
+      this.fileList = fileList.slice(-3);
+    },
+    showRow(row) {
+      //赋值给radio
+      this.radio = this.GATHERList.indexOf(row);
+      this.rowData = row;
+    },
+    //导入
+    uploadFile(file) {
+      let formData = new FormData();
+      formData.append("file", file);
+      formData.append("type", this.uploadForm.type);
+      upload(formData)
+      this.cancel()
+      this.openUpload = false
+    },
+    //下载模板
+    handleDownload() {
+      let row = this.rowData;
+      axios({
+        url: process.env.VUE_APP_BASE_API + "/gather/download/" + row.id,
+        method: "get",
+        responseType: "blob",
+        headers: {
+          Authorization: "Bearer " + getToken(),
+        },
+      }).then((res) => {
+        const temp = res.headers["content-disposition"]
+          .split(";")[1]
+          .split("filename=")[1];
+        const fileName = decodeURIComponent(temp);
+        const blob = new Blob([res.data]);
+        saveAs(blob, fileName);
+        this.getList();
+      });
+    },
+    //上报
+    handleReport(data) {
+      report(data).then((res) => {
+        this.$modal.msgSuccess("上报成功");
+        this.getList();
+      });
+    },
+    //提交审核
+    handleApprove(data) {
+      this.$modal.msgSuccess("提交审核成功");
+      approve(data).then((res) => {
+        this.getList();
+      });
+    },
+
     handleClick(tab, event) {},
     /** 查询数据采集列表 */
     getList() {
@@ -376,6 +670,8 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.openDetail = false;
+      this.openUpload = false;
       this.reset();
     },
     // 表单重置
@@ -390,6 +686,10 @@ export default {
         reportStatus: "0",
         approveStatus: "0",
       };
+      this.uploadForm = {
+        type: "",
+      };
+      this.fileList = [];
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -412,19 +712,20 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.openDetail = true;
       this.title = "添加数据采集";
     },
-    /** 修改按钮操作 */
+    /** 录入按钮操作 */
     handleUpdate(row) {
       // this.reset();
-      this.tabList = []
-      this.form = []
+      this.tabList = [];
+      this.form = [];
       const id = row.id || this.ids;
       getInfoByColl(id).then((response) => {
         //深拷贝，而不是拷贝地址
         this.form = JSON.parse(JSON.stringify(response.data));
         this.open = true;
-        this.title = "修改数据采集";
+        this.title = "数据录入";
         //深拷贝，而不是拷贝地址
         this.tabList = JSON.parse(JSON.stringify(response.data.feeLists));
         let dataList = response.data.feeLists;
@@ -443,7 +744,6 @@ export default {
             }
           }
         }
-        
 
         // 这里科研失败！想动态绑定校验规则的
         //遍历设置表单校验  我好困
@@ -455,7 +755,63 @@ export default {
 
         // console.log(this.rules);
 
+        //这里是第二种写法
+        //获取分类ID相同的子集
+        // for (let index = 0; index < this.tabList.length; index++) {
+        //   this.$set(this.tabList[index],'list',[])
+        //   for (let i = 0; i < dataList.length; i++) {
+        //     if (dataList[i].normId == this.tabList[index].normId) {
+        //       this.tabList[index].list.push(dataList[i]);
+        //     }
+        //   }
+        // }
+      });
+    },
+    /** 查看按钮操作 */
+    handleDetail(row, type) {
+      //false 查看  true修改
+      if (type == 0) {
+        this.edit = false;
+      } else if (type == 1) {
+        this.edit = true;
+      }
+      // this.reset();
+      this.tabList = [];
+      this.form = [];
+      const id = row.id || this.ids;
+      getGATHER(id).then((response) => {
+        //深拷贝，而不是拷贝地址
+        this.form = JSON.parse(JSON.stringify(response.data));
+        this.openDetail = true;
+        this.title = "数据查看";
+        //深拷贝，而不是拷贝地址
+        this.tabList = JSON.parse(JSON.stringify(response.data.feeLists));
+        let dataList = response.data.feeLists;
+        //去重获取tab
+        //遍历如果遇到相同的id则删掉
+        for (var i = 0; i < this.tabList.length - 1; i++) {
+          //设置激活的tab
+          if (i == 0) {
+            this.activeName = this.tabList[0].normName;
+          }
+          for (var j = i + 1; j < this.tabList.length; j++) {
+            if (this.tabList[i].normId == this.tabList[j].normId) {
+              this.tabList.splice(j, 1);
+              //因为数组长度减小1，所以直接 j++ 会漏掉一个元素，所以要 j--
+              j--;
+            }
+          }
+        }
+
+        // 这里科研失败！想动态绑定校验规则的
+        //遍历设置表单校验  我好困
+        // for (const i in this.form.feeLists) {
+        //   this.$set(this.rules,this.form.feeLists[i].normfeeId,[
+        //     {  required: true, message: this.form.feeLists[i].normfeeName+"不能为空", trigger: "blur"  }
+        //   ])
+        // }
 
+        // console.log(this.rules);
 
         //这里是第二种写法
         //获取分类ID相同的子集
@@ -470,35 +826,36 @@ export default {
       });
     },
     /** 提交按钮 */
-    submitForm() {
+    submitForm(type) {
       for (const i in this.form.feeLists) {
-        if(this.form.feeLists[i].collCalue == '' || this.form.feeLists[i].collCalue == null){
+        if (
+          this.form.feeLists[i].collCalue == "" ||
+          this.form.feeLists[i].collCalue == null
+        ) {
           return this.$message({
-          message: this.form.feeLists[i].normName+' - '+this.form.feeLists[i].normfeeName+' 未填写！',
-          type: 'warning'
-        });
+            message:
+              this.form.feeLists[i].normName +
+              " - " +
+              this.form.feeLists[i].normfeeName +
+              " 未填写！",
+            type: "warning",
+          });
         }
       }
-      addGATHER(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
 
-
-      // this.$refs["form"].validate((valid) => {
-      //   if (valid) {
-      //     if (this.form.id != null) {
-      //       updateGATHER(this.form).then((response) => {
-      //         this.$modal.msgSuccess("修改成功");
-      //         this.open = false;
-      //         this.getList();
-      //       });
-      //     } else {
-           
-      //     }
-      //   }
-      // });
+      if (type == "add") {
+        addGATHER(this.form).then((response) => {
+          this.$modal.msgSuccess("录入成功");
+          this.open = false;
+          this.getList();
+        });
+      } else if (type == "edit") {
+        updateGATHER(this.form).then((response) => {
+          this.$modal.msgSuccess("修改成功");
+          this.openDetail = false;
+          this.getList();
+        });
+      }
     },
     /** 删除按钮操作 */
     handleDelete(row) {

src/views/GATHERWARNING/index.vue

@@ -23,6 +23,21 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="状态" prop="type">
+        <el-select
+          v-model="queryParams.type"
+          placeholder="请选择状态"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="dict in statusList"
+            :key="dict.value + 'statusList'"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -49,7 +64,7 @@
       :data="GATHERWARNINGList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
 
       <el-table-column label="数据类型" align="center" prop="type">
         <template slot-scope="scope">
@@ -72,6 +87,13 @@
           {{ scope.row.dealTime }}
         </template>
       </el-table-column>
+      <el-table-column label="状态" align="center" prop="cancelBy">
+        <template slot-scope="scope">
+          <span v-if="scope.row.status == 0">预警</span>
+          <span v-else-if="scope.row.status == 1">已解除</span>
+          <span v-else-if="scope.row.status == 2">已取消</span>
+        </template>
+      </el-table-column>
       <el-table-column label="取消人" align="center" prop="cancelBy">
         <template slot-scope="scope">
           {{ scope.row.cancelBy }}
@@ -93,22 +115,28 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:GATHERWARNING:edit']"
-            >处理</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['business:GATHERWARNING:remove']"
-            >解除</el-button
+          <el-popconfirm title="确定处理吗？" @confirm="handleDeal(scope.row)">
+            <el-button
+              size="mini"
+              type="text"
+              slot="reference"
+              v-hasPermi="['business:GATHERWARNING:edit']"
+              >处理</el-button
+            >
+          </el-popconfirm>
+
+          <el-popconfirm
+            title="确定取消吗？"
+            @confirm="handleCancel(scope.row)"
           >
+            <el-button
+              size="mini"
+              type="text"
+              slot="reference"
+              v-hasPermi="['business:GATHERWARNING:remove']"
+              >取消</el-button
+            >
+          </el-popconfirm>
         </template>
       </el-table-column>
     </el-table>
@@ -150,6 +178,8 @@ import {
   delGATHERWARNING,
   addGATHERWARNING,
   updateGATHERWARNING,
+  deal,
+  cancel,
 } from "@/api/portal/GATHERWARNING/GATHERWARNING.js";
 
 export default {
@@ -160,6 +190,12 @@ export default {
         { label: "要闻咨量化指标数据询", value: "0" },
         { label: "月报表数据", value: "1" },
       ],
+      //状态（0=预警,1=已解除,2已取消）
+      statusList: [
+        { label: "预警", value: "0" },
+        { label: "已解除", value: "1" },
+        { label: "已取消", value: "2" },
+      ],
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
       // 遮罩层
@@ -265,6 +301,20 @@ export default {
         this.loading = false;
       });
     },
+    //处理预警
+    handleDeal(row) {
+      deal(row.id).then((res) => {
+        this.$modal.msgSuccess("处理成功");
+        this.getList();
+      });
+    },
+    //取消预警
+    handleCancel(row) {
+      cancel(row.id).then((res) => {
+        this.$modal.msgSuccess("取消成功");
+        this.getList();
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;

src/views/news/index.vue

@@ -230,16 +230,21 @@
             v-hasPermi="['business:NEWS:remove']"
             >下架</el-button
           >
-            <el-button
-              v-if="scope.row.status == 0 || scope.row.status == 2"
-              size="mini"
-              type="text"
-              v-hasPermi="['business:NEWS:remove']"
-              @click="handleCommit(scope.row)"
-              >提交审核</el-button>
+          <el-button
+            v-if="scope.row.status == 0 || scope.row.status == 2"
+            size="mini"
+            type="text"
+            v-hasPermi="['business:NEWS:remove']"
+            @click="handleCommit(scope.row)"
+            >提交审核</el-button
+          >
 
           <el-button
-            v-if="scope.row.status == 0 || scope.row.status == 2 || scope.row.status == 5"
+            v-if="
+              scope.row.status == 0 ||
+              scope.row.status == 2 ||
+              scope.row.status == 5
+            "
             size="mini"
             type="text"
             @click="handleUpdate(scope.row)"
@@ -364,7 +369,12 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="dialogVisible" fullscreen append-to-body  @close="dialogVisible = false">
+    <el-dialog
+      :visible.sync="dialogVisible"
+      fullscreen
+      append-to-body
+      @close="dialogVisible = false"
+    >
       <img width="100%" :src="form.picture" alt="" />
     </el-dialog>
   </div>
@@ -380,7 +390,8 @@ import {
   upload,
   setTop,
   newCommit,
-  updateAndex
+  updateAndex,
+  downloadpic,
 } from "@/api/portal/news/NEWS.js";
 
 export default {
@@ -504,7 +515,7 @@ export default {
       let formData = new FormData();
       formData.append("file", file);
       upload(formData).then((res) => {
-        this.form.picture = res.url;
+        this.form.picture = res.fileName;
       });
     },
     handleRemove(file) {
@@ -520,7 +531,7 @@ export default {
     },
     handleDownOrUp(row) {
       //修改发布、下架状态
-      if (row.status == "4" || row.status == "3") {
+      if (row.status == "4") {
         //已发布 已审核
         row.status = "5";
         updateNEWS(row).then((response) => {
@@ -529,7 +540,7 @@ export default {
           this.getList();
           this.reset();
         });
-      } else if (row.status == "5") {
+      } else if (row.status == "5" || row.status == "3") {
         //已下架
         row.status = "4";
         updateNEWS(row).then((response) => {
@@ -595,15 +606,16 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改网站新闻";
-        if (this.form.picture) {
-          this.fileList.push({ name: "xxx", url: this.form.picture });
-        }
+        downloadpic(this.form.picture).then((res) => {
+          let src = window.URL.createObjectURL(res);
+           this.fileList.push({ name: "xxx", url: src});
+        });
       });
     },
     handleCommit(row) {
       // let data = new FormData();
       // data.append("id", id);
-      let CbNewsVo = row
+      let CbNewsVo = row;
       newCommit(CbNewsVo).then((response) => {
         this.$modal.msgSuccess("提交审核成功!");
         this.getList();
@@ -614,7 +626,6 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            
             updateAndex(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -622,15 +633,15 @@ export default {
               this.reset();
             });
           } else {
-            this.form.status = '1'
+            this.form.status = "1";
             addNEWS(this.form).then((response) => {
               // let formData = new FormData()
               // formData.append('id',this.form.id)
               // newCommit(formData).then((res) => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-                this.reset();
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+              this.reset();
               // });
             });
           }
@@ -646,28 +657,33 @@ export default {
       }
     },
     submitzc() {
-      console.log(this.form.id)
-        this.$refs["form"].validate((valid) => {
-          if (valid) {
-            if(this.form.id == null){
-              this.form.status = "0";
-              addNEWS(this.form).then((response) => {
-                this.$modal.msgSuccess("暂存成功");
-                this.open = false;
-                this.getList();
-                this.reset();
-              });
-            }else if(this.form.status == 0 || this.form.status == 2 || this.form.status == 3 || this.form.status == 5){
-              updateNEWS(this.form).then((response) => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-                this.reset();
-              });
-            }
+      console.log(this.form.id);
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id == null) {
+            this.form.status = "0";
+            addNEWS(this.form).then((response) => {
+              this.$modal.msgSuccess("暂存成功");
+              this.open = false;
+              this.getList();
+              this.reset();
+            });
+          } else if (
+            this.form.status == 0 ||
+            this.form.status == 2 ||
+            this.form.status == 3 ||
+            this.form.status == 5
+          ) {
+            updateNEWS(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+              this.reset();
+            });
           }
-        });
-      },
+        }
+      });
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;

src/views/news/task/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div>
     <el-tabs v-model="activeName">
-    
       <el-tab-pane label="详细信息" name="详细信息">
         <el-descriptions border>
           <el-descriptions-item label="活动名称">{{
@@ -28,7 +27,7 @@
             taskList.comments ? taskList.comments : "无"
           }}</el-descriptions-item>
         </el-descriptions>
-        
+
         <el-form
           ref="form"
           :model="taskList"
@@ -58,13 +57,12 @@
               </el-option>
             </el-select>
           </el-form-item>
-
           <el-form-item label="封面图" prop="picture" disabled>
             <el-upload
               action="#"
               list-type="picture-card"
               :limit="1"
-              :auto-upload="true"
+              :auto-upload="false"
               :file-list="fileList"
               :disabled="true"
             >
@@ -105,13 +103,18 @@
       </el-tab-pane>
       <el-tab-pane label="审批记录" name="审批记录">
         <el-timeline>
-
-          <el-timeline-item v-for="(item,index) in taskList.taskHisAction" :timestamp="item.createTime" placement="top" :key="index+'taskHisAction'">
+          <el-timeline-item
+            v-for="(item, index) in taskList.taskHisAction"
+            :timestamp="item.createTime"
+            placement="top"
+            :key="index + 'taskHisAction'"
+          >
             <el-card>
-              <p>{{item.execId}} {{item.acname}} 于 {{ item.createTime}}</p>
+              <p>
+                {{ item.execId }} {{ item.acname }} 于 {{ item.createTime }}
+              </p>
             </el-card>
           </el-timeline-item>
-
         </el-timeline>
       </el-tab-pane>
     </el-tabs>
@@ -119,6 +122,9 @@
 </template>
 
 <script>
+import {
+  downloadpic,
+} from "@/api/portal/task/task";
 export default {
   data() {
     return {
@@ -129,16 +135,41 @@ export default {
         { label: "通知公告", value: "3" },
         { label: "政策解读", value: "4" },
       ],
-      fileList: [],
+      fileList: [
+      ],
       BigImgVisible: false,
     };
   },
   props: ["taskList"],
   created() {
     if (this.taskList.formobj.picture) {
-      this.fileList.push({ name: "xxx", url: this.taskList.formobj.picture });
+      downloadpic(this.taskList.formobj.picture).then((res) => {
+        this.fileList.push({
+          url:window.URL.createObjectURL(res),
+            name:'xxx'
+        })
+        console.log('下载转换后:',this.fileList[0])
+      });
     }
   },
+  watch: {
+    taskList(curVal, oldVal) {
+      if (curVal) {
+        this.fileList.pop()
+        console.log('新数据:',curVal.formobj.picture)
+        console.log('ssss',this.fileList)
+        downloadpic(curVal.formobj.picture).then((res) => {
+          this.fileList.push({
+            url:window.URL.createObjectURL(res),
+            name:'xxx'
+          })
+          console.log('下载转换后:',this.fileList[0])
+        });
+
+      }
+    },
+  },
+
   methods: {
     handlePictureCardPreview(file) {
       this.taskList.formobj.picture = file.url;
@@ -149,4 +180,4 @@ export default {
 </script>
 
 <style>
-</style>
+</style>

src/views/task/index.vue

@@ -54,7 +54,7 @@
           {{ scope.row.acname }}
         </template>
       </el-table-column>
-      <el-table-column label="业务备注" align="center" prop="fromKeyword ">
+      <el-table-column label="标题" align="center" prop="fromKeyword ">
         <template slot-scope="scope">
           {{ scope.row.fromKeyword }}
         </template>
@@ -104,14 +104,24 @@
             type="text"
             @click="handleDetail(scope.row)"
             v-hasPermi="['business:INSTACTIONTASK:detail']"
+            v-if="scope.row.status != '0'"
             >详情</el-button
           >
         </template>
       </el-table-column>
     </el-table>
 
-    <el-dialog :visible.sync="dialogVisible" width="80%" center>
-      <component :is="componentUrl" :taskList="taskList"></component>
+    <el-dialog
+      :visible.sync="dialogVisible"
+      width="80%"
+      center
+      @close="closeDia"
+    >
+      <component
+        :is="componentUrl"
+        :taskList="taskList"
+        ref="componentSH"
+      ></component>
 
       <el-dialog
         width="60%"
@@ -141,11 +151,14 @@
         </div>
       </el-dialog>
 
-      <span slot="footer" class="dialog-footer">
+      <span slot="footer" class="dialog-footer" v-if="taskList.status == 0">
         <el-button type="primary" @click="submitBtn('同意')">同意</el-button>
         <el-button type="warning" @click="submitBtn('驳回')">驳回</el-button>
         <el-button type="danger" @click="submitBtn('退回')">退回</el-button>
       </span>
+      <span slot="footer" class="dialog-footer" v-else>
+        <el-button type="primary" @click="backDia">返回</el-button>
+      </span>
     </el-dialog>
 
     <pagination
@@ -172,13 +185,14 @@ import {
   approve, //通过
   reject, //驳回
   goback, //退回
+  downloadpic,
 } from "@/api/portal/task/task";
 
 export default {
   name: "INSTACTIONTASK",
-  components:{
+  components: {
     newsTask,
-    couTask
+    couTask,
   },
   data() {
     return {
@@ -189,9 +203,13 @@ export default {
       //点击审核那三个按钮会触发submitBtn函数然后设置这个title
       subTitle: "",
       //审核页面的
-      taskList: [],
+      taskList: {
+        formobj:{
+          picture:''
+        }
+      },
       //动态组件
-      componentUrl: '',
+      componentUrl: "",
       //审核的dialog
       dialogVisible: false,
       // 根路径
@@ -290,9 +308,11 @@ export default {
   },
   created() {
     this.getList();
-
   },
   methods: {
+    closeDia() {
+      // console.log('关闭');
+    },
     extask() {
       this.$refs["extaskform"].validate((valid) => {
         if (valid) {
@@ -322,6 +342,9 @@ export default {
         }
       });
     },
+    backDia() {
+      this.dialogVisible = false;
+    },
     qx() {
       //审批意见的取消
       this.subForm = {};
@@ -333,19 +356,39 @@ export default {
       this.subTitle = type;
       this.innerVisible = true;
     },
+    // //点击审核
+    // handleExamine(row) {
+    //   // this.taskList = []
+    //   getINSTACTIONTASK(row.id).then((res) => {
+    //     this.taskList = res.data;
+    //     this.componentUrl = res.data.infoUrl;
+    //     downloadpic(res.data.formobj.picture).then((res) => {
+    //       this.taskList.formobj.picture = window.URL.createObjectURL(res);
+    //       console.log('下载转换后:',this.taskList.formobj.picture)
+    //       this.dialogVisible = true;
+    //     });
+    //   });
+    // },
     //点击审核
     handleExamine(row) {
+      // this.taskList = []
       getINSTACTIONTASK(row.id).then((res) => {
         this.taskList = res.data;
+        this.componentUrl = res.data.infoUrl;
         this.dialogVisible = true;
-        this.componentUrl = res.data.infoUrl
+
+
       });
     },
     //点击查看详细
     handleDetail(row) {
       getINSTACTIONTASK(row.id).then((res) => {
         this.taskList = res.data;
-        this.dialogVisible = true;
+        this.componentUrl = res.data.infoUrl;
+        downloadpic(this.taskList.formobj.picture).then((res) => {
+          this.taskList.formobj.picture = window.URL.createObjectURL(res);
+          this.dialogVisible = true;
+        });
       });
     },
     /** 查询审批任务实例列表 */