一些优化调整

src/assets/styles/extend.scss

@@ -0,0 +1,125 @@
+/***vue-layer弹窗组件 https://github.com/zuoyanart/vue-layer****/
+.vl-notify-mask {
+  background-color: black !important;
+  opacity: 0.4 !important;
+  z-index: 1504;
+}
+.vl-notify.vl-notify-msg.vl-notify-loading {
+  z-index: 1505 !important;
+}
+.vl-notify.vl-notify-iframe {
+  border: 0px !important;
+  border-radius: 10px !important;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.2) !important;
+}
+.vl-notify.vl-notify-alert h2.vl-notice-title {
+  font-size: 17px !important;
+}
+.lv-icon-mini {
+}
+.vl-notify.vl-notify-iframe .vl-notify-content {
+  padding: 0px !important;
+}
+.lab {
+  font-size: 17px;
+  position: relative;
+  margin-bottom: 20px;
+  .bsg {
+    position: absolute;
+    width: 4px;
+    height: 15px;
+    background-color: rgb(64, 158, 255);
+    border-radius: 5px;
+    top: 4px;
+  }
+  .tit {
+    margin-left: 10px;
+    color: #545555;
+    font-weight: bold;
+  }
+  .add {
+    float: right;
+    margin-top: -22px;
+  }
+}
+.del {
+  color: #f44336;
+  cursor: pointer;
+}
+.bos {
+  border: 1px solid #e6e6e6;
+  padding: 10px 15px 10px 15px;
+  border-radius: 5px;
+  margin-bottom: 15px;
+}
+/** 弹出框样式 **/
+.el-dialog {
+  border-radius: 10px !important;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1) !important;
+}
+.el-dialog:not(.is-fullscreen) {
+  margin-top: 6vh !important;
+}
+.v-modal {
+  z-index: 1500 !important;
+}
+.el-dialog__wrapper {
+  z-index: 1501 !important;
+}
+.el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body {
+  overflow: auto;
+  overflow-x: hidden;
+  max-height: 70vh;
+  padding: 10px 20px 0;
+}
+.el-dialog__body {
+  padding: 20px 35px 20px 35px !important;
+  overflow: hidden !important;
+  overflow-y: auto !important;
+}
+.el-dialog__header {
+  background-color: aliceblue !important;
+  border-radius: 10px 10px 0px 0px;
+  padding-bottom: 13px;
+}
+.el-dialog__footer {
+  border-top: 1px solid #e8eaec;
+  padding: 10px !important;
+  z-index: 2;
+  border-radius: 0px 0px 10px 10px;
+  position: relative;
+  background-color: white;
+}
+.se {
+  width: 165px !important;
+}
+.mb8 {
+  margin-top: -8px;
+}
+.el-table {
+  .el-table__header-wrapper,
+  .el-table__fixed-header-wrapper {
+    th {
+      word-break: break-word;
+      background-color: #f8f8f9;
+      color: #515a6e;
+      height: 40px;
+      font-size: 15px;
+    }
+  }
+  .el-table__body-wrapper {
+    .el-button [class*='el-icon-'] + span {
+      margin-left: 1px;
+    }
+  }
+}
+.omit {
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+.el-upload--picture-card {
+  width: 120px;
+  height: 120px;
+  line-height: 120px;
+}

src/assets/styles/index.scss

@@ -24,6 +24,7 @@ html {
 
 #app {
   height: 100%;
+  background-color: rgba(242, 243, 245, 1);
 }
 
 *,
@@ -122,6 +123,11 @@ aside {
 //main-container全局样式
 .app-container {
   padding: 20px;
+  background-color: white;
+  margin: 15px 20px 15px 20px;
+  border-radius: 5px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.08);
+  position: relative;
 }
 
 .components-container {

src/components/TopNav/index.vue

@@ -191,8 +191,4 @@ export default {
   padding: 0 5px !important;
   margin: 0 10px !important;
 }
-
-.el-dialog>.el-dialog__body {
-  padding: 0 !important;
-}
 </style>

src/main.js

@@ -7,6 +7,7 @@ import './assets/styles/element-variables.scss'
 
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
+import '@/assets/styles/extend.scss' // extend css
 import App from './App'
 import store from './store'
 import router from './router'

src/views/COMPANYUSER/index.vue

@@ -1,13 +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" :inline="true" v-show="showSearch">
       <el-form-item label="姓名" prop="nickName">
         <el-input v-model="queryParams.nickName" placeholder="请输入姓名"></el-input>
       </el-form-item>
@@ -15,72 +8,29 @@
         <el-input v-model="queryParams.userName" placeholder="请输入用户名"></el-input>
       </el-form-item>
       <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 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>
-        <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-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['business:COMPANYUSER:edit']"
-          >修改</el-button
-        >
+        <el-button type="success" icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['business:COMPANYUSER: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:COMPANYUSER:remove']"
-          >删除</el-button
-        >
+        <el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['business:COMPANYUSER:remove']">删除</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="COMPANYUSERList"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="COMPANYUSERList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="姓名" align="center" prop="nickName">
+      <el-table-column label="姓名" align="left" prop="nickName">
         <template slot-scope="scope">
           {{ scope.row.nickName }}
         </template>
@@ -116,85 +66,41 @@
           {{ scope.row.research }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <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:COMPANYUSER:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['business:COMPANYUSER:remove']"
-            >删除</el-button
-          >
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:COMPANYUSER:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['business:COMPANYUSER: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"
-    />
+    <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-dialog :title="title" :visible.sync="open" width="550px" :close-on-click-modal="false" append-to-body>
       <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"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+        <el-form-item label="用户类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择类型" filterable style="width: 100%">
+            <el-option v-for="dict in typeList" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="姓名" prop="nickName">
+        <el-form-item label="用户姓名" prop="nickName">
           <el-input v-model="form.nickName" placeholder="请输入姓名"></el-input>
         </el-form-item>
         <el-form-item label="用户名" prop="userName">
-          <el-input
-            v-model="form.userName"
-            placeholder="请输入用户名"
-          ></el-input>
+          <el-input v-model="form.userName" placeholder="请输入用户名"></el-input>
         </el-form-item>
-        <el-form-item label="学历" prop="education">
-          <el-input
-            v-model="form.education"
-            placeholder="请输入学历"
-          ></el-input>
+        <el-form-item label="最高学历" prop="education">
+          <el-input v-model="form.education" placeholder="请输入学历"></el-input>
         </el-form-item>
         <el-form-item label="工作经验" prop="experience">
-          <el-input
-            v-model="form.experience"
-            placeholder="请输入工作经验"
-          ></el-input>
+          <el-input v-model="form.experience" placeholder="请输入工作经验"></el-input>
         </el-form-item>
         <el-form-item label="专业领域" prop="field">
-          <el-input
-            v-model="form.field"
-            placeholder="请输入专业领域"
-          ></el-input>
+          <el-input v-model="form.field" placeholder="请输入专业领域"></el-input>
         </el-form-item>
         <el-form-item label="研究方向" prop="research">
-          <el-input
-            v-model="form.research"
-            placeholder="请输入研究方向"
-          ></el-input>
+          <el-input v-model="form.research" placeholder="请输入研究方向"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -206,21 +112,15 @@
 </template>
 
 <script>
-import {
-  listCOMPANYUSER,
-  getCOMPANYUSER,
-  delCOMPANYUSER,
-  addCOMPANYUSER,
-  updateCOMPANYUSER,
-} from "@/api/portal/COMPANYUSER/COMPANYUSER.js";
+import { listCOMPANYUSER, getCOMPANYUSER, delCOMPANYUSER, addCOMPANYUSER, updateCOMPANYUSER } from '@/api/portal/COMPANYUSER/COMPANYUSER.js';
 
 export default {
-  name: "COMPANYUSER",
+  name: 'COMPANYUSER',
   data() {
     return {
       typeList: [
-        { label: "普通用户", value: "1" },
-        { label: "专家", value: "2" },
+        { label: '普通用户', value: '1' },
+        { label: '专家', value: '2' }
       ],
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
@@ -239,7 +139,7 @@ export default {
       // 门户用户表格数据
       COMPANYUSERList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -262,48 +162,26 @@ export default {
         education: null,
         experience: null,
         field: null,
-        research: null,
+        research: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        id: [{ required: true, message: "$comment不能为空", trigger: "blur" }],
-        delFlag: [
-          { required: true, message: "删除标识不能为空", trigger: "blur" },
-        ],
-        nickName: [
-          { required: true, message: "姓名不能为空", trigger: "blur" },
-        ],
-        userName: [
-          { required: true, message: "用户名不能为空", trigger: "blur" },
-        ],
-        password: [
-          { required: true, message: "密码不能为空", trigger: "blur" },
-        ],
-        loginIp: [
-          { required: true, message: "登录ip不能为空", trigger: "blur" },
-        ],
-        loginDate: [
-          { required: true, message: "登录日期不能为空", trigger: "blur" },
-        ],
-        type: [{ required: true, message: "类型不能为空", trigger: "change" }],
-        baseInfo: [
-          { required: true, message: "基本信息不能为空", trigger: "blur" },
-        ],
-        education: [
-          { required: true, message: "学历不能为空", trigger: "blur" },
-        ],
-        experience: [
-          { required: true, message: "工作经验不能为空", trigger: "blur" },
-        ],
-        field: [
-          { required: true, message: "专业领域不能为空", trigger: "blur" },
-        ],
-        research: [
-          { required: true, message: "研究方向不能为空", trigger: "blur" },
-        ],
-      },
+        id: [{ required: true, message: '$comment不能为空', trigger: 'blur' }],
+        delFlag: [{ required: true, message: '删除标识不能为空', trigger: 'blur' }],
+        nickName: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+        userName: [{ required: true, message: '用户名不能为空', trigger: 'blur' }],
+        password: [{ required: true, message: '密码不能为空', trigger: 'blur' }],
+        loginIp: [{ required: true, message: '登录ip不能为空', trigger: 'blur' }],
+        loginDate: [{ required: true, message: '登录日期不能为空', trigger: 'blur' }],
+        type: [{ required: true, message: '类型不能为空', trigger: 'change' }],
+        baseInfo: [{ required: true, message: '基本信息不能为空', trigger: 'blur' }],
+        education: [{ required: true, message: '学历不能为空', trigger: 'blur' }],
+        experience: [{ required: true, message: '工作经验不能为空', trigger: 'blur' }],
+        field: [{ required: true, message: '专业领域不能为空', trigger: 'blur' }],
+        research: [{ required: true, message: '研究方向不能为空', trigger: 'blur' }]
+      }
     };
   },
   created() {
@@ -313,7 +191,7 @@ export default {
     /** 查询门户用户列表 */
     getList() {
       this.loading = true;
-      listCOMPANYUSER(this.queryParams).then((response) => {
+      listCOMPANYUSER(this.queryParams).then(response => {
         this.COMPANYUSERList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -339,9 +217,9 @@ export default {
         education: null,
         experience: null,
         field: null,
-        research: null,
+        research: null
       };
-      this.resetForm("form");
+      this.resetForm('form');
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -350,12 +228,12 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm('queryForm');
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -363,31 +241,31 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加门户用户";
+      this.title = '添加门户用户';
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getCOMPANYUSER(id).then((response) => {
+      getCOMPANYUSER(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改门户用户";
+        this.title = '修改门户用户';
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateCOMPANYUSER(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
+            updateCOMPANYUSER(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功');
               this.open = false;
               this.getList();
             });
           } else {
-            addCOMPANYUSER(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
+            addCOMPANYUSER(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功');
               this.open = false;
               this.getList();
             });
@@ -399,26 +277,26 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm("是否确认删除这个门户用户吗？")
+        .confirm('是否确认删除这个门户用户吗？')
         .then(function () {
           return delCOMPANYUSER(ids);
         })
         .then(() => {
           this.getList();
-          this.$modal.msgSuccess("删除成功");
+          this.$modal.msgSuccess('删除成功');
         })
         .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        "business/COMPANYUSER/export",
+        'business/COMPANYUSER/export',
         {
-          ...this.queryParams,
+          ...this.queryParams
         },
         `COMPANYUSER_${new Date().getTime()}.xlsx`
       );
-    },
-  },
+    }
+  }
 };
 </script>

src/views/CONTACTUS/index.vue

@@ -1,98 +1,35 @@
 <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" :inline="true" v-show="showSearch">
       <el-form-item label="单位名称" prop="title">
-        <el-input
-          v-model="queryParams.depName"
-          placeholder="请输入单位名称"
-        ></el-input>
+        <el-input v-model="queryParams.depName" placeholder="请输入单位名称"></el-input>
       </el-form-item>
       <el-form-item label="联系电话" prop="title">
-        <el-input
-          v-model="queryParams.telphone"
-          placeholder="请输入联系电话"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="位置" prop="location">
-        <el-input
-          v-model="queryParams.location"
-          placeholder="请输入位置"
-        ></el-input>
+        <el-input v-model="queryParams.telphone" placeholder="请输入联系电话"></el-input>
       </el-form-item>
       <el-form-item label="邮箱" prop="email">
-        <el-input
-          v-model="queryParams.email"
-          placeholder="请输入邮箱"
-        ></el-input>
+        <el-input v-model="queryParams.email" placeholder="请输入邮箱"></el-input>
       </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-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @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:CONTACTUS:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['business:CONTACTUS: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:CONTACTUS:edit']"
-          >修改</el-button
-        >
+        <el-button type="success" icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['business:CONTACTUS: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:CONTACTUS:remove']"
-          >删除</el-button
-        >
+        <el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['business:CONTACTUS:remove']">删除</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="CONTACTUSList"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="CONTACTUSList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 
       <el-table-column label="单位名称" align="center" prop="depName">
@@ -125,77 +62,31 @@
           {{ scope.row.createBy }}
         </template>
       </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updateTime">
-        <template slot-scope="scope">
-          {{ scope.row.updateTime }}
-        </template>
-      </el-table-column>
-      <el-table-column label="更新人" align="center" prop="updateBy">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          {{ scope.row.updateBy }}
-        </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:CONTACTUS:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['business:CONTACTUS:remove']"
-            >删除</el-button
-          >
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:CONTACTUS:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['business:CONTACTUS: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"
-    />
+    <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-dialog :title="title" :visible.sync="open" width="550px" :close-on-click-modal="false" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="单位名称" prop="title">
-        <el-input
-          v-model="form.depName"
-          placeholder="请输入单位名称"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="联系电话" prop="title">
-        <el-input
-          v-model="form.telphone"
-          placeholder="请输入联系电话"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="位置" prop="location">
-        <el-input
-          v-model="form.location"
-          placeholder="请输入位置"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="邮箱" prop="email">
-        <el-input
-          v-model="form.email"
-          placeholder="请输入邮箱"
-        ></el-input>
-      </el-form-item>
+          <el-input v-model="form.depName" placeholder="请输入单位名称"></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话" prop="title">
+          <el-input v-model="form.telphone" placeholder="请输入联系电话"></el-input>
+        </el-form-item>
+        <el-form-item label="邮箱" prop="email">
+          <el-input v-model="form.email" placeholder="请输入邮箱"></el-input>
+        </el-form-item>
+        <el-form-item label="位置" prop="location">
+          <el-input v-model="form.location" placeholder="请输入位置" rows="5" type="textarea"></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -206,16 +97,10 @@
 </template>
 
 <script>
-import {
-  listCONTACTUS,
-  getCONTACTUS,
-  delCONTACTUS,
-  addCONTACTUS,
-  updateCONTACTUS,
-} from "@/api/portal/CONTACTUS/CONTACTUS.js";
+import { listCONTACTUS, getCONTACTUS, delCONTACTUS, addCONTACTUS, updateCONTACTUS } from '@/api/portal/CONTACTUS/CONTACTUS.js';
 
 export default {
-  name: "CONTACTUS",
+  name: 'CONTACTUS',
   data() {
     return {
       // 根路径
@@ -235,7 +120,7 @@ export default {
       // 联系我们表格数据
       CONTACTUSList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -252,30 +137,20 @@ export default {
         depName: null,
         telphone: null,
         location: null,
-        email: null,
+        email: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        id: [{ required: true, message: "主键不能为空", trigger: "blur" }],
-        delFlag: [
-          { required: true, message: "删除标志不能为空", trigger: "blur" },
-        ],
-        deptId: [
-          { required: true, message: "部门ID不能为空", trigger: "blur" },
-        ],
-        depName: [
-          { required: true, message: "单位名称不能为空", trigger: "blur" },
-        ],
-        telphone: [
-          { required: true, message: "联系电话不能为空", trigger: "blur" },
-        ],
-        location: [
-          { required: true, message: "位置不能为空", trigger: "blur" },
-        ],
-        email: [{ required: true, message: "邮箱不能为空", trigger: "blur" }],
-      },
+        id: [{ required: true, message: '主键不能为空', trigger: 'blur' }],
+        delFlag: [{ required: true, message: '删除标志不能为空', trigger: 'blur' }],
+        deptId: [{ required: true, message: '部门ID不能为空', trigger: 'blur' }],
+        depName: [{ required: true, message: '单位名称不能为空', trigger: 'blur' }],
+        telphone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
+        location: [{ required: true, message: '位置不能为空', trigger: 'blur' }],
+        email: [{ required: true, message: '邮箱不能为空', trigger: 'blur' }]
+      }
     };
   },
   created() {
@@ -285,7 +160,7 @@ export default {
     /** 查询联系我们列表 */
     getList() {
       this.loading = true;
-      listCONTACTUS(this.queryParams).then((response) => {
+      listCONTACTUS(this.queryParams).then(response => {
         this.CONTACTUSList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -305,9 +180,9 @@ export default {
         depName: null,
         telphone: null,
         location: null,
-        email: null,
+        email: null
       };
-      this.resetForm("form");
+      this.resetForm('form');
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -316,12 +191,12 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm('queryForm');
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -329,31 +204,31 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加联系我们";
+      this.title = '添加联系我们';
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getCONTACTUS(id).then((response) => {
+      getCONTACTUS(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改联系我们";
+        this.title = '修改联系我们';
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateCONTACTUS(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
+            updateCONTACTUS(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功');
               this.open = false;
               this.getList();
             });
           } else {
-            addCONTACTUS(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
+            addCONTACTUS(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功');
               this.open = false;
               this.getList();
             });
@@ -371,20 +246,20 @@ export default {
         })
         .then(() => {
           this.getList();
-          this.$modal.msgSuccess("删除成功");
+          this.$modal.msgSuccess('删除成功');
         })
         .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        "business/CONTACTUS/export",
+        'business/CONTACTUS/export',
         {
-          ...this.queryParams,
+          ...this.queryParams
         },
         `CONTACTUS_${new Date().getTime()}.xlsx`
       );
-    },
-  },
+    }
+  }
 };
 </script>

src/views/COUNSELINGMESSAGE/index.vue

@@ -1,90 +1,26 @@
 <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" :inline="true" v-show="showSearch">
       <el-form-item label="标题" prop="title">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入标题"
-        ></el-input>
+        <el-input v-model="queryParams.title" placeholder="请输入标题"></el-input>
       </el-form-item>
       <el-form-item label="新闻状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择新闻状态"
-          clearable
-          filterable
-        >
-          <el-option
-            v-for="status in statusOptionList"
-            :key="status.value"
-            :label="status.label"
-            :value="status.value"
-          />
+        <el-select v-model="queryParams.status" placeholder="请选择新闻状态" clearable filterable>
+          <el-option v-for="status in statusOptionList" :key="status.value" :label="status.label" :value="status.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-button type="primary" icon="el-icon-search" @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:COUNSELINGMESSAGE:add']"
-        >新增</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['business:COUNSELINGMESSAGE: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:COUNSELINGMESSAGE: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:COUNSELINGMESSAGE:remove']"-->
-<!--        >删除</el-button>-->
-<!--      </el-col>-->
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['business:COUNSELINGMESSAGE:export']"
-        >导出</el-button>
+        <el-button type="warning" icon="el-icon-download" @click="handleExport" v-hasPermi="['business:COUNSELINGMESSAGE:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -92,85 +28,35 @@
     <!--列表-->
     <el-table v-loading="loading" :data="COUNSELINGMESSAGEList" @selection-change="handleSelectionChange" height="calc(100vh - 300px)">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="标题信息" align="center" prop="title"/>
-      <el-table-column label="发布日期" align="center" prop="createTime"/>
-      <el-table-column label="上报日期" align="center" prop="deptId"/>
-      <el-table-column label="审核日期" align="center" prop="deptId"/>
-      <el-table-column label="提交审核日期" align="center" prop="deptId"/>
-      <el-table-column
-        label="信息状态"
-        align="center"
-        prop="status"
-      >
+      <el-table-column label="标题信息" align="center" prop="title" />
+      <el-table-column label="发布日期" align="center" prop="createTime" />
+      <el-table-column label="上报日期" align="center" prop="deptId" />
+      <el-table-column label="审核日期" align="center" prop="deptId" />
+      <el-table-column label="提交审核日期" align="center" prop="deptId" />
+      <el-table-column label="信息状态" align="center" prop="status">
         <template slot-scope="scope">
           <span v-if="scope.row.status == 0"><el-tag>草稿</el-tag></span>
-          <span v-if="scope.row.status == 1"
-          ><el-tag type="warning">审核中</el-tag></span
-          >
-          <span v-if="scope.row.status == 2"
-          ><el-tag type="danger">审核驳回</el-tag></span
-          >
-          <span v-if="scope.row.status == 3"
-          ><el-tag type="success">已审核</el-tag></span
-          >
-          <span v-if="scope.row.status == 4"
-          ><el-tag type="success">已发布</el-tag></span
-          >
-          <span v-if="scope.row.status == 5"
-          ><el-tag type="info">已下架</el-tag></span
-          >
+          <span v-if="scope.row.status == 1"><el-tag type="warning">审核中</el-tag></span>
+          <span v-if="scope.row.status == 2"><el-tag type="danger">审核驳回</el-tag></span>
+          <span v-if="scope.row.status == 3"><el-tag type="success">已审核</el-tag></span>
+          <span v-if="scope.row.status == 4"><el-tag type="success">已发布</el-tag></span>
+          <span v-if="scope.row.status == 5"><el-tag type="info">已下架</el-tag></span>
           <span v-if="scope.row.status == 6"><el-tag>已置顶</el-tag></span>
         </template>
       </el-table-column>
 
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            v-if="scope.row.status == 4"
-            size="mini"
-            type="text"
-            v-hasPermi="['business:COUNSELINGMESSAGE:remove']"
-          >下架</el-button
-          >
-          <el-button
-            v-if="scope.row.status == 0 || scope.row.status == 2"
-            size="mini"
-            type="text"
-            v-hasPermi="['business:COUNSELINGMESSAGE:remove']"
-            @click="handleCommit(scope.row)"
-          >提交审核</el-button>
+          <el-button v-if="scope.row.status == 4" size="mini" type="text" v-hasPermi="['business:COUNSELINGMESSAGE:remove']">下架</el-button>
+          <el-button v-if="scope.row.status == 0 || scope.row.status == 2" size="mini" type="text" v-hasPermi="['business:COUNSELINGMESSAGE:remove']" @click="handleCommit(scope.row)">提交审核</el-button>
 
-          <el-button
-            v-if="scope.row.status == 0 || scope.row.status == 2 || scope.row.status == 5"
-            size="mini"
-            type="text"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:COUNSELINGMESSAGE:remove']"
-          >修改</el-button
-          >
-          <el-button
-            v-if="scope.row.status == 5 || scope.row.status == 3"
-            size="mini"
-            type="text"
-            @click="handleDownOrUp(scope.row)"
-            v-hasPermi="['business:COUNSELINGMESSAGE:remove']"
-          >发布</el-button
-          >
+          <el-button v-if="scope.row.status == 0 || scope.row.status == 2 || scope.row.status == 5" size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['business:COUNSELINGMESSAGE:remove']">修改</el-button>
+          <el-button v-if="scope.row.status == 5 || scope.row.status == 3" size="mini" type="text" @click="handleDownOrUp(scope.row)" v-hasPermi="['business:COUNSELINGMESSAGE: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"
-    />
+    <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="800px" append-to-body>
@@ -179,20 +65,15 @@
           <el-input v-model="form.title" placeholder="请输入标题"></el-input>
         </el-form-item>
         <el-form-item label="内容" prop="content">
-          <editor v-model="form.content" :min-height="192"/>
+          <editor v-model="form.content" :min-height="192" />
         </el-form-item>
         <el-form-item label="附件上传" prop="fileUrl">
-          <el-upload
-            class="upload-demo"
-            drag
-            action="#"
-            :limit="1"
-            :before-upload="beforeupload"
-            :auto-upload="true"
-            :http-request="httprequest"
-          >
+          <el-upload class="upload-demo" drag action="#" :limit="1" :before-upload="beforeupload" :auto-upload="true" :http-request="httprequest">
             <i class="el-icon-upload"></i>
-            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+            <div class="el-upload__text">
+              将文件拖到此处，或
+              <em>点击上传</em>
+            </div>
             <div class="el-upload__tip" slot="tip">只能上传不超过200MB的文件</div>
           </el-upload>
         </el-form-item>
@@ -208,20 +89,20 @@
 </template>
 
 <script>
-import { listCOUNSELINGMESSAGE, getCOUNSELINGMESSAGE, delCOUNSELINGMESSAGE, addCOUNSELINGMESSAGE, updateCOUNSELINGMESSAGE, upload, newCommit } from "@/api/portal/COUNSELINGMESSAGE/COUNSELINGMESSAGE";
+import { listCOUNSELINGMESSAGE, getCOUNSELINGMESSAGE, delCOUNSELINGMESSAGE, addCOUNSELINGMESSAGE, updateCOUNSELINGMESSAGE, upload, newCommit } from '@/api/portal/COUNSELINGMESSAGE/COUNSELINGMESSAGE';
 
 export default {
-  name: "COUNSELINGMESSAGE",
+  name: 'COUNSELINGMESSAGE',
   data() {
     return {
       statusOptionList: [
-        { label: "草稿", value: 0 },
-        { label: "审核中", value: 1 },
-        { label: "审核驳回", value: 2 },
-        { label: "已审核", value: 3 },
-        { label: "已发布", value: 4 },
-        { label: "已下架", value: 5 },
-        { label: "已置顶", value: 6 },
+        { label: '草稿', value: 0 },
+        { label: '审核中', value: 1 },
+        { label: '审核驳回', value: 2 },
+        { label: '已审核', value: 3 },
+        { label: '已发布', value: 4 },
+        { label: '已下架', value: 5 },
+        { label: '已置顶', value: 6 }
       ],
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
@@ -240,7 +121,7 @@ export default {
       // 咨询信息表格数据
       COUNSELINGMESSAGEList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -267,39 +148,17 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "主键不能为空", trigger: "blur" }
-        ],
-        delFlag: [
-          { required: true, message: "删除标志不能为空", trigger: "blur" }
-        ],
-        deptId: [
-          { required: true, message: "部门id不能为空", trigger: "blur" }
-        ],
-        title: [
-          { required: true, message: "标题不能为空", trigger: "blur" }
-        ],
-        content: [
-          { required: true, message: "内容不能为空", trigger: "blur" }
-        ],
-        fileUrl: [
-          { required: true, message: "附件不能为空", trigger: "blur" }
-        ],
-        picture: [
-          { required: true, message: "图片不能为空", trigger: "blur" }
-        ],
-        status: [
-          { required: true, message: "状态不能为空", trigger: "blur" }
-        ],
-        auditTime: [
-          { required: true, message: "审核时间不能为空", trigger: "blur" }
-        ],
-        reportDate: [
-          { required: true, message: "提交时间不能为空", trigger: "blur" }
-        ],
-        releaseDate: [
-          { required: true, message: "发布时间不能为空", trigger: "blur" }
-        ]
+        id: [{ required: true, message: '主键不能为空', trigger: 'blur' }],
+        delFlag: [{ required: true, message: '删除标志不能为空', trigger: 'blur' }],
+        deptId: [{ required: true, message: '部门id不能为空', trigger: 'blur' }],
+        title: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
+        content: [{ required: true, message: '内容不能为空', trigger: 'blur' }],
+        fileUrl: [{ required: true, message: '附件不能为空', trigger: 'blur' }],
+        picture: [{ required: true, message: '图片不能为空', trigger: 'blur' }],
+        status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
+        auditTime: [{ required: true, message: '审核时间不能为空', trigger: 'blur' }],
+        reportDate: [{ required: true, message: '提交时间不能为空', trigger: 'blur' }],
+        releaseDate: [{ required: true, message: '发布时间不能为空', trigger: 'blur' }]
       }
     };
   },
@@ -307,7 +166,6 @@ export default {
     this.getList();
   },
   methods: {
-
     /** 查询咨询信息列表 */
     getList() {
       this.loading = true;
@@ -332,30 +190,30 @@ export default {
         content: null,
         fileUrl: null,
         picture: null,
-        status: "0",
+        status: '0',
         auditTime: null,
         reportDate: null,
         releaseDate: null
       };
-      this.resetForm("form");
+      this.resetForm('form');
     },
     /** 发布 */
     handleDownOrUp(row) {
       //修改发布、下架状态
-      if (row.status == "4" || row.status == "3") {
+      if (row.status == '4' || row.status == '3') {
         //已发布 已审核
-        row.status = "5";
-        updateCOUNSELINGMESSAGE(row).then((response) => {
-          this.$modal.msgSuccess("修改成功");
+        row.status = '5';
+        updateCOUNSELINGMESSAGE(row).then(response => {
+          this.$modal.msgSuccess('修改成功');
           this.open = false;
           this.getList();
           this.reset();
         });
-      } else if (row.status == "5") {
+      } else if (row.status == '5') {
         //已下架
-        row.status = "4";
-        updateCOUNSELINGMESSAGE(row).then((response) => {
-          this.$modal.msgSuccess("下架成功");
+        row.status = '4';
+        updateCOUNSELINGMESSAGE(row).then(response => {
+          this.$modal.msgSuccess('下架成功');
           this.open = false;
           this.getList();
           this.reset();
@@ -364,9 +222,9 @@ export default {
     },
     /** 提交审核 */
     handleCommit(row) {
-      let CbNewsVo = row
-      newCommit(CbNewsVo).then((response) => {
-        this.$modal.msgSuccess("提交审核成功!");
+      let CbNewsVo = row;
+      newCommit(CbNewsVo).then(response => {
+        this.$modal.msgSuccess('提交审核成功!');
         this.getList();
       });
     },
@@ -377,55 +235,55 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm('queryForm');
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加咨询信息";
+      this.title = '添加咨询信息';
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.id || this.ids;
       getCOUNSELINGMESSAGE(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改咨询信息";
+        this.title = '修改咨询信息';
       });
     },
     httprequest() {},
     /** 上传附件 */
     beforeupload(file) {
       let formData = new FormData();
-      formData.append("file", file);
-      upload(formData).then((res) => {
+      formData.append('file', file);
+      upload(formData).then(res => {
         this.form.fileUrl = res.url;
       });
     },
     /** 暂存按钮 */
     submitzc() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
-          if(this.form.id == null){
-            this.form.status = "0";
-            addCOUNSELINGMESSAGE(this.form).then((response) => {
-              this.$modal.msgSuccess("暂存成功");
+          if (this.form.id == null) {
+            this.form.status = '0';
+            addCOUNSELINGMESSAGE(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){
-            updateCOUNSELINGMESSAGE(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
+          } else if (this.form.status == 0 || this.form.status == 2 || this.form.status == 3 || this.form.status == 5) {
+            updateCOUNSELINGMESSAGE(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功');
               this.open = false;
               this.getList();
               this.reset();
@@ -436,17 +294,17 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
             updateCOUNSELINGMESSAGE(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess('修改成功');
               this.open = false;
               this.getList();
             });
           } else {
             addCOUNSELINGMESSAGE(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.$modal.msgSuccess('新增成功');
               this.open = false;
               this.getList();
             });
@@ -457,18 +315,26 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除咨询信息编号为"' + ids + '"的数据项？').then(function() {
-        return delCOUNSELINGMESSAGE(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除咨询信息编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delCOUNSELINGMESSAGE(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess('删除成功');
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('business/COUNSELINGMESSAGE/export', {
-        ...this.queryParams
-      }, `COUNSELINGMESSAGE_${new Date().getTime()}.xlsx`)
+      this.download(
+        'business/COUNSELINGMESSAGE/export',
+        {
+          ...this.queryParams
+        },
+        `COUNSELINGMESSAGE_${new Date().getTime()}.xlsx`
+      );
     }
   }
 };

src/views/FRIENDLYLINKS/index.vue

@@ -1,174 +1,64 @@
 <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" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="链接名称" prop="linkName">
-        <el-input v-model="queryParams.linkName" placeholder="请输入链接名称" clearable @keyup.enter.native="handleQuery"/>
+        <el-input v-model="queryParams.linkName" 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-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @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:FRIENDLYLINKS:add']"
-        >新增</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['business:FRIENDLYLINKS: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:FRIENDLYLINKS:edit']"
-        >修改</el-button>
+        <el-button type="success" icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['business:FRIENDLYLINKS: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:FRIENDLYLINKS:remove']"
-        >删除</el-button>
+        <el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['business:FRIENDLYLINKS:remove']">删除</el-button>
       </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['business:FRIENDLYLINKS:export']"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="FRIENDLYLINKSList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="创建人" align="center" prop="createBy"/>
-      <el-table-column label="创建时间" align="center" prop="createTime" >
+      <el-table-column label="链接名称" align="left" prop="linkName">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <div class="omit">{{ scope.row.linkName }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="部门编码" align="center" prop="deptId" />
-      <el-table-column label="链接名称" align="center" prop="linkName" />
-      <el-table-column label="链接" align="center" prop="linkUrl" />
-      <el-table-column label="更新人" align="center" prop="updateBy" />
-      <el-table-column label="更新时间" align="center" prop="updateTime" >
+      <el-table-column label="链接" align="left" prop="linkUrl">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+          <div class="omit">{{ scope.row.linkUrl }}</div>
         </template>
       </el-table-column>
-      <!--      <el-table-column label="id主键" align="center" prop="id">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.id"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="创建时间" align="center" prop="createTime">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.createTime"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="创建人" align="center" prop="createBy">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.createBy"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="修改时间" align="center" prop="updateTime">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.updateTime"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="修改人" align="center" prop="updateBy">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.updateBy"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="删除标记" align="center" prop="delFlag">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.delFlag"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="部门id" align="center" prop="deptId">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.deptId"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="友情链接名称" align="center" prop="linkName">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.linkName"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="友情链接url" align="center" prop="linkUrl">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.linkUrl"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column label="创建人" align="center" prop="createBy" width="100" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
       <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:FRIENDLYLINKS:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['business:FRIENDLYLINKS:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:FRIENDLYLINKS:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['business:FRIENDLYLINKS: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"
-    />
+    <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="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="部门编码" prop="deptId">
-              <el-input v-model="form.deptId" placeholder="请输入部门编码" type="number" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="链接名称" prop="linkName">
-              <el-input v-model="form.linkName" placeholder="请输入链接名称" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="链接" prop="linkUrl">
-              <el-input v-model="form.linkUrl" placeholder="请输入链接"  @blur="validateUrl(form.linkUrl)" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+    <el-dialog :title="title" :visible.sync="open" width="750px" :close-on-click-modal="false" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="部门编码" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入部门编码" type="number" />
+        </el-form-item>
+        <el-form-item label="链接名称" prop="linkName">
+          <el-input v-model="form.linkName" placeholder="请输入链接名称" />
+        </el-form-item>
+        <el-form-item label="链接" prop="linkUrl">
+          <el-input v-model="form.linkUrl" placeholder="请输入链接" @blur="validateUrl(form.linkUrl)" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -179,10 +69,10 @@
 </template>
 
 <script>
-import { listFRIENDLYLINKS, getFRIENDLYLINKS, delFRIENDLYLINKS, addFRIENDLYLINKS, updateFRIENDLYLINKS } from "@/api/portal/FRIENDLYLINKS/FRIENDLYLINKS";
+import { listFRIENDLYLINKS, getFRIENDLYLINKS, delFRIENDLYLINKS, addFRIENDLYLINKS, updateFRIENDLYLINKS } from '@/api/portal/FRIENDLYLINKS/FRIENDLYLINKS';
 
 export default {
-  name: "FRIENDLYLINKS",
+  name: 'FRIENDLYLINKS',
   data() {
     return {
       // 根路径
@@ -202,7 +92,7 @@ export default {
       // 友情链接表格数据
       FRIENDLYLINKSList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -223,21 +113,11 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "id主键不能为空", trigger: "blur" }
-        ],
-        delFlag: [
-          { required: true, message: "删除标记不能为空", trigger: "blur" }
-        ],
-        deptId: [
-          { required: true, message: "部门id不能为空", trigger: "blur" }
-        ],
-        linkName: [
-          { required: true, message: "友情链接名称不能为空", trigger: "blur" }
-        ],
-        linkUrl: [
-          { required: true, message: "友情链接url不能为空", trigger: "blur" }
-        ]
+        id: [{ required: true, message: 'id主键不能为空', trigger: 'blur' }],
+        delFlag: [{ required: true, message: '删除标记不能为空', trigger: 'blur' }],
+        deptId: [{ required: true, message: '部门id不能为空', trigger: 'blur' }],
+        linkName: [{ required: true, message: '友情链接名称不能为空', trigger: 'blur' }],
+        linkUrl: [{ required: true, message: '友情链接url不能为空', trigger: 'blur' }]
       }
     };
   },
@@ -268,7 +148,7 @@ export default {
         linkName: null,
         linkUrl: null
       };
-      this.resetForm("form");
+      this.resetForm('form');
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -277,29 +157,29 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm('queryForm');
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加友情链接";
+      this.title = '添加友情链接';
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.id || this.ids;
       getFRIENDLYLINKS(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改友情链接";
+        this.title = '修改友情链接';
       });
     },
     /** 检验url的正确性 */
@@ -312,21 +192,21 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
-          if(this.validateUrl(this.form.linkUrl)){
-          if (this.form.id != null) {
-            updateFRIENDLYLINKS(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addFRIENDLYLINKS(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+          if (this.validateUrl(this.form.linkUrl)) {
+            if (this.form.id != null) {
+              updateFRIENDLYLINKS(this.form).then(response => {
+                this.$modal.msgSuccess('修改成功');
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addFRIENDLYLINKS(this.form).then(response => {
+                this.$modal.msgSuccess('新增成功');
+                this.open = false;
+                this.getList();
+              });
             }
           }
         }
@@ -335,18 +215,26 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除友情链接编号为"' + ids + '"的数据项？').then(function() {
-        return delFRIENDLYLINKS(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除友情链接编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delFRIENDLYLINKS(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess('删除成功');
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('business/FRIENDLYLINKS/export', {
-        ...this.queryParams
-      }, `FRIENDLYLINKS_${new Date().getTime()}.xlsx`)
+      this.download(
+        'business/FRIENDLYLINKS/export',
+        {
+          ...this.queryParams
+        },
+        `FRIENDLYLINKS_${new Date().getTime()}.xlsx`
+      );
     }
   }
 };

src/views/LEAVEMESSAGE/index.vue

@@ -1,183 +1,74 @@
 <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" :inline="true" v-show="showSearch">
       <el-form-item label="留言标题" prop="question">
-        <el-input v-model="queryParams.question" placeholder="请输入留言标题" clearable @keyup.enter.native="handleQuery"/>
+        <el-input v-model="queryParams.question" placeholder="请输入留言标题" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="留言人姓名" prop="ansName">
+        <el-input v-model="queryParams.ansName" 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-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @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:LEAVEMESSAGE:add']"-->
-<!--        >新增</el-button>-->
-<!--      </el-col>-->
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['business:LEAVEMESSAGE:edit']"
-        >回复</el-button>
+        <el-button type="primary" icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['business:LEAVEMESSAGE:edit']">回复</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['business:LEAVEMESSAGE:remove']"
-        >删除</el-button>
+        <el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['business:LEAVEMESSAGE:remove']">删除</el-button>
       </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['business:LEAVEMESSAGE:export']"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="LEAVEMESSAGEList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="创建人" align="center" prop="createBy"/>
+      <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="留言人姓名" align="center" prop="ansName" />
       <el-table-column label="留言标题" align="center" prop="question" :show-overflow-tooltip="true" />
       <el-table-column label="留言详情" align="center" prop="questionDetail" :show-overflow-tooltip="true" />
-      <el-table-column label="状态" align="center" prop="type" >
+      <el-table-column label="状态" align="center" prop="type">
         <template slot-scope="scope">
           <span v-if="scope.row.type == 1"><el-tag type="danger">未回复</el-tag></span>
           <span v-if="scope.row.type == 0"><el-tag>已回复</el-tag></span>
         </template>
       </el-table-column>
-      <el-table-column label="留言时间" align="center" prop="questionTime" >
+      <el-table-column label="留言时间" align="center" prop="questionTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.questionTime, '{y}-{m}-{d}-{h}:{i}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updateTime" >
+      <el-table-column label="更新时间" align="center" prop="updateTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}-{h}:{i}') }}</span>
         </template>
       </el-table-column>
-      <!--      <el-table-column label="主键id" align="center" prop="id">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.id"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="用户id" align="center" prop="userId">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.userId"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="创建时间" align="center" prop="createTime">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.createTime"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="创建人" align="center" prop="createBy">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.createBy"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="修改时间" align="center" prop="updateTime">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.updateTime"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="修改人" align="center" prop="updateBy">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.updateBy"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="删除标记" align="center" prop="delFlag">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.delFlag"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="部门id" align="center" prop="deptId">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.deptId"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="留言标题" align="center" prop="question">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.question"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="留言详情" align="center" prop="questionDetail">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.questionDetail"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="留言时间" align="center" prop="questionTime">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.questionTime"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="留言人姓名" align="center" prop="ansName">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.ansName"/>-->
-<!--        </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:LEAVEMESSAGE:edit']"
-          >回复</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['business:LEAVEMESSAGE:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:LEAVEMESSAGE:edit']">回复</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['business:LEAVEMESSAGE: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"
-    />
+    <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="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="750px" :close-on-click-modal="false" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="24">
             <el-form-item label="留言标题" prop="questionDetail">
-              <el-input v-model="form.questionDetail" placeholder="请输入链接" type="textarea" :disabled="true" autosize/>
+              <el-input v-model="form.questionDetail" placeholder="请输入链接" type="textarea" :disabled="true" autosize />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="留言详情" prop="questionDetail">
-              <el-input v-model="form.questionDetail" placeholder="请输入链接" type="textarea" :disabled="true" autosize/>
+              <el-input v-model="form.questionDetail" placeholder="请输入链接" type="textarea" :disabled="true" autosize />
             </el-form-item>
           </el-col>
         </el-row>
@@ -185,8 +76,8 @@
           <el-col :span="24">
             <el-form-item label="回复内容" prop="replyContent">
               <template slot-scope="scope">
-                <el-input v-if="form.type == 1" v-model="form.replyContent" type="textarea" autosize placeholder="请输入内容" />
-                <el-input v-else-if="form.type == 0" disabled v-model="form.replyContent" type="textarea" autosize />
+                <el-input v-if="form.type == 1" v-model="form.replyContent" type="textarea" rows="5" placeholder="请输入内容" />
+                <el-input v-else-if="form.type == 0" disabled v-model="form.replyContent" rows="5" type="textarea" />
               </template>
             </el-form-item>
           </el-col>
@@ -201,10 +92,10 @@
 </template>
 
 <script>
-import { listLEAVEMESSAGE, getLEAVEMESSAGE, delLEAVEMESSAGE, addLEAVEMESSAGE, updateLEAVEMESSAGE } from "@/api/portal/LEAVEMESSAGE/LEAVEMESSAGE";
+import { listLEAVEMESSAGE, getLEAVEMESSAGE, delLEAVEMESSAGE, addLEAVEMESSAGE, updateLEAVEMESSAGE } from '@/api/portal/LEAVEMESSAGE/LEAVEMESSAGE';
 
 export default {
-  name: "LEAVEMESSAGE",
+  name: 'LEAVEMESSAGE',
   data() {
     return {
       // 根路径
@@ -224,7 +115,7 @@ export default {
       // 留言反馈表格数据
       LEAVEMESSAGEList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -240,6 +131,7 @@ export default {
         delFlag: null,
         deptId: null,
         question: null,
+        ansName: null,
         questionDetail: null,
         questionTime: null,
         ansName: null
@@ -250,21 +142,11 @@ export default {
       },
       // 表单校验
       rules: {
-        question: [
-          { required: true, message: "留言标题不能为空", trigger: "blur" }
-        ],
-        questionDetail: [
-          { required: true, message: "留言详情不能为空", trigger: "blur" }
-        ],
-        questionTime: [
-          { required: true, message: "留言时间不能为空", trigger: "blur" }
-        ],
-        ansName: [
-          { required: true, message: "留言人姓名不能为空", trigger: "blur" }
-        ],
-        replyContent:[
-          { required: true, message: "回复内容不能为空", trigger: "blur" }
-        ]
+        question: [{ required: true, message: '留言标题不能为空', trigger: 'blur' }],
+        questionDetail: [{ required: true, message: '留言详情不能为空', trigger: 'blur' }],
+        questionTime: [{ required: true, message: '留言时间不能为空', trigger: 'blur' }],
+        ansName: [{ required: true, message: '留言人姓名不能为空', trigger: 'blur' }],
+        replyContent: [{ required: true, message: '回复内容不能为空', trigger: 'blur' }]
       }
     };
   },
@@ -299,7 +181,7 @@ export default {
         ansName: null,
         replyContent: null
       };
-      this.resetForm("form");
+      this.resetForm('form');
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -308,45 +190,45 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm('queryForm');
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加留言反馈";
+      this.title = '添加留言反馈';
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.id || this.ids;
       getLEAVEMESSAGE(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改留言反馈";
+        this.title = '修改留言反馈';
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
             this.form.type = 0;
             updateLEAVEMESSAGE(this.form).then(response => {
-              this.$modal.msgSuccess("回复成功");
+              this.$modal.msgSuccess('回复成功');
               this.open = false;
               this.getList();
             });
           } else {
             addLEAVEMESSAGE(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.$modal.msgSuccess('新增成功');
               this.open = false;
               this.getList();
             });
@@ -357,18 +239,26 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除留言反馈编号为"' + ids + '"的数据项？').then(function() {
-        return delLEAVEMESSAGE(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除留言反馈编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delLEAVEMESSAGE(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess('删除成功');
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('business/LEAVEMESSAGE/export', {
-        ...this.queryParams
-      }, `LEAVEMESSAGE_${new Date().getTime()}.xlsx`)
+      this.download(
+        'business/LEAVEMESSAGE/export',
+        {
+          ...this.queryParams
+        },
+        `LEAVEMESSAGE_${new Date().getTime()}.xlsx`
+      );
     }
   }
 };

src/views/MARK/index.vue

@@ -1,80 +1,29 @@
 <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" :inline="true" v-show="showSearch">
       <el-form-item label="标签名称" prop="mark">
-        <el-input
-          v-model="queryParams.mark"
-          placeholder="请输入标签名称"
-        ></el-input>
+        <el-input v-model="queryParams.mark" placeholder="请输入标签名称"></el-input>
       </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-button type="primary" icon="el-icon-search" @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:MARK:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['business:MARK: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:MARK:edit']"
-          >修改</el-button
-        >
+        <el-button type="success" icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['business:MARK: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:MARK:remove']"
-          >删除</el-button
-        >
+        <el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['business:MARK:remove']">删除</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="MARKList"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="MARKList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 
       <el-table-column label="标签名称" align="center" prop="mark">
@@ -102,42 +51,18 @@
           {{ scope.row.updateBy }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <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:MARK:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['business:MARK:remove']"
-            >删除</el-button
-          >
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:MARK:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['business:MARK: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"
-    />
+    <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-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="标签名称" prop="mark">
           <el-input v-model="form.mark" placeholder="请输入标签名称"></el-input>
@@ -152,16 +77,10 @@
 </template>
 
 <script>
-import {
-  listMARK,
-  getMARK,
-  delMARK,
-  addMARK,
-  updateMARK,
-} from "@/api/portal/MARK/MARK.js";
+import { listMARK, getMARK, delMARK, addMARK, updateMARK } from '@/api/portal/MARK/MARK.js';
 
 export default {
-  name: "MARK",
+  name: 'MARK',
   data() {
     return {
       // 根路径
@@ -181,7 +100,7 @@ export default {
       // 咨询标签表格数据
       MARKList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -195,23 +114,17 @@ export default {
         updateBy: null,
         delFlag: null,
         deptId: null,
-        mark: null,
+        mark: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        id: [{ required: true, message: "$comment不能为空", trigger: "blur" }],
-        delFlag: [
-          { required: true, message: "删除标识不能为空", trigger: "blur" },
-        ],
-        deptId: [
-          { required: true, message: "部门id不能为空", trigger: "blur" },
-        ],
-        mark: [
-          { required: true, message: "标签名称不能为空", trigger: "blur" },
-        ],
-      },
+        id: [{ required: true, message: '$comment不能为空', trigger: 'blur' }],
+        delFlag: [{ required: true, message: '删除标识不能为空', trigger: 'blur' }],
+        deptId: [{ required: true, message: '部门id不能为空', trigger: 'blur' }],
+        mark: [{ required: true, message: '标签名称不能为空', trigger: 'blur' }]
+      }
     };
   },
   created() {
@@ -221,7 +134,7 @@ export default {
     /** 查询咨询标签列表 */
     getList() {
       this.loading = true;
-      listMARK(this.queryParams).then((response) => {
+      listMARK(this.queryParams).then(response => {
         this.MARKList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -238,9 +151,9 @@ export default {
         id: null,
         delFlag: null,
         deptId: null,
-        mark: null,
+        mark: null
       };
-      this.resetForm("form");
+      this.resetForm('form');
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -249,12 +162,12 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm('queryForm');
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -262,31 +175,31 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加咨询标签";
+      this.title = '添加咨询标签';
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getMARK(id).then((response) => {
+      getMARK(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改咨询标签";
+        this.title = '修改咨询标签';
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateMARK(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
+            updateMARK(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功');
               this.open = false;
               this.getList();
             });
           } else {
-            addMARK(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
+            addMARK(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功');
               this.open = false;
               this.getList();
             });
@@ -304,20 +217,20 @@ export default {
         })
         .then(() => {
           this.getList();
-          this.$modal.msgSuccess("删除成功");
+          this.$modal.msgSuccess('删除成功');
         })
         .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        "business/MARK/export",
+        'business/MARK/export',
         {
-          ...this.queryParams,
+          ...this.queryParams
         },
         `MARK_${new Date().getTime()}.xlsx`
       );
-    },
-  },
+    }
+  }
 };
 </script>

src/views/ONLINE/index.vue

@@ -1,147 +1,118 @@
 <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" :inline="true" v-show="showSearch">
       <el-form-item label="单位名称" prop="depName">
-        <el-input v-model="queryParams.depName" placeholder="请输入单位名称" clearable @keyup.enter.native="handleQuery"/>
+        <el-input v-model="queryParams.depName" 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-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @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:ONLINE:add']"
-        >新增</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['business:ONLINE: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:ONLINE:edit']"
-        >修改</el-button>
+        <el-button type="success" icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['business:ONLINE: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:ONLINE:remove']"
-        >删除</el-button>
+        <el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['business:ONLINE:remove']">删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="ONLINEList" @selection-change="handleSelectionChange" height="calc(100vh - 300px)">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="单位编码" align="center" prop="deptId"/>
+      <el-table-column label="单位编码" align="center" prop="deptId" />
       <el-table-column label="单位名称" align="center" prop="depName" />
       <el-table-column label="位置" align="center" prop="location" />
       <el-table-column label="电话" align="center" prop="telphone" />
       <el-table-column label="邮箱" align="center" prop="email" />
       <!--      <el-table-column label="主键" align="center" prop="id">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.id"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="创建时间" align="center" prop="createTime">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.createTime"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="创建人" align="center" prop="createBy">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.createBy"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="修改时间" align="center" prop="updateTime">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.updateTime"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="修改人" align="center" prop="updateBy">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.updateBy"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="删除标志(0.正常，1.删除)" align="center" prop="delFlag">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.delFlag"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="部门id" align="center" prop="deptId">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.deptId"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="单位名称" align="center" prop="depName">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.depName"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="单位电话" align="center" prop="telphone">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.telphone"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="单位地址" align="center" prop="location">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.location"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="单位邮箱" align="center" prop="email">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.email"/>-->
-<!--        </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:ONLINE:edit']"-->
-<!--          >修改</el-button>-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['business:ONLINE:remove']"-->
-<!--          >删除</el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.id"/>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <!--      <el-table-column label="创建时间" align="center" prop="createTime">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.createTime"/>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <!--      <el-table-column label="创建人" align="center" prop="createBy">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.createBy"/>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <!--      <el-table-column label="修改时间" align="center" prop="updateTime">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.updateTime"/>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <!--      <el-table-column label="修改人" align="center" prop="updateBy">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.updateBy"/>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <!--      <el-table-column label="删除标志(0.正常，1.删除)" align="center" prop="delFlag">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.delFlag"/>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <!--      <el-table-column label="部门id" align="center" prop="deptId">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.deptId"/>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <!--      <el-table-column label="单位名称" align="center" prop="depName">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.depName"/>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <!--      <el-table-column label="单位电话" align="center" prop="telphone">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.telphone"/>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <!--      <el-table-column label="单位地址" align="center" prop="location">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.location"/>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <!--      <el-table-column label="单位邮箱" align="center" prop="email">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.email"/>-->
+      <!--        </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:ONLINE:edit']"-->
+      <!--          >修改</el-button>-->
+      <!--          <el-button-->
+      <!--            size="mini"-->
+      <!--            type="text"-->
+      <!--            icon="el-icon-delete"-->
+      <!--            @click="handleDelete(scope.row)"-->
+      <!--            v-hasPermi="['business:ONLINE: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"
-    />
+    <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="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
-              <el-form-item label="单位编码" prop="deptId"><el-input v-model="form.deptId" placeholder="请输入单位编码" /></el-form-item>
+            <el-form-item label="单位编码" prop="deptId"><el-input v-model="form.deptId" placeholder="请输入单位编码" /></el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="单位名称" prop="depName"><el-input v-model="form.depName" placeholder="请输入单位名称" /></el-form-item>
@@ -170,10 +141,10 @@
 </template>
 
 <script>
-import { listONLINE, getONLINE, delONLINE, addONLINE, updateONLINE } from "@/api/portal/ONLINE/ONLINE";
+import { listONLINE, getONLINE, delONLINE, addONLINE, updateONLINE } from '@/api/portal/ONLINE/ONLINE';
 
 export default {
-  name: "ONLINE",
+  name: 'ONLINE',
   data() {
     return {
       // 根路径
@@ -193,7 +164,7 @@ export default {
       // 网上办事表格数据
       ONLINEList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -216,27 +187,13 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "主键不能为空", trigger: "blur" }
-        ],
-        delFlag: [
-          { required: true, message: "删除标志(0.正常，1.删除)不能为空", trigger: "blur" }
-        ],
-        deptId: [
-          { required: true, message: "部门id不能为空", trigger: "blur" }
-        ],
-        depName: [
-          { required: true, message: "单位名称不能为空", trigger: "blur" }
-        ],
-        telphone: [
-          { required: true, message: "单位电话不能为空", trigger: "blur" }
-        ],
-        location: [
-          { required: true, message: "单位地址不能为空", trigger: "blur" }
-        ],
-        email: [
-          { required: true, message: "单位邮箱不能为空", trigger: "blur" }
-        ]
+        id: [{ required: true, message: '主键不能为空', trigger: 'blur' }],
+        delFlag: [{ required: true, message: '删除标志(0.正常，1.删除)不能为空', trigger: 'blur' }],
+        deptId: [{ required: true, message: '部门id不能为空', trigger: 'blur' }],
+        depName: [{ required: true, message: '单位名称不能为空', trigger: 'blur' }],
+        telphone: [{ required: true, message: '单位电话不能为空', trigger: 'blur' }],
+        location: [{ required: true, message: '单位地址不能为空', trigger: 'blur' }],
+        email: [{ required: true, message: '单位邮箱不能为空', trigger: 'blur' }]
       }
     };
   },
@@ -269,7 +226,7 @@ export default {
         location: null,
         email: null
       };
-      this.resetForm("form");
+      this.resetForm('form');
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -278,44 +235,44 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm('queryForm');
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加网上办事";
+      this.title = '添加网上办事';
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.id || this.ids;
       getONLINE(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改网上办事";
+        this.title = '修改网上办事';
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
             updateONLINE(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess('修改成功');
               this.open = false;
               this.getList();
             });
           } else {
             addONLINE(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.$modal.msgSuccess('新增成功');
               this.open = false;
               this.getList();
             });
@@ -326,18 +283,26 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除网上办事编号为"' + ids + '"的数据项？').then(function() {
-        return delONLINE(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除网上办事编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delONLINE(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess('删除成功');
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('business/ONLINE/export', {
-        ...this.queryParams
-      }, `ONLINE_${new Date().getTime()}.xlsx`)
+      this.download(
+        'business/ONLINE/export',
+        {
+          ...this.queryParams
+        },
+        `ONLINE_${new Date().getTime()}.xlsx`
+      );
     }
   }
 };

src/views/OPSERVICE/index.vue

@@ -1,96 +1,37 @@
 <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" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="文件名称" prop="serviceName">
         <el-input v-model="queryParams.serviceName"></el-input>
       </el-form-item>
       <el-form-item label="服务类型" prop="serviceType">
-        <el-select
-          v-model="queryParams.serviceType"
-          placeholder="请选择服务类型"
-          clearable
-          filterable
-        >
-          <el-option
-            v-for="dict in optionList"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <el-select v-model="queryParams.serviceType" placeholder="请选择服务类型" clearable filterable>
+          <el-option v-for="dict in optionList" :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
-        >
+        <el-button type="primary" icon="el-icon-search" @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:OPSERVICE:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['business:OPSERVICE: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:OPSERVICE:edit']"
-          >修改</el-button
-        >
+        <el-button type="success" icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['business:OPSERVICE: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:OPSERVICE:remove']"
-          >删除</el-button
-        >
+        <el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['business:OPSERVICE:remove']">删除</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="OPSERVICEList"
-      @selection-change="handleSelectionChange"
-    >
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="文件名称" align="center" prop="serviceName">
+    <el-table v-loading="loading" :data="OPSERVICEList" @selection-change="handleSelectionChange">
+      <el-table-column label="文件名称" align="left" prop="serviceName">
         <template slot-scope="scope">
-          {{ scope.row.serviceName }}
+          <div class="omit">{{ scope.row.serviceName }}</div>
         </template>
       </el-table-column>
       <el-table-column label="服务类型" align="center" prop="serviceType">
@@ -108,86 +49,34 @@
           {{ scope.row.createBy }}
         </template>
       </el-table-column>
-
-      <!-- <el-table-column label="文件附件" align="center" prop="linkUrl">
-        <template slot-scope="scope">
-          {{ scope.row.linkUrl }}
-        </template>
-      </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>
 
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:OPSERVICE:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['business:OPSERVICE:remove']"
-            >删除</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleDownload(scope.row)"
-            v-hasPermi="['business:OPSERVICE:remove']"
-            >下载</el-button
-          >
+          <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['business:OPSERVICE:edit']">修改</el-button>
+          <el-button size="mini" type="text" @click="handleDelete(scope.row)" v-hasPermi="['business:OPSERVICE:remove']">删除</el-button>
+          <el-button size="mini" type="text" @click="handleDownload(scope.row)" v-hasPermi="['business:OPSERVICE: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"
-    />
+    <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="70%" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="文件" prop="linkUrl">
-          <el-upload
-            :http-request="httprequest"
-            :before-upload="uploadFile"
-            :limit="1"
-            class="upload-demo"
-            action="#"
-            :auto-upload="true"
-            :on-change="handleChange"
-            :file-list="fileList"
-          >
+          <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-item label="服务类型" prop="serviceType">
-          <el-select
-            v-model="form.serviceType"
-            placeholder="请选择服务类型"
-            filterable
-          >
-            <el-option
-              v-for="dict in optionList"
-              :key="dict.value + 'serviceType'"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+          <el-select v-model="form.serviceType" placeholder="请选择服务类型" filterable>
+            <el-option v-for="dict in optionList" :key="dict.value + 'serviceType'" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
 
@@ -204,26 +93,18 @@
 </template>
 
 <script>
-import {
-  listOPSERVICE,
-  getOPSERVICE,
-  delOPSERVICE,
-  addOPSERVICE,
-  updateOPSERVICE,
-  upload,
-  download,
-} from "@/api/portal/OPSERVICE/OPSERVICE.js";
+import { listOPSERVICE, getOPSERVICE, delOPSERVICE, addOPSERVICE, updateOPSERVICE, upload, download } from '@/api/portal/OPSERVICE/OPSERVICE.js';
 
-import { saveAs } from "file-saver";
+import { saveAs } from 'file-saver';
 export default {
-  name: "OPSERVICE",
+  name: 'OPSERVICE',
   data() {
     return {
       fileList: [],
       //1=招商服务2培训服务
       optionList: [
-        { label: "招商服务", value: "1" },
-        { label: "培训服务", value: "2" },
+        { label: '招商服务', value: '1' },
+        { label: '培训服务', value: '2' }
       ],
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
@@ -242,7 +123,7 @@ export default {
       // 运营服务表格数据
       OPSERVICEList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -259,34 +140,22 @@ export default {
         serviceName: null,
         linkUrl: null,
         download: null,
-        serviceType: null,
+        serviceType: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        id: [{ required: true, message: "主键id不能为空", trigger: "blur" }],
-        delFlag: [
-          { required: true, message: "删除状态不能为空", trigger: "blur" },
-        ],
-        deptId: [
-          { required: true, message: "部门id不能为空", trigger: "blur" },
-        ],
-        serviceName: [
-          { required: true, message: "文件名称不能为空", trigger: "blur" },
-        ],
-        linkUrl: [
-          { required: true, message: "文件附件不能为空", trigger: "blur" },
-        ],
-        download: [
-          { required: true, message: "下载次数不能为空", trigger: "blur" },
-        ],
-        serviceType: [
-          { required: true, message: "服务类型不能为空", trigger: "change" },
-        ],
+        id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }],
+        delFlag: [{ required: true, message: '删除状态不能为空', trigger: 'blur' }],
+        deptId: [{ required: true, message: '部门id不能为空', trigger: 'blur' }],
+        serviceName: [{ required: true, message: '文件名称不能为空', trigger: 'blur' }],
+        linkUrl: [{ required: true, message: '文件附件不能为空', trigger: 'blur' }],
+        download: [{ required: true, message: '下载次数不能为空', trigger: 'blur' }],
+        serviceType: [{ required: true, message: '服务类型不能为空', trigger: 'change' }]
       },
-      setFileName: "", //保存文件名，点击下载时使用这个名字
-      downloadLoadingInstance:'',
+      setFileName: '', //保存文件名，点击下载时使用这个名字
+      downloadLoadingInstance: ''
     };
   },
   created() {
@@ -296,7 +165,7 @@ export default {
     /** 查询运营服务列表 */
     getList() {
       this.loading = true;
-      listOPSERVICE(this.queryParams).then((response) => {
+      listOPSERVICE(this.queryParams).then(response => {
         this.OPSERVICEList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -304,7 +173,7 @@ export default {
     },
     handleDownload(row) {
       this.setFileName = row.serviceName;
-      download(row.linkUrl,row.id).then((res) => {
+      download(row.linkUrl, row.id).then(res => {
         const blob = new Blob([res]);
         saveAs(blob, this.setFileName);
         this.getList();
@@ -313,21 +182,21 @@ export default {
     httprequest() {},
     uploadFile(file) {
       let formData = new FormData();
-      formData.append("file", file);
-      upload(formData).then((res) => {
+      formData.append('file', file);
+      upload(formData).then(res => {
         this.form.linkUrl = res.fileName;
-        this.$set(this.form, "serviceName", res.originalFilename);
+        this.$set(this.form, 'serviceName', res.originalFilename);
       });
     },
     handleChange(file, fileList) {
       this.fileList = fileList.slice(-3);
     },
     searchType(type) {
-      let fined = this.optionList.find((item) => item.value == type);
+      let fined = this.optionList.find(item => item.value == type);
       if (fined.label != undefined) {
         return fined.label;
       } else {
-        return "未选择类型！";
+        return '未选择类型！';
       }
     },
     // 取消按钮
@@ -344,9 +213,9 @@ export default {
         serviceName: null,
         linkUrl: null,
         download: null,
-        serviceType: null,
+        serviceType: null
       };
-      this.resetForm("form");
+      this.resetForm('form');
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -355,12 +224,12 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm('queryForm');
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -368,31 +237,31 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加运营服务";
+      this.title = '添加运营服务';
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getOPSERVICE(id).then((response) => {
+      getOPSERVICE(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改运营服务";
+        this.title = '修改运营服务';
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateOPSERVICE(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
+            updateOPSERVICE(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功');
               this.open = false;
               this.getList();
             });
           } else {
-            addOPSERVICE(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
+            addOPSERVICE(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功');
               this.open = false;
               this.getList();
             });
@@ -404,26 +273,26 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm("确定删除吗？")
+        .confirm('确定删除吗？')
         .then(function () {
           return delOPSERVICE(ids);
         })
         .then(() => {
           this.getList();
-          this.$modal.msgSuccess("删除成功");
+          this.$modal.msgSuccess('删除成功');
         })
         .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        "business/OPSERVICE/export",
+        'business/OPSERVICE/export',
         {
-          ...this.queryParams,
+          ...this.queryParams
         },
         `OPSERVICE_${new Date().getTime()}.xlsx`
       );
-    },
-  },
+    }
+  }
 };
 </script>

src/views/SENSITIVE/index.vue

@@ -1,95 +1,34 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="100px"
-    >
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
       <el-form-item label="敏感词" prop="sensitive">
-        <el-input
-          v-model="queryParams.sensitive"
-          placeholder="请输入敏感词"
-        ></el-input>
+        <el-input v-model="queryParams.sensitive" placeholder="请输入敏感词"></el-input>
       </el-form-item>
       <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"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <el-select v-model="queryParams.type" placeholder="请选择敏感词状态" clearable filterable>
+          <el-option v-for="dict in typeList" :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
-        >
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @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:SENSITIVE:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['business:SENSITIVE: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:SENSITIVE:edit']"
-          >修改</el-button
-        >
+        <el-button type="success" icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['business:SENSITIVE: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:SENSITIVE:remove']"
-          >删除</el-button
-        >
+        <el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['business:SENSITIVE:remove']">删除</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="SENSITIVEList"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="SENSITIVEList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 
       <el-table-column label="敏感词" align="center" prop="sensitive">
@@ -119,75 +58,31 @@
       </el-table-column>
       <el-table-column label="敏感词状态" align="center" prop="type">
         <template slot-scope="scope">
-          <el-switch
-            @change="typeChange(scope.row)"
-            v-model="scope.row.type"
-            active-color="#13ce66"
-            inactive-color="#ff4949"
-            active-value="1"
-            inactive-value="0"
-          >
-          </el-switch>
+          <el-switch @change="typeChange(scope.row)" v-model="scope.row.type" active-color="#13ce66" inactive-color="#ff4949" active-value="1" inactive-value="0"></el-switch>
           <!-- <span v-if="scope.row.type == 0">未启用</span>
           <span v-else-if="scope.row.type == 1">启用</span> -->
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <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:SENSITIVE:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['business:SENSITIVE:remove']"
-            >删除</el-button
-          >
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:SENSITIVE:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['business:SENSITIVE: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"
-    />
+    <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-dialog :title="title" :visible.sync="open" width="550px" :close-on-click-modal="false" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="敏感词状态" prop="type">
-          <el-select
-            v-model="form.type"
-            placeholder="请选择敏感词状态"
-            filterable
-          >
-            <el-option
-              v-for="dict in typeList"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+          <el-select v-model="form.type" placeholder="请选择敏感词状态" filterable style="width: 100%">
+            <el-option v-for="dict in typeList" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="敏感词" prop="sensitive">
-          <el-input
-            v-model="form.sensitive"
-            placeholder="请输入敏感词"
-          ></el-input>
+          <el-input v-model="form.sensitive" placeholder="请输入敏感词" rows="5" type="textarea"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -199,21 +94,15 @@
 </template>
 
 <script>
-import {
-  listSENSITIVE,
-  getSENSITIVE,
-  delSENSITIVE,
-  addSENSITIVE,
-  updateSENSITIVE,
-} from "@/api/portal/SENSITIVE/SENSITIVE.js";
+import { listSENSITIVE, getSENSITIVE, delSENSITIVE, addSENSITIVE, updateSENSITIVE } from '@/api/portal/SENSITIVE/SENSITIVE.js';
 
 export default {
-  name: "SENSITIVE",
+  name: 'SENSITIVE',
   data() {
     return {
       typeList: [
-        { label: "未启用", value: "0" },
-        { label: "启用", value: "1" },
+        { label: '未启用', value: '0' },
+        { label: '启用', value: '1' }
       ],
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
@@ -232,7 +121,7 @@ export default {
       // 敏感词管理表格数据
       SENSITIVEList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -247,26 +136,18 @@ export default {
         updateBy: null,
         deptId: null,
         delFlag: null,
-        type: null,
+        type: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        id: [{ required: true, message: "主键id不能为空", trigger: "blur" }],
-        sensitive: [
-          { required: true, message: "敏感词不能为空", trigger: "blur" },
-        ],
-        deptId: [
-          { required: true, message: "部门id不能为空", trigger: "blur" },
-        ],
-        delFlag: [
-          { required: true, message: "删除标志不能为空", trigger: "blur" },
-        ],
-        type: [
-          { required: true, message: "敏感词状态不能为空", trigger: "change" },
-        ],
-      },
+        id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }],
+        sensitive: [{ required: true, message: '敏感词不能为空', trigger: 'blur' }],
+        deptId: [{ required: true, message: '部门id不能为空', trigger: 'blur' }],
+        delFlag: [{ required: true, message: '删除标志不能为空', trigger: 'blur' }],
+        type: [{ required: true, message: '敏感词状态不能为空', trigger: 'change' }]
+      }
     };
   },
   created() {
@@ -276,15 +157,15 @@ export default {
     /** 查询敏感词管理列表 */
     getList() {
       this.loading = true;
-      listSENSITIVE(this.queryParams).then((response) => {
+      listSENSITIVE(this.queryParams).then(response => {
         this.SENSITIVEList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
     typeChange(row) {
-      updateSENSITIVE(row).then((response) => {
-        this.$modal.msgSuccess("修改成功");
+      updateSENSITIVE(row).then(response => {
+        this.$modal.msgSuccess('修改成功');
         this.open = false;
         this.getList();
       });
@@ -301,9 +182,9 @@ export default {
         sensitive: null,
         deptId: null,
         delFlag: null,
-        type: null,
+        type: null
       };
-      this.resetForm("form");
+      this.resetForm('form');
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -312,12 +193,12 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm('queryForm');
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -325,31 +206,31 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加敏感词管理";
+      this.title = '添加敏感词管理';
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getSENSITIVE(id).then((response) => {
+      getSENSITIVE(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改敏感词管理";
+        this.title = '修改敏感词管理';
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateSENSITIVE(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
+            updateSENSITIVE(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功');
               this.open = false;
               this.getList();
             });
           } else {
-            addSENSITIVE(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
+            addSENSITIVE(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功');
               this.open = false;
               this.getList();
             });
@@ -367,20 +248,20 @@ export default {
         })
         .then(() => {
           this.getList();
-          this.$modal.msgSuccess("删除成功");
+          this.$modal.msgSuccess('删除成功');
         })
         .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        "business/SENSITIVE/export",
+        'business/SENSITIVE/export',
         {
-          ...this.queryParams,
+          ...this.queryParams
         },
         `SENSITIVE_${new Date().getTime()}.xlsx`
       );
-    },
-  },
+    }
+  }
 };
 </script>

src/views/WEBSITE/index.vue

@@ -1,20 +1,11 @@
 <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" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="网址名" prop="websiteName">
         <el-input v-model="queryParams.websiteName"></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -41,15 +32,7 @@
       <!--        >修改</el-button>-->
       <!--      </el-col>-->
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['business:WEBSITE:remove']"
-          >删除</el-button
-        >
+        <el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['business:WEBSITE:remove']">删除</el-button>
       </el-col>
       <!--      <el-col :span="1.5">-->
       <!--        <el-button-->
@@ -61,18 +44,10 @@
       <!--          v-hasPermi="['business:WEBSITE:export']"-->
       <!--        >导出</el-button>-->
       <!--      </el-col>-->
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="WEBSITEList"
-      @selection-change="handleSelectionChange"
-      height="calc(100vh - 300px)"
-    >
+    <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">
@@ -84,81 +59,39 @@
           />
         </template>
       </el-table-column> -->
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <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:WEBSITE:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['business:WEBSITE:remove']"
-            >删除</el-button
-          >
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:WEBSITE:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['business:WEBSITE: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"
-    />
+    <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-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="链接名称" prop="websiteName">
-              <el-input
-                v-model="form.websiteName"
-                placeholder="请输入链接名称"
-              />
+              <el-input v-model="form.websiteName" placeholder="请输入链接名称" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-form-item label="顶部背景图" prop="websiteUrl">
-          <el-upload
-            action="#"
-            list-type="picture-card"
-            :limit="1"
-            :auto-upload="true"
-            :http-request="httprequest"
-            :before-upload="beforeupload"
-            :file-list="fileList"
-          >
+          <el-upload action="#" list-type="picture-card" :limit="1" :auto-upload="true" :http-request="httprequest" :before-upload="beforeupload" :file-list="fileList">
             <i slot="default" class="el-icon-plus"></i>
             <div slot="file" slot-scope="{ file }">
               <img class="el-upload-list__item-thumbnail" :src="file.url" />
 
               <!-- 放大预览 -->
               <span class="el-upload-list__item-actions">
-                <span
-                  class="el-upload-list__item-preview"
-                  @click="handlePictureCardPreview(file)"
-                >
+                <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                   <i class="el-icon-zoom-in"></i>
                 </span>
                 <!-- 删除图片 -->
-                <span
-                  v-if="!disabled"
-                  class="el-upload-list__item-delete"
-                  @click="handleRemove(file)"
-                >
+                <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
                   <i class="el-icon-delete"></i>
                 </span>
               </span>
@@ -166,33 +99,18 @@
           </el-upload>
         </el-form-item>
         <el-form-item label="底部背景图" prop="websiteUrl">
-          <el-upload
-            action="#"
-            list-type="picture-card"
-            :limit="1"
-            :auto-upload="true"
-            :http-request="httprequest"
-            :before-upload="beforeupload2"
-            :file-list="fileList2"
-          >
+          <el-upload action="#" list-type="picture-card" :limit="1" :auto-upload="true" :http-request="httprequest" :before-upload="beforeupload2" :file-list="fileList2">
             <i slot="default" class="el-icon-plus"></i>
             <div slot="file" slot-scope="{ file }">
               <img class="el-upload-list__item-thumbnail" :src="file.url" />
 
               <!-- 放大预览 -->
               <span class="el-upload-list__item-actions">
-                <span
-                  class="el-upload-list__item-preview"
-                  @click="handlePictureCardPreview(file)"
-                >
+                <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                   <i class="el-icon-zoom-in"></i>
                 </span>
                 <!-- 删除图片 -->
-                <span
-                  v-if="!disabled"
-                  class="el-upload-list__item-delete"
-                  @click="handleRemove2(file)"
-                >
+                <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove2(file)">
                   <i class="el-icon-delete"></i>
                 </span>
               </span>
@@ -207,37 +125,20 @@
       </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.topPicture" alt="" />
     </el-dialog>
-    <el-dialog
-      :visible.sync="dialogVisible2"
-      fullscreen
-      append-to-body
-      @close="dialogVisible2 = false"
-    >
+    <el-dialog :visible.sync="dialogVisible2" fullscreen append-to-body @close="dialogVisible2 = false">
       <img width="100%" :src="form.bottomPicture" alt="" />
     </el-dialog>
   </div>
 </template>
 
 <script>
-import {
-  listWEBSITE,
-  getWEBSITE,
-  delWEBSITE,
-  updateWEBSITE,
-  upload,
-  downloadpic,
-} from "@/api/portal/WEBSITE/WEBSITE";
+import { listWEBSITE, getWEBSITE, delWEBSITE, updateWEBSITE, upload, downloadpic } from '@/api/portal/WEBSITE/WEBSITE';
 
 export default {
-  name: "WEBSITE",
+  name: 'WEBSITE',
   data() {
     return {
       fileList: [],
@@ -262,7 +163,7 @@ export default {
       // 网站管理表格数据
       WEBSITEList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -272,23 +173,17 @@ export default {
         topPicture: null,
         bottomPicture: null,
         websiteName: null,
-        id: null,
+        id: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        topPicture: [
-          { required: true, message: "顶部背景图不能为空", trigger: "blur" },
-        ],
-        bottomPicture: [
-          { required: true, message: "底部背景图不能为空", trigger: "blur" },
-        ],
-        websiteName: [
-          { required: true, message: "网站昵称不能为空", trigger: "blur" },
-        ],
-        id: [{ required: true, message: "主键id不能为空", trigger: "blur" }],
-      },
+        topPicture: [{ required: true, message: '顶部背景图不能为空', trigger: 'blur' }],
+        bottomPicture: [{ required: true, message: '底部背景图不能为空', trigger: 'blur' }],
+        websiteName: [{ required: true, message: '网站昵称不能为空', trigger: 'blur' }],
+        id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }]
+      }
     };
   },
   created() {
@@ -309,34 +204,34 @@ export default {
     },
     //删除顶部背景图
     handleRemove(file) {
-      this.form.topPicture = "";
+      this.form.topPicture = '';
       this.fileList = [];
     },
     //删除底部背景图
     handleRemove2(file) {
-      this.form.bottomPicture = "";
+      this.form.bottomPicture = '';
       this.fileList2 = [];
     },
     //上传顶部背景图
     beforeupload(file) {
       let formData = new FormData();
-      formData.append("file", file);
-      upload(formData).then((res) => {
+      formData.append('file', file);
+      upload(formData).then(res => {
         this.form.topPicture = res.fileName;
       });
     },
     //上传底部背景图
     beforeupload2(file) {
       let formData = new FormData();
-      formData.append("file", file);
-      upload(formData).then((res) => {
+      formData.append('file', file);
+      upload(formData).then(res => {
         this.form.bottomPicture = res.fileName;
       });
     },
     /** 查询网站管理列表 */
     getList() {
       this.loading = true;
-      listWEBSITE(this.queryParams).then((response) => {
+      listWEBSITE(this.queryParams).then(response => {
         this.WEBSITEList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -345,8 +240,8 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
-      this.fileList = []
-      this.fileList2 = []
+      this.fileList = [];
+      this.fileList2 = [];
       this.reset();
     },
     // 表单重置
@@ -354,10 +249,10 @@ export default {
       this.form = {
         websiteUrl: null,
         websiteName: null,
-        id: null,
+        id: null
       };
       this.fileList = [];
-      this.resetForm("form");
+      this.resetForm('form');
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -366,12 +261,12 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm('queryForm');
       this.handleQuery();
     },
     /** 多选框选中数据 */
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.websiteUrl);
+      this.ids = selection.map(item => item.websiteUrl);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -379,32 +274,32 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加网站管理";
+      this.title = '添加网站管理';
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getWEBSITE(id).then((response) => {
+      getWEBSITE(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改网站管理";
-        downloadpic(this.form.topPicture).then((res) => {
+        this.title = '修改网站管理';
+        downloadpic(this.form.topPicture).then(res => {
           let src = window.URL.createObjectURL(res);
-          this.fileList.push({ name: "xxx", url: src });
+          this.fileList.push({ name: 'xxx', url: src });
         });
-        downloadpic(this.form.bottomPicture).then((res) => {
+        downloadpic(this.form.bottomPicture).then(res => {
           let src = window.URL.createObjectURL(res);
-          this.fileList2.push({ name: "xxx", url: src });
+          this.fileList2.push({ name: 'xxx', url: src });
         });
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
-          updateWEBSITE(this.form).then((response) => {
-            this.$modal.msgSuccess("修改成功");
+          updateWEBSITE(this.form).then(response => {
+            this.$modal.msgSuccess('修改成功');
             this.open = false;
             this.getList();
           });
@@ -415,28 +310,26 @@ export default {
     handleDelete(row) {
       const websitePictures = row.id || this.ids;
       this.$modal
-        .confirm(
-          '是否确认删除网站管理编号为"' + websitePictures + '"的数据项？'
-        )
+        .confirm('是否确认删除网站管理编号为"' + websitePictures + '"的数据项？')
         .then(function () {
           return delWEBSITE(websitePictures);
         })
         .then(() => {
           this.getList();
-          this.$modal.msgSuccess("删除成功");
+          this.$modal.msgSuccess('删除成功');
         })
         .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        "business/WEBSITE/export",
+        'business/WEBSITE/export',
         {
-          ...this.queryParams,
+          ...this.queryParams
         },
         `WEBSITE_${new Date().getTime()}.xlsx`
       );
-    },
-  },
+    }
+  }
 };
 </script>

src/views/login.vue

@@ -1,55 +1,33 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">综合保税区管理系统</h3>
+      <div class="logo"><img src="../assets/logo/logo.png" class="img" /></div>
+      <h3 class="title">欢迎登录广西综合保税区智慧管理平台</h3>
       <el-form-item prop="username">
-        <el-input
-          v-model="loginForm.username"
-          type="text"
-          auto-complete="off"
-          placeholder="账号"
-        >
+        <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
-        <el-input
-          v-model="loginForm.password"
-          type="password"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter.native="handleLogin"
-        >
+        <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码" show-password @keyup.enter.native="handleLogin">
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
       <el-form-item prop="code" v-if="captchaEnabled">
-        <el-input
-          v-model="loginForm.code"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter.native="handleLogin"
-        >
+        <el-input v-model="loginForm.code" auto-complete="off" placeholder="验证码" style="width: 63%" @keyup.enter.native="handleLogin">
           <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
         </el-input>
         <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+          <img :src="codeUrl" @click="getCode" class="login-code-img" />
         </div>
       </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      <el-form-item style="width:100%;">
-        <el-button
-          :loading="loading"
-          size="medium"
-          type="primary"
-          style="width:100%;"
-          @click.native.prevent="handleLogin"
-        >
+      <el-checkbox v-model="loginForm.rememberMe" style="margin: 0px 0px 25px 0px">记住密码</el-checkbox>
+      <el-form-item style="width: 100%">
+        <el-button :loading="loading" type="primary" style="width: 100%" @click.native.prevent="handleLogin">
           <span v-if="!loading">登 录</span>
           <span v-else>登 录 中...</span>
         </el-button>
-        <div style="float: right;" v-if="register">
+        <div style="float: right" v-if="register">
           <router-link class="link-type" :to="'/register'">立即注册</router-link>
         </div>
       </el-form-item>
@@ -62,30 +40,26 @@
 </template>
 
 <script>
-import { getCodeImg } from "@/api/login";
-import Cookies from "js-cookie";
-import { encrypt, decrypt } from '@/utils/jsencrypt'
+import { getCodeImg } from '@/api/login';
+import Cookies from 'js-cookie';
+import { encrypt, decrypt } from '@/utils/jsencrypt';
 
 export default {
-  name: "Login",
+  name: 'Login',
   data() {
     return {
-      codeUrl: "",
+      codeUrl: '',
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: 'admin',
+        password: 'admin123',
         rememberMe: false,
-        code: "",
-        uuid: ""
+        code: '',
+        uuid: ''
       },
       loginRules: {
-        username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" }
-        ],
-        password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" }
-        ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+        username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
+        password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }],
+        code: [{ required: true, trigger: 'change', message: '请输入验证码' }]
       },
       loading: false,
       // 验证码开关
@@ -97,7 +71,7 @@ export default {
   },
   watch: {
     $route: {
-      handler: function(route) {
+      handler: function (route) {
         this.redirect = route.query && route.query.redirect;
       },
       immediate: true
@@ -112,15 +86,15 @@ export default {
       getCodeImg().then(res => {
         this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
         if (this.captchaEnabled) {
-          this.codeUrl = "data:image/gif;base64," + res.img;
+          this.codeUrl = 'data:image/gif;base64,' + res.img;
           this.loginForm.uuid = res.uuid;
         }
       });
     },
     getCookie() {
-      const username = Cookies.get("username");
-      const password = Cookies.get("password");
-      const rememberMe = Cookies.get('rememberMe')
+      const username = Cookies.get('username');
+      const password = Cookies.get('password');
+      const rememberMe = Cookies.get('rememberMe');
       this.loginForm = {
         username: username === undefined ? this.loginForm.username : username,
         password: password === undefined ? this.loginForm.password : decrypt(password),
@@ -132,22 +106,25 @@ export default {
         if (valid) {
           this.loading = true;
           if (this.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, { expires: 30 });
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
+            Cookies.set('username', this.loginForm.username, { expires: 30 });
+            Cookies.set('password', encrypt(this.loginForm.password), { expires: 30 });
             Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
           } else {
-            Cookies.remove("username");
-            Cookies.remove("password");
+            Cookies.remove('username');
+            Cookies.remove('password');
             Cookies.remove('rememberMe');
           }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
-          }).catch(() => {
-            this.loading = false;
-            if (this.captchaEnabled) {
-              this.getCode();
-            }
-          });
+          this.$store
+            .dispatch('Login', this.loginForm)
+            .then(() => {
+              this.$router.push({ path: this.redirect || '/' }).catch(() => {});
+            })
+            .catch(() => {
+              this.loading = false;
+              if (this.captchaEnabled) {
+                this.getCode();
+              }
+            });
         }
       });
     }
@@ -161,7 +138,7 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
+  background-image: url('../assets/images/bg.png');
   background-size: cover;
 }
 .title {
@@ -171,10 +148,18 @@ export default {
 }
 
 .login-form {
-  border-radius: 6px;
-  background: #ffffff;
-  width: 400px;
-  padding: 25px 25px 5px 25px;
+  background: linear-gradient(180deg, rgba(129, 211, 248, 1) 9%, rgba(188, 227, 244, 1) 53%, rgba(242, 242, 242, 1) 100%);
+  width: 410px;
+  border-radius: 16px;
+  padding: 35px 45px 15px 45px;
+  .logo {
+    text-align: center;
+    margin-bottom: 20px;
+    .img {
+      width: 50px;
+      height: 50px;
+    }
+  }
   .el-input {
     height: 38px;
     input {

src/views/news/index.vue

@@ -1,74 +1,28 @@
 <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" :inline="true" v-show="showSearch">
       <el-form-item label="标题" prop="title">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入标题"
-        ></el-input>
+        <el-input v-model="queryParams.title" placeholder="请输入标题"></el-input>
       </el-form-item>
       <el-form-item label="类型" prop="title">
-        <el-select
-          v-model="queryParams.type"
-          placeholder="请选择新闻状态"
-          clearable
-          filterable
-        >
-          <el-option
-            v-for="t in typeList"
-            :key="t.value"
-            :label="t.label"
-            :value="t.value"
-          />
+        <el-select v-model="queryParams.type" placeholder="请选择新闻状态" clearable filterable class="se">
+          <el-option v-for="t in typeList" :key="t.value" :label="t.label" :value="t.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="新闻状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择新闻状态"
-          clearable
-          filterable
-        >
-          <el-option
-            v-for="status in statusOptionList"
-            :key="status.value"
-            :label="status.label"
-            :value="status.value"
-          />
+        <el-select v-model="queryParams.status" placeholder="请选择新闻状态" clearable filterable class="se">
+          <el-option v-for="status in statusOptionList" :key="status.value" :label="status.label" :value="status.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-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @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:NEWS:add']"
-          >新增新闻</el-button
-        >
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['business:NEWS:add']">新增新闻</el-button>
       </el-col>
       <!-- 以下暂时不需要 -->
       <!-- <el-col :span="1.5">
@@ -106,194 +60,71 @@
           >导出</el-button
         >
       </el-col> -->
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
-    <el-table
-      v-loading="loading"
-      :data="NEWSList"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="NEWSList" @selection-change="handleSelectionChange">
       <el-table-column type="selection"></el-table-column>
-      <el-table-column label="标题" align="center" prop="title" width="250">
+      <el-table-column label="标题" align="left" prop="title" width="220">
         <template slot-scope="scope">
-          <div
-            style="
-              white-space: nowrap;
-              overflow: hidden;
-              text-overflow: ellipsis;
-            "
-          >
-            {{ scope.row.title }}
-          </div>
+          <div class="omit">{{ scope.row.title }} </div>
         </template>
       </el-table-column>
-
       <el-table-column label="类型" align="center" prop="type" width="250">
         <template slot-scope="scope">
-          <div
-            style="
-              white-space: nowrap;
-              overflow: hidden;
-              text-overflow: ellipsis;
-            "
-          >
+          <div style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
             {{ searchType(scope.row.type) }}
           </div>
         </template>
       </el-table-column>
 
-      <el-table-column
-        label="编辑日期"
-        align="center"
-        width="120"
-        prop="updateTime"
-      >
+      <el-table-column label="编辑日期" align="center" width="120" prop="updateTime">
         <template slot-scope="scope">
-          {{ scope.row.updateTime ? scope.row.updateTime.substr(0, 10) : "无" }}
+          {{ scope.row.updateTime ? scope.row.updateTime.substr(0, 10) : '无' }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="审核日期"
-        align="center"
-        width="120"
-        prop="audit_time"
-      >
+      <el-table-column label="审核日期" align="center" width="120" prop="audit_time">
         <template slot-scope="scope">
-          {{ scope.row.audit_time ? scope.row.audit_time.substr(0, 10) : "无" }}
+          {{ scope.row.audit_time ? scope.row.audit_time.substr(0, 10) : '无' }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="上报日期"
-        align="center"
-        width="120"
-        prop="report_date"
-      >
+      <el-table-column label="上报日期" align="center" width="120" prop="report_date">
         <template slot-scope="scope">
-          {{
-            scope.row.report_date ? scope.row.report_date.substr(0, 10) : "无"
-          }}
+          {{ scope.row.report_date ? scope.row.report_date.substr(0, 10) : '无' }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="发布日期"
-        align="center"
-        width="120"
-        prop="release_date"
-      >
+      <el-table-column label="发布日期" align="center" width="120" prop="release_date">
         <template slot-scope="scope">
-          {{
-            scope.row.release_date ? scope.row.release_date.substr(0, 10) : "无"
-          }}
+          {{ scope.row.release_date ? scope.row.release_date.substr(0, 10) : '无' }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="新闻状态"
-        align="center"
-        width="120"
-        prop="status"
-      >
+      <el-table-column label="新闻状态" align="center" width="120" prop="status">
         <template slot-scope="scope">
           <span v-if="scope.row.status == 0"><el-tag>草稿</el-tag></span>
-          <span v-if="scope.row.status == 1"
-            ><el-tag type="warning">审核中</el-tag></span
-          >
-          <span v-if="scope.row.status == 2"
-            ><el-tag type="danger">审核驳回</el-tag></span
-          >
-          <span v-if="scope.row.status == 3"
-            ><el-tag type="success">已审核</el-tag></span
-          >
-          <span v-if="scope.row.status == 4"
-            ><el-tag type="success">已发布</el-tag></span
-          >
-          <span v-if="scope.row.status == 5"
-            ><el-tag type="info">已下架</el-tag></span
-          >
+          <span v-if="scope.row.status == 1"><el-tag type="warning">审核中</el-tag></span>
+          <span v-if="scope.row.status == 2"><el-tag type="danger">审核驳回</el-tag></span>
+          <span v-if="scope.row.status == 3"><el-tag type="success">已审核</el-tag></span>
+          <span v-if="scope.row.status == 4"><el-tag type="success">已发布</el-tag></span>
+          <span v-if="scope.row.status == 5"><el-tag type="info">已下架</el-tag></span>
           <span v-if="scope.row.status == 6"><el-tag>已置顶</el-tag></span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            v-if="scope.row.status == 4"
-            size="mini"
-            type="text"
-            @click="handleDownOrUp(scope.row)"
-            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 == 4" size="mini" type="text" @click="handleDownOrUp(scope.row)" 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 ||
-              scope.row.status == 5
-            "
-            size="mini"
-            type="text"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:NEWS:remove']"
-            >修改</el-button
-          >
-          <el-button
-            v-if="scope.row.status == 5 || scope.row.status == 3"
-            size="mini"
-            type="text"
-            @click="handleDownOrUp(scope.row)"
-            v-hasPermi="['business:NEWS:remove']"
-            >发布</el-button
-          >
-          <el-button
-            v-if="scope.row.status == 6"
-            size="mini"
-            type="text"
-            @click="hanleTop(scope.row)"
-            v-hasPermi="['business:NEWS:remove']"
-            >取消置顶</el-button
-          >
-          <el-button
-            v-else-if="scope.row.status == 4"
-            size="mini"
-            type="text"
-            @click="hanleTop(scope.row)"
-            v-hasPermi="['business:NEWS:remove']"
-            >置顶</el-button
-          >
+          <el-button v-if="scope.row.status == 0 || scope.row.status == 2 || scope.row.status == 5" size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['business:NEWS:remove']">修改</el-button>
+          <el-button v-if="scope.row.status == 5 || scope.row.status == 3" size="mini" type="text" @click="handleDownOrUp(scope.row)" v-hasPermi="['business:NEWS:remove']">发布</el-button>
+          <el-button v-if="scope.row.status == 6" size="mini" type="text" @click="hanleTop(scope.row)" v-hasPermi="['business:NEWS:remove']">取消置顶</el-button>
+          <el-button v-else-if="scope.row.status == 4" size="mini" type="text" @click="hanleTop(scope.row)" v-hasPermi="['business:NEWS: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"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
     <!--    &lt;!&ndash; 添加或修改网站新闻对话框 &ndash;&gt;-->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="1000px"
-      append-to-body
-    >
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" :width="'65%'" @close="close" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="标题" prop="title">
           <el-input v-model="form.title" placeholder="请输入标题"></el-input>
@@ -301,39 +132,19 @@
 
         <el-form-item label="类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择">
-            <el-option
-              v-for="item in typeList"
-              :key="item.value + 'typeList'"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
+            <el-option v-for="item in typeList" :key="item.value + 'typeList'" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item label="封面图" prop="picture">
-          <el-upload
-            action="#"
-            list-type="picture-card"
-            :limit="1"
-            :auto-upload="true"
-            :http-request="httprequest"
-            :before-upload="beforeupload"
-            :file-list="fileList"
-          >
+          <el-upload action="#" list-type="picture-card" :limit="1" :auto-upload="true" :http-request="httprequest" :before-upload="beforeupload" :file-list="fileList">
             <i slot="default" class="el-icon-plus"></i>
             <div slot="file" slot-scope="{ file }">
               <img class="el-upload-list__item-thumbnail" :src="file.url" />
-
               <!-- 放大预览 -->
               <span class="el-upload-list__item-actions">
-                <span
-                  class="el-upload-list__item-preview"
-                  @click="handlePictureCardPreview(file)"
-                >
+                <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                   <i class="el-icon-zoom-in"></i>
                 </span>
-
                 <!-- 下载用的，暂时不需要 -->
                 <!-- <span
                   v-if="!disabled"
@@ -344,11 +155,7 @@
                 </span> -->
 
                 <!-- 删除图片 -->
-                <span
-                  v-if="!disabled"
-                  class="el-upload-list__item-delete"
-                  @click="handleRemove(file)"
-                >
+                <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
                   <i class="el-icon-delete"></i>
                 </span>
               </span>
@@ -369,40 +176,24 @@
       </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>
 </template>
 
 <script>
-import {
-  listNEWS,
-  getNEWS,
-  delNEWS,
-  addNEWS,
-  updateNEWS,
-  upload,
-  setTop,
-  newCommit,
-  updateAndex,
-  downloadpic,
-} from "@/api/portal/news/NEWS.js";
+import { listNEWS, getNEWS, delNEWS, addNEWS, updateNEWS, upload, setTop, newCommit, updateAndex, downloadpic } from '@/api/portal/news/NEWS.js';
 
 export default {
-  name: "NEWS",
+  name: 'NEWS',
   data() {
     return {
       typeList: [
-        { label: "要闻咨询", value: "1" },
-        { label: "政策法规", value: "2" },
-        { label: "通知公告", value: "3" },
-        { label: "政策解读", value: "4" },
+        { label: '要闻咨询', value: '1' },
+        { label: '政策法规', value: '2' },
+        { label: '通知公告', value: '3' },
+        { label: '政策解读', value: '4' }
       ],
       fileList: [],
       dialogVisible: false,
@@ -424,7 +215,7 @@ export default {
       // 网站新闻表格数据
       NEWSList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -444,44 +235,41 @@ export default {
         type: null,
         typeName: null,
         picture: null,
-        status: null,
+        status: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
-        content: [{ required: true, message: "内容不能为空", trigger: "blur" }],
-        fileUrl: [{ required: true, message: "附件不能为空", trigger: "blur" }],
+        title: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
+        content: [{ required: true, message: '内容不能为空', trigger: 'blur' }],
+        fileUrl: [{ required: true, message: '附件不能为空', trigger: 'blur' }],
         type: [
           {
             required: true,
-            message: "类型不能为空",
-            trigger: "change",
-          },
-        ],
-        typeName: [
-          { required: true, message: "字典类型名称不能为空", trigger: "blur" },
+            message: '类型不能为空',
+            trigger: 'change'
+          }
         ],
-        picture: [{ required: true, message: "图片不能为空", trigger: "blur" }],
+        typeName: [{ required: true, message: '字典类型名称不能为空', trigger: 'blur' }],
+        picture: [{ required: true, message: '图片不能为空', trigger: 'blur' }],
         status: [
           {
             required: true,
-            message:
-              "状态(0.草稿，1.下架，2.审核中，3.审核驳回，4.已发布，5.已上报)不能为空",
-            trigger: "blur",
-          },
-        ],
+            message: '状态(0.草稿，1.下架，2.审核中，3.审核驳回，4.已发布，5.已上报)不能为空',
+            trigger: 'blur'
+          }
+        ]
       },
       statusOptionList: [
-        { label: "草稿", value: 0 },
-        { label: "审核中", value: 1 },
-        { label: "审核驳回", value: 2 },
-        { label: "已审核", value: 3 },
-        { label: "已发布", value: 4 },
-        { label: "已下架", value: 5 },
-        { label: "已置顶", value: 6 },
-      ],
+        { label: '草稿', value: 0 },
+        { label: '审核中', value: 1 },
+        { label: '审核驳回', value: 2 },
+        { label: '已审核', value: 3 },
+        { label: '已发布', value: 4 },
+        { label: '已下架', value: 5 },
+        { label: '已置顶', value: 6 }
+      ]
     };
   },
   created() {
@@ -491,20 +279,20 @@ export default {
     hanleTop(row) {
       var data = new FormData();
       //判断是否置顶
-      if (row.status == "6") {
-        data.append("status", 4);
+      if (row.status == '6') {
+        data.append('status', 4);
       } else {
-        data.append("status", 6);
+        data.append('status', 6);
       }
-      data.append("id", row.id);
-      setTop(data).then((res) => {
+      data.append('id', row.id);
+      setTop(data).then(res => {
         this.getList();
       });
     },
     /** 查询网站新闻列表 */
     getList() {
       this.loading = true;
-      listNEWS(this.queryParams).then((response) => {
+      listNEWS(this.queryParams).then(response => {
         this.NEWSList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -513,13 +301,13 @@ export default {
     httprequest() {},
     beforeupload(file) {
       let formData = new FormData();
-      formData.append("file", file);
-      upload(formData).then((res) => {
+      formData.append('file', file);
+      upload(formData).then(res => {
         this.form.picture = res.fileName;
       });
     },
     handleRemove(file) {
-      this.form.picture = "";
+      this.form.picture = '';
       this.fileList = [];
     },
     handlePictureCardPreview(file) {
@@ -531,20 +319,20 @@ export default {
     },
     handleDownOrUp(row) {
       //修改发布、下架状态
-      if (row.status == "4") {
+      if (row.status == '4') {
         //已发布 已审核
-        row.status = "5";
-        updateNEWS(row).then((response) => {
-          this.$modal.msgSuccess("修改成功");
+        row.status = '5';
+        updateNEWS(row).then(response => {
+          this.$modal.msgSuccess('修改成功');
           this.open = false;
           this.getList();
           this.reset();
         });
-      } else if (row.status == "5" || row.status == "3") {
+      } else if (row.status == '5' || row.status == '3') {
         //已下架
-        row.status = "4";
-        updateNEWS(row).then((response) => {
-          this.$modal.msgSuccess("下架成功");
+        row.status = '4';
+        updateNEWS(row).then(response => {
+          this.$modal.msgSuccess('下架成功');
           this.open = false;
           this.getList();
           this.reset();
@@ -568,10 +356,10 @@ export default {
         type: null,
         typeName: null,
         picture: null,
-        status: "0",
+        status: '0'
       };
       this.fileList = [];
-      this.resetForm("form");
+      this.resetForm('form');
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -580,15 +368,15 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.type = "";
-      this.queryParams.title = "";
-      this.queryParams.status = "";
-      this.resetForm("queryForm");
+      this.queryParams.type = '';
+      this.queryParams.title = '';
+      this.queryParams.status = '';
+      this.resetForm('queryForm');
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -596,19 +384,19 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加网站新闻";
+      this.title = '添加网站新闻';
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getNEWS(id).then((response) => {
+      getNEWS(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改网站新闻";
-        downloadpic(this.form.picture).then((res) => {
+        this.title = '修改网站新闻';
+        downloadpic(this.form.picture).then(res => {
           let src = window.URL.createObjectURL(res);
-           this.fileList.push({ name: "xxx", url: src});
+          this.fileList.push({ name: 'xxx', url: src });
         });
       });
     },
@@ -616,29 +404,29 @@ export default {
       // let data = new FormData();
       // data.append("id", id);
       let CbNewsVo = row;
-      newCommit(CbNewsVo).then((response) => {
-        this.$modal.msgSuccess("提交审核成功!");
+      newCommit(CbNewsVo).then(response => {
+        this.$modal.msgSuccess('提交审核成功!');
         this.getList();
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateAndex(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
+            updateAndex(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功');
               this.open = false;
               this.getList();
               this.reset();
             });
           } else {
-            this.form.status = "1";
-            addNEWS(this.form).then((response) => {
+            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.$modal.msgSuccess('新增成功');
               this.open = false;
               this.getList();
               this.reset();
@@ -649,33 +437,28 @@ export default {
       });
     },
     searchType(id) {
-      let fined = this.typeList.find((item) => item.value == id);
+      let fined = this.typeList.find(item => item.value == id);
       if (fined.label != undefined) {
         return fined.label;
       } else {
-        return "未选择类型！";
+        return '未选择类型！';
       }
     },
     submitzc() {
       console.log(this.form.id);
-      this.$refs["form"].validate((valid) => {
+      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.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("修改成功");
+          } 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();
@@ -694,20 +477,20 @@ export default {
         })
         .then(() => {
           this.getList();
-          this.$modal.msgSuccess("删除成功");
+          this.$modal.msgSuccess('删除成功');
         })
         .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        "business/NEWS/export",
+        'business/NEWS/export',
         {
-          ...this.queryParams,
+          ...this.queryParams
         },
         `NEWS_${new Date().getTime()}.xlsx`
       );
-    },
-  },
+    }
+  }
 };
 </script>