Merge remote-tracking branch 'origin/master'

src/api/knowledge/knowledge.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询知识库列表
+export function listBase(query) {
+  return request({
+    url: '/knowledge/base/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询知识库详细
+export function getBase(id) {
+  return request({
+    url: '/knowledge/base/' + id,
+    method: 'get'
+  })
+}
+
+// 新增知识库
+export function addBase(data) {
+  return request({
+    url: '/knowledge/base',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改知识库
+export function updateBase(data) {
+  return request({
+    url: '/knowledge/base',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除知识库
+export function delBase(id) {
+  return request({
+    url: '/knowledge/base/' + id,
+    method: 'delete'
+  })
+}
+
+export function updateIsPopular(data) {
+  return request({
+    url: '/knowledge/base/updateIsPopular',
+    method: 'put',
+    data: data
+  })
+}

src/components/ImageUpload/index.vue

@@ -19,7 +19,7 @@
     >
       <i class="el-icon-plus"></i>
     </el-upload>
-    
+
     <!-- 上传提示 -->
     <div class="el-upload__tip" slot="tip" v-if="showTip">
       请上传
@@ -51,12 +51,12 @@ export default {
     // 图片数量限制
     limit: {
       type: Number,
-      default: 5,
+      default: 100,
     },
     // 大小限制(MB)
     fileSize: {
        type: Number,
-      default: 5,
+      default: 10,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {

src/views/handleAffairs/gridType/index.vue

@@ -116,7 +116,7 @@
           <el-input v-model="form.name" placeholder="请输入名称" maxlength="20"/>
         </el-form-item>
         <el-form-item label="岗位描述" prop="jobDescription">
-          <el-input v-model="form.jobDescription" placeholder="请输入岗位描述" maxlength="255"/>
+          <el-input v-model="form.jobDescription" placeholder="请输入岗位描述" maxlength="255" type="textarea" rows="4"/>
         </el-form-item>
         <el-form-item label="图片路径" prop="fileUrl">
           <image-upload v-model="form.fileUrl" :fileSize="10" :limit="1"/>

src/views/highServer/knowledge/index.vue

@@ -0,0 +1,316 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="标题" prop="titleName">
+        <el-input
+          v-model="queryParams.titleName"
+          placeholder="请输入标题"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="点赞数" prop="likeNum">
+        <el-input
+          v-model="queryParams.likeNum"
+          placeholder="请输入点赞数"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="浏览数" prop="watchNum">
+        <el-input
+          v-model="queryParams.watchNum"
+          placeholder="请输入浏览数"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:base:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="baseList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="序号" align="center" type="index"/>
+      <el-table-column label="标题" align="center" prop="titleName"/>
+<!--      <el-table-column label="正文" align="center" prop="textDetails"/>-->
+      <el-table-column label="是否热门" align="center" prop="popular">
+        <template slot-scope="scope">
+          <el-switch
+            @change="switchChange(scope.row)"
+            v-model="scope.row.popular"
+            active-color="#13ce66"
+            inactive-color="#ff4949">
+          </el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="付费积分" align="center" prop="integral"/>
+      <el-table-column label="点赞数" align="center" prop="likeNum"/>
+      <el-table-column label="浏览数" align="center" prop="watchNum"/>
+      <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)"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除
+          </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="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="标题" prop="titleName">
+          <el-input v-model="form.titleName" placeholder="请输入标题"/>
+        </el-form-item>
+        <el-form-item label="正文" prop="textDetails">
+          <editor v-model="form.textDetails" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="图片" prop="imgUrlList">
+          <image-upload v-model="form.imgUrlList"/>
+        </el-form-item>
+        <el-form-item label="付费积分" prop="integral">
+          <el-input-number v-model="form.integral" :min="0" :max="999999" label="请输入付费积分"></el-input-number>
+        </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 {listBase, getBase, delBase, addBase, updateBase, updateIsPopular} from "@/api/knowledge/knowledge";
+
+export default {
+  name: "knowledge",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 知识库表格数据
+      baseList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        titleName: null,
+        textDetails: null,
+        popular: null,
+        integral: null,
+        likeNum: null,
+        watchNum: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        titleName: [
+          {required: true, message: "标题不能为空", trigger: "blur"},
+        ],
+        textDetails: [
+          {required: true, message: "正文不能为空", trigger: "blur"},
+        ],
+        integral: [
+          {required: true, message: "付费积分不能为空", trigger: "change"},
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询知识库列表 */
+    getList() {
+      this.loading = true;
+      listBase(this.queryParams).then(response => {
+        this.baseList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        titleName: null,
+        textDetails: null,
+        popular: null,
+        integral: null,
+        likeNum: null,
+        watchNum: null,
+        imgUrlList: null,
+      };
+      this.resetForm("form");
+    },
+    switchChange(row) {
+      let params = {
+        id: row.id,
+        popular: row.popular
+      }
+      updateIsPopular(params).then(response => {
+        this.$modal.msgSuccess("操作成功");
+        this.getList();
+      });
+    },
+    /** 搜索按钮操作 */
+    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
+      getBase(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) {
+            updateBase(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBase(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 delBase(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('knowledge/base/export', {
+        ...this.queryParams
+      }, `base_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/information/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
       <el-form-item label="标题" prop="titleName">
         <el-input
           v-model="queryParams.titleName"
@@ -9,6 +9,26 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="是否置顶" prop="isTop">
+        <el-select v-model="queryParams.isTop" placeholder="是否置顶" clearable>
+          <el-option
+            v-for="dict in isTops"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否政策推荐" prop="isGovernment">
+        <el-select v-model="queryParams.isGovernment" placeholder="是否政策推荐" clearable>
+          <el-option
+            v-for="dict in isGovernments"
+            :key="dict.value"
+            :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>
@@ -68,8 +88,21 @@
     <el-table v-loading="loading" :data="serverList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="序号" align="center" type="index"/>
-      <el-table-column label="标题" align="center" prop="titleName"/>
-      <el-table-column label="正文" align="center" prop="textDetails" show-overflow-tooltip/>
+      <el-table-column label="标题" align="center" prop="titleName" show-overflow-tooltip/>
+      <el-table-column label="是否政策推荐" align="center" prop="isGovernment">
+        <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.isGovernment == '1'">是</el-tag>
+          <el-tag type="warning" v-if="scope.row.isGovernment == '0'">否</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否置顶" align="center" prop="isTop">
+        <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.isTop == '1'">是</el-tag>
+          <el-tag type="warning" v-if="scope.row.isTop == '0'">否</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="点赞数" align="center" prop="likeNum" show-overflow-tooltip/>
+      <el-table-column label="浏览数" align="center" prop="watchNum" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -101,17 +134,63 @@
     />
 
     <!-- 添加或修改资讯对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="标题" prop="titleName">
-          <el-input v-model="form.titleName" placeholder="请输入标题"/>
-        </el-form-item>
-        <el-form-item label="正文" prop="textDetails">
-          <editor v-model="form.textDetails" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="图片" prop="imgUrlList">
-          <image-upload v-model="form.imgUrlList"/>
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="标题" prop="titleName">
+              <el-input v-model="form.titleName" placeholder="请输入标题" maxlength="50"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="是否置顶" prop="isTop">
+              <el-switch
+                v-model="form.isTop"
+                :active-value="1"
+                :inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否政策推荐" prop="isGovernment">
+              <el-switch
+                v-model="form.isGovernment"
+                :active-value="1"
+                :inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="浏览数" prop="watchNum">
+              <el-input-number v-model="form.watchNum" :min="0" :max="999999999" label="浏览数"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="点赞数" prop="likeNum">
+              <el-input-number v-model="form.likeNum" :min="0" :max="999999999" label="点赞数"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="正文" prop="textDetails">
+              <editor v-model="form.textDetails" :min-height="192"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="图片" prop="imgUrlList">
+              <image-upload v-model="form.imgUrlList"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -133,6 +212,8 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      isGovernments: [{label: '是', value: '1'}, {label: '否', value: '0'}],
+      isTops: [{label: '是', value: '1'}, {label: '否', value: '0'}],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -152,14 +233,33 @@ export default {
         pageNum: 1,
         pageSize: 10,
         titleName: null,
-        textDetails: null,
-        type: null,
+        isGovernment: null,
+        isTop: null,
+        type: this.$route.query.type,
+        delFlag: 0,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-
+        titleName: [
+          {required: true, message: "标题不能为空", trigger: "blur"},
+        ],
+        titleDetails: [
+          {required: true, message: "正文不能为空", trigger: "blur"},
+        ],
+        isGovernment: [
+          {required: true, message: "政策推荐不能为空", trigger: "change"},
+        ],
+        isTop: [
+          {required: true, message: "置顶不能为空", trigger: "change"},
+        ],
+        likeNum: [
+          {required: true, message: "点赞数不能为空", trigger: ["change",'blur']},
+        ],
+        watchNum: [
+          {required: true, message: "浏览数不能为空", trigger: ["change",'blur']},
+        ],
       }
     };
   },
@@ -189,14 +289,16 @@ export default {
         titleName: null,
         textDetails: null,
         type: this.$route.query.type,
-        createBy: null,
         createTime: null,
+        watchNum: 0,
+        likeNum: 0,
+        isTop: '0',
+        isGovernment: '0',
         updateBy: null,
         updateTime: null,
-        imgUrlList: null,
+        imgUrlList: '',
         delFlag: 0,
       };
-      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -215,35 +317,35 @@ export default {
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
+    async handleAdd() {
+      await this.reset();
       this.open = true;
       let str = ''
-      if (this.$route.query.type==10){
+      if (this.$route.query.type == 10) {
         str = '惠民通'
-      }else if(this.$route.query.type==11){
+      } else if (this.$route.query.type == 11) {
         str = '法律下乡'
-      }else if(this.$route.query.type==12){
+      } else if (this.$route.query.type == 12) {
         str = '资讯'
       }
-      this.title = "修改"+str;
+      this.title = "新增" + str;
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
+    async handleUpdate(row) {
+      await this.reset();
       const id = row.id || this.ids
       getServer(id).then(response => {
         this.form = response.data;
         this.open = true;
         let str = ''
-        if (this.$route.query.type==10){
+        if (this.$route.query.type == 10) {
           str = '惠民通'
-        }else if(this.$route.query.type==11){
+        } else if (this.$route.query.type == 11) {
           str = '法律下乡'
-        }else if(this.$route.query.type==12){
+        } else if (this.$route.query.type == 12) {
           str = '资讯'
         }
-        this.title = "修改"+str;
+        this.title = "修改" + str;
       });
     },
     /** 提交按钮 */

src/views/score/score.vue

@@ -75,7 +75,7 @@
 </template>
 
 <script>
-import {getPersonBasicInfo, listScoreInfo} from "@/api/score/score";
+import {getPersonBasicInfo, listScoreInfo} from "@/api/my/score";
 import {debug} from "script-ext-html-webpack-plugin/lib/common";
 
 export default {