新增联系我们的管理页面，并替换开发环境下的配置文件

.env.development

@@ -9,7 +9,7 @@ ENV = 'development'
 
 # VUE_APP_BASE_API = 'http://106.55.241.82:9527/zhbsq-service'
 
-VUE_APP_BASE_API = 'http://192.168.1.24:9527/zhbsq-service'
+VUE_APP_BASE_API = 'http://localhost:9527/zhbsq-service'
 
 # 请求、响应数据加密
 VUE_APP_AES_ENCRYPT_ENABLED = 'false'

src/api/portal/CONTACTUS/CONTACTUS.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询联系我们列表
 export function listCONTACTUS(query) {
   return request({
-    url: '/business/CONTACTUS/list',
+    url: '/portal/CONTACTUS/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listCONTACTUS(query) {
 // 查询联系我们所有列表
 export function listAllCONTACTUS(query) {
   return request({
-    url: '/business/CONTACTUS/listAll',
+    url: '/portal/CONTACTUS/listAll',
     method: 'get',
     params: query
   })
@@ -21,7 +21,7 @@ export function listAllCONTACTUS(query) {
 // 查询联系我们详细
 export function getCONTACTUS(id) {
   return request({
-    url: '/business/CONTACTUS/getInfo/' + id,
+    url: '/portal/CONTACTUS/getInfo/' + id,
     method: 'get'
   })
 }
@@ -29,7 +29,7 @@ export function getCONTACTUS(id) {
 // 新增联系我们
 export function addCONTACTUS(data) {
   return request({
-    url: '/business/CONTACTUS/add',
+    url: '/portal/CONTACTUS/add',
     method: 'post',
     data: data
   })
@@ -38,7 +38,7 @@ export function addCONTACTUS(data) {
 // 修改联系我们
 export function updateCONTACTUS(data) {
   return request({
-    url: '/business/CONTACTUS/edit',
+    url: '/portal/CONTACTUS/edit',
     method: 'post',
     data: data
   })
@@ -47,7 +47,7 @@ export function updateCONTACTUS(data) {
 // 删除联系我们
 export function delCONTACTUS(id) {
   return request({
-    url: '/business/CONTACTUS/remove/' + id,
+    url: '/portal/CONTACTUS/remove/' + id,
     method: 'get'
   })
 }

src/api/portal/MARK/MARK.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询咨询标签列表
+export function listMARK(query) {
+  return request({
+    url: '/MARK/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询咨询标签所有列表
+export function listAllMARK(query) {
+  return request({
+    url: '/MARK/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询咨询标签详细
+export function getMARK(id) {
+  return request({
+    url: '/MARK/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增咨询标签
+export function addMARK(data) {
+  return request({
+    url: '/MARK/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改咨询标签
+export function updateMARK(data) {
+  return request({
+    url: '/MARK/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除咨询标签
+export function delMARK(id) {
+  return request({
+    url: '/MARK/remove/' + id,
+    method: 'get'
+  })
+}

src/views/CONTACTUS/index.vue

@@ -0,0 +1,390 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="单位名称" prop="title">
+        <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-form-item>
+      <el-form-item label="邮箱" prop="email">
+        <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-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-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-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-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <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">
+        <template slot-scope="scope">
+          {{ scope.row.depName }}
+        </template>
+      </el-table-column>
+      <el-table-column label="联系电话" align="center" prop="telphone">
+        <template slot-scope="scope">
+          {{ scope.row.telphone }}
+        </template>
+      </el-table-column>
+      <el-table-column label="位置" align="center" prop="location">
+        <template slot-scope="scope">
+          {{ scope.row.location }}
+        </template>
+      </el-table-column>
+      <el-table-column label="邮箱" align="center" prop="email">
+        <template slot-scope="scope">
+          {{ scope.row.email }}
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime">
+        <template slot-scope="scope">
+          {{ scope.row.createTime }}
+        </template>
+      </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createBy">
+        <template slot-scope="scope">
+          {{ 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">
+        <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
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改联系我们对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="单位名称" prop="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-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listCONTACTUS,
+  getCONTACTUS,
+  delCONTACTUS,
+  addCONTACTUS,
+  updateCONTACTUS,
+} from "@/api/portal/CONTACTUS/CONTACTUS.js";
+
+export default {
+  name: "CONTACTUS",
+  data() {
+    return {
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 联系我们表格数据
+      CONTACTUSList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        delFlag: null,
+        deptId: null,
+        depName: null,
+        telphone: null,
+        location: 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" }],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询联系我们列表 */
+    getList() {
+      this.loading = true;
+      listCONTACTUS(this.queryParams).then((response) => {
+        this.CONTACTUSList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        delFlag: null,
+        deptId: null,
+        depName: null,
+        telphone: null,
+        location: null,
+        email: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加联系我们";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getCONTACTUS(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改联系我们";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateCONTACTUS(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCONTACTUS(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('确定删除吗？')
+        .then(function () {
+          return delCONTACTUS(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "business/CONTACTUS/export",
+        {
+          ...this.queryParams,
+        },
+        `CONTACTUS_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>

src/views/MARK/index.vue

@@ -0,0 +1,323 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="标签名称" prop="mark">
+        <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-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-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-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-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <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">
+        <template slot-scope="scope">
+          {{ scope.row.mark }}
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime">
+        <template slot-scope="scope">
+          {{ scope.row.createTime }}
+        </template>
+      </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createBy">
+        <template slot-scope="scope">
+          {{ 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">
+        <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: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"
+    />
+
+    <!-- 添加或修改咨询标签对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="标签名称" prop="mark">
+          <el-input v-model="form.mark" placeholder="请输入标签名称"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listMARK,
+  getMARK,
+  delMARK,
+  addMARK,
+  updateMARK,
+} from "@/api/portal/MARK/MARK.js";
+
+export default {
+  name: "MARK",
+  data() {
+    return {
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 咨询标签表格数据
+      MARKList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        delFlag: null,
+        deptId: 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" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询咨询标签列表 */
+    getList() {
+      this.loading = true;
+      listMARK(this.queryParams).then((response) => {
+        this.MARKList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        delFlag: null,
+        deptId: null,
+        mark: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加咨询标签";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getMARK(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改咨询标签";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateMARK(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMARK(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除咨询标签编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delMARK(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "business/MARK/export",
+        {
+          ...this.queryParams,
+        },
+        `MARK_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>