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

src/api/portal/GATHER/GATHER.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询数据采集列表
+export function listGATHER(query) {
+  return request({
+    url: '/gather/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询数据采集所有列表
+export function listAllGATHER(query) {
+  return request({
+    url: '/gather/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询数据采集详细
+export function getGATHER(id) {
+  return request({
+    url: '/gather/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增数据采集
+export function addGATHER(data) {
+  return request({
+    url: '/gather/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改数据采集
+export function updateGATHER(data) {
+  return request({
+    url: '/gather/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除数据采集
+export function delGATHER(id) {
+  return request({
+    url: '/gather/remove/' + id,
+    method: 'get'
+  })
+}

src/api/portal/OPSERVICE/OPSERVICE.js

@@ -58,14 +58,15 @@ export function upload(data) {
   return request({
     url: '/common/upload',
     method: 'post',
-    data:data
+    data: data
   })
 }
 
-// 下载文件
-export function download(data) {
+// 获取文件流
+export function download(data,id) {
   return request({
-    url: '/common/download?fileName='+data,
-    method: 'get'
+    url: '/OPSERVICE/download?delete=false&fileName=' + data + '&id='+id,
+    method: 'get',
+    responseType: "blob"
   })
 }

src/api/portal/news/NEWS.js

@@ -82,10 +82,10 @@ export function setTop(data) {
 
 
 // 提交审核   暂存提交  驳回提交   新增新闻都需要调用这个
-export function newCommit(data) {
+export function newCommit(CbNewsVo) {
   return request({
     url: '/news/audit/',
     method: 'post',
-    data:data
+    data:CbNewsVo
   })
 }

src/views/GATHER/index.vue

@@ -0,0 +1,468 @@
+<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="type">
+        <el-select
+          v-model="queryParams.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="collStatus">
+        <el-select
+          v-model="queryParams.collStatus"
+          placeholder="请选择采集状态"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="dict in collStatus"
+            :key="dict.value + 'collStatus'"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="上报状态" prop="reportStatus">
+        <el-select
+          v-model="queryParams.reportStatus"
+          placeholder="请选择上报状态"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="dict in reportStatus"
+            :key="dict.value + 'reportStatus'"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审核状态" prop="approveStatus">
+        <el-select
+          v-model="queryParams.approveStatus"
+          placeholder="请选择审核状态"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="dict in approveStatus"
+            :key="dict.value + 'approveStatus'"
+            :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="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['business:GATHER:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="GATHERList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="数据类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <span v-if="scope.row.type == 0">量化指标数据</span>
+          <span v-if="scope.row.type == 1">月报表数据</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="月份" align="center" prop="month">
+        <template slot-scope="scope">
+          {{ scope.row.month }}
+        </template>
+      </el-table-column>
+      <el-table-column label="采集状态" align="center" prop="collStatus">
+        <template slot-scope="scope">
+          <span v-if="scope.row.collStatus == 0">未采集</span>
+          <span v-if="scope.row.collStatus == 1">已采集</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="上报状态" align="center" prop="reportStatus">
+        <template slot-scope="scope">
+          <span v-if="scope.row.reportStatus == 0">未上报</span>
+          <span v-if="scope.row.reportStatus == 1">已上报</span>
+        </template>
+      </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>
+        </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:GATHER:edit']"
+            >修改</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"
+    />
+
+    <!-- 添加或修改数据采集对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
+      <el-tabs v-model="activeName"  type="border-card" @tab-click="handleClick">
+        <el-tab-pane v-for="(item,index) in 10" :key="index+'tabs'" :label="'用户管理'+index" :name="'index'+index" >
+          {{ item }}
+        </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-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>
+  </div>
+</template>
+
+<script>
+import {
+  listGATHER,
+  getGATHER,
+  delGATHER,
+  addGATHER,
+  updateGATHER,
+} from "@/api/portal/GATHER/GATHER.js";
+
+export default {
+  name: "GATHER",
+  data() {
+    return {
+      activeName:'',
+      //数据类型(0=量化指标数据,1=月报表数据)
+      typeList: [
+        { label: "量化指标数据", value: "0" },
+        { label: "月报表数据", value: "1" },
+      ],
+      //采集状态(0=未采集,1=已采集)
+      collStatus: [
+        { label: "未采集", value: "0" },
+        { label: "已采集", value: "1" },
+      ],
+      //上报状态(0=未上报,=1已上报)
+      reportStatus: [
+        { label: "未上报", value: "0" },
+        { label: "已上报", value: "1" },
+      ],
+      //审核状态(0=未审核,1审核中,2=审核通过,3=审核拒绝)
+      approveStatus: [
+        { label: "未审核", value: "0" },
+        { label: "审核中", value: "1" },
+        { label: "审核通过", value: "2" },
+        { label: "审核拒绝", value: "3" },
+      ],
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 数据采集表格数据
+      GATHERList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        delFlag: null,
+        deptId: null,
+        type: null,
+        month: null,
+        collStatus: null,
+        reportStatus: null,
+        approveStatus: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [{ required: true, message: "$comment不能为空", trigger: "blur" }],
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" },
+        ],
+        deptId: [
+          { required: true, message: "部门id不能为空", trigger: "blur" },
+        ],
+        type: [
+          {
+            required: true,
+            message: "数据类型(0=量化指标数据,1=月报表数据)不能为空",
+            trigger: "change",
+          },
+        ],
+        month: [{ required: true, message: "月份不能为空", trigger: "blur" }],
+        collStatus: [
+          {
+            required: true,
+            message: "采集状态(0=未采集,1=已采集)不能为空",
+            trigger: "blur",
+          },
+        ],
+        reportStatus: [
+          {
+            required: true,
+            message: "上报状态(0=未上报,=1已上报)不能为空",
+            trigger: "blur",
+          },
+        ],
+        approveStatus: [
+          {
+            required: true,
+            message: "审核状态(0=未审核,1审核中,2=审核通过,3=审核拒绝)不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询数据采集列表 */
+    getList() {
+      this.loading = true;
+      listGATHER(this.queryParams).then((response) => {
+        this.GATHERList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        delFlag: null,
+        deptId: null,
+        type: null,
+        month: null,
+        collStatus: "0",
+        reportStatus: "0",
+        approveStatus: "0",
+      };
+      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 = "添加数据采集";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getGATHER(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改数据采集";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      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 {
+            addGATHER(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除数据采集编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delGATHER(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "business/GATHER/export",
+        {
+          ...this.queryParams,
+        },
+        `GATHER_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>

src/views/OPSERVICE/index.vue

@@ -116,7 +116,7 @@
       </el-table-column> -->
       <el-table-column label="下载次数" align="center" prop="download">
         <template slot-scope="scope">
-          {{ scope.row.download?scope.row.download:'暂无下载' }}
+          {{ scope.row.download ? scope.row.download : "暂无下载" }}
         </template>
       </el-table-column>
 
@@ -192,7 +192,7 @@
         </el-form-item>
 
         <el-form-item label="文件名称" prop="serviceName">
-          <el-input v-model="form.serviceName"></el-input>
+          <el-input v-model="form.serviceName" disabled></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -211,9 +211,10 @@ import {
   addOPSERVICE,
   updateOPSERVICE,
   upload,
-  download
+  download,
 } from "@/api/portal/OPSERVICE/OPSERVICE.js";
 
+import { saveAs } from "file-saver";
 export default {
   name: "OPSERVICE",
   data() {
@@ -284,6 +285,8 @@ export default {
           { required: true, message: "服务类型不能为空", trigger: "change" },
         ],
       },
+      setFileName: "", //保存文件名，点击下载时使用这个名字
+      downloadLoadingInstance:'',
     };
   },
   created() {
@@ -299,17 +302,20 @@ export default {
         this.loading = false;
       });
     },
-    handleDownload(row){
-      let fileName = row.serviceName
-      download(fileName).then(res=>{
-      })
+    handleDownload(row) {
+      this.setFileName = row.serviceName;
+      download(row.linkUrl,row.id).then((res) => {
+        const blob = new Blob([res]);
+        saveAs(blob, this.setFileName);
+        this.getList();
+      });
     },
     httprequest() {},
     uploadFile(file) {
       let formData = new FormData();
       formData.append("file", file);
       upload(formData).then((res) => {
-        this.form.linkUrl = res.url;
+        this.form.linkUrl = res.fileName;
         this.$set(this.form, "serviceName", res.originalFilename);
       });
     },
@@ -398,7 +404,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('确定删除吗？')
+        .confirm("确定删除吗？")
         .then(function () {
           return delOPSERVICE(ids);
         })

src/views/WEBSITE/index.vue

@@ -54,7 +54,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="WEBSITEList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="WEBSITEList" @selection-change="handleSelectionChange" height="calc(100vh - 300px)">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="网址名字" align="center" prop="websiteName"/>
       <el-table-column label="背景图片" align="center" prop="websiteUrl">
@@ -244,8 +244,9 @@ export default {
       this.form = {
         websiteUrl: null,
         websiteName: null,
-        id: null
+        id: null,
       };
+      this.fileList = [];
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -278,6 +279,9 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改网站管理";
+        if (this.form.websiteUrl) {
+          this.fileList.push({ name: "xxx", url: this.form.websiteUrl });
+        }
       });
     },
     /** 提交按钮 */

src/views/news/index.vue

@@ -230,19 +230,13 @@
             v-hasPermi="['business:NEWS:remove']"
             >下架</el-button
           >
-          <el-popconfirm
-            title="确定提交审核吗？"
-            @confirm="handleCommit(scope.row.id)"
-          >
             <el-button
-              slot="reference"
               v-if="scope.row.status == 0 || scope.row.status == 2"
               size="mini"
               type="text"
               v-hasPermi="['business:NEWS:remove']"
-              >提交审核</el-button
-            >
-          </el-popconfirm>
+              @click="handleCommit(scope.row)"
+              >提交审核</el-button>
 
           <el-button
             v-if="scope.row.status == 0 || scope.row.status == 2 || scope.row.status == 5"
@@ -606,10 +600,11 @@ export default {
         }
       });
     },
-    handleCommit(id) {
-      let data = new FormData();
-      data.append("id", id);
-      newCommit(data).then((response) => {
+    handleCommit(row) {
+      // let data = new FormData();
+      // data.append("id", id);
+      let CbNewsVo = row
+      newCommit(CbNewsVo).then((response) => {
         this.$modal.msgSuccess("提交审核成功!");
         this.getList();
       });