会员信息页面功能

src/api/base/hobbyInfo.js

@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/hobbyInfo/pageList", formData);
+}
+
+function list(){
+    return request.post(constant.serverUrl + "/base/hobbyInfo/list");
+  }
+
+function create(){
+  return request.get(constant.serverUrl + "/base/hobbyInfo/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/hobbyInfo/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/hobbyInfo/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/hobbyInfo/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/hobbyInfo/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/hobbyInfo/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove,list
+}

src/api/base/memberInfo.js

@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/memberInfo/pageList", formData);
+}
+
+function list(){
+    return request.post(constant.serverUrl + "/base/memberInfo/list");
+  }
+
+function create(){
+  return request.get(constant.serverUrl + "/base/memberInfo/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/memberInfo/edit/" + id);
+}
+
+function view(id){
+  return request.get(constant.serverUrl + "/base/memberInfo/view/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/memberInfo/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/memberInfo/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/memberInfo/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/memberInfo/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove,list,view
+}

src/api/base/newsInfo.js

@@ -0,0 +1,47 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/newsInfo/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/newsInfo/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/newsInfo/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/newsInfo/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/newsInfo/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/newsInfo/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/newsInfo/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove
+}

src/api/base/newsType.js

@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/newsType/pageList", formData);
+}
+
+function list(){
+    return request.post(constant.serverUrl + "/base/newsType/list");
+  }
+
+function create(){
+  return request.get(constant.serverUrl + "/base/newsType/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/newsType/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/newsType/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/newsType/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/newsType/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/newsType/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove,list
+}

src/routers/modules/base.js

@@ -1,6 +1,6 @@
 var routers = [
     {
-        //终端管理
+        //工会管理
         path: '/base/orgInfo/list',
         name: 'BaseOrgInfoList',
         // route level code-splitting
@@ -12,6 +12,58 @@ var routers = [
                 title: '工会管理'
         }
 },
+{
+        //新闻类型管理
+        path: '/base/newsType/list',
+        name: 'BaseNewsTypeList',
+        // route level code-splitting
+        // this generates a separate chunk (about.[hash].js) for this route
+        // which is lazy-loaded when the route is visited.
+        component: () => import('@/views/base/newsType-list.vue'),
+        meta: {
+                roles: ["admin"],
+                title: '新闻类型管理'
+        }
+},
+{
+        //新闻管理
+        path: '/base/newsInfo/list',
+        name: 'BaseNewsInfoList',
+        // route level code-splitting
+        // this generates a separate chunk (about.[hash].js) for this route
+        // which is lazy-loaded when the route is visited.
+        component: () => import('@/views/base/newsInfo-list.vue'),
+        meta: {
+                roles: ["admin"],
+                title: '新闻管理'
+        }
+},
+{
+        //兴趣爱好管理
+        path: '/base/hobbyInfo/list',
+        name: 'BaseHobbyInfoList',
+        // route level code-splitting
+        // this generates a separate chunk (about.[hash].js) for this route
+        // which is lazy-loaded when the route is visited.
+        component: () => import('@/views/base/hobbyInfo-list.vue'),
+        meta: {
+                roles: ["admin"],
+                title: '兴趣爱好管理'
+        }
+},
+{
+        //会员管理
+        path: '/base/memberInfo/list',
+        name: 'BaseMemberInfoList',
+        // route level code-splitting
+        // this generates a separate chunk (about.[hash].js) for this route
+        // which is lazy-loaded when the route is visited.
+        component: () => import('@/views/base/memberInfo-list.vue'),
+        meta: {
+                roles: ["admin"],
+                title: '会员管理'
+        }
+},
 ]
 
 export default routers;

src/views/base/hobbyInfo-detail.vue

@@ -0,0 +1,150 @@
+
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="true"
+    append-to-body
+    style="text-align:left;"
+    width="500px"
+    :close-on-click-modal="false"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="formModel" inline :rules="ruleValidate" :label-width="'120px'">
+        <el-form-item label="兴趣爱好名称" prop="name">
+          <el-input v-model="formModel.name" placeholder="请输入兴趣爱好名称" style="width:300px"></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import hobbyInfoApi from "@/api/base/hobbyInfo";
+
+export default {
+  props: ["businessKey", "title","companyResult"],
+  computed: {
+      ruleValidate (){
+        var rules = null;
+        rules = {
+            name: [
+                { required: true, message: "兴趣爱好名称不能为空", trigger: "blur" }
+            ],
+        };
+        return rules;
+      }
+  },
+  data() {
+    return {
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      formModel: {
+        id:"",
+        name:"",
+        parentId:"",
+      },
+      templateList: [],
+      defaultPriceList:[],
+      chargingStationResult:[],
+      orgResult:[],
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children"
+      },
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return hobbyInfoApi.add(self.formModel);
+            } else {
+              return hobbyInfoApi.update(self.formModel);
+            }
+          })().then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success",
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning",
+              });
+
+              //self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+  },
+  created() {
+    var self = this;
+
+    //self.loadTree();
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return hobbyInfoApi.create();
+      } else {
+        return hobbyInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.user-panel {
+  margin: 10px auto;
+}
+.input-form-main{
+    width: 300px;
+}
+.link-span{
+    margin-right: 20px;
+}
+.el-form-item{
+    margin-bottom: 25px;
+}
+</style>

src/views/base/hobbyInfo-list.vue

@@ -0,0 +1,313 @@
+<template>
+  <div style="padding-left: 5px">
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">基础信息管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/hobbyInfo">兴趣爱好管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="兴趣爱好名称" prop="name">
+        <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        @click="handleAdd"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-remove"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchDelete"
+        >删除选中项</el-button
+      >
+    </el-row>
+    <el-table
+      ref="formTable"
+      :data="tableData"
+      v-loading="loading"
+      stripe
+      :height="tableHeight"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column
+        prop="name"
+        label="兴趣爱好名称"
+        width="200"
+      ></el-table-column>
+      <el-table-column
+        prop="createTime"
+        label="创建时间"
+      ></el-table-column>
+      <el-table-column label="操作" width="350" fixed="right">
+        <template slot-scope="{ row }">
+          <el-row>
+            <el-col>
+              <el-link
+                type="primary"
+                :underline="false"
+                @click="handleEdit(row)"
+                >编辑</el-link
+              >-
+              <el-link
+                type="danger"
+                :underline="false"
+                @click="handleDelete(row)"
+                >删除</el-link>
+            </el-col>
+          </el-row>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <hobbyInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></hobbyInfo-detail>
+  </div>
+</template>
+<script>
+
+import hobbyInfoDetail from "./hobbyInfo-detail";
+import hobbyInfoApi from "@/api/base/hobbyInfo";
+
+export default {
+  name: "BaseHobbyInfoList",
+  data() {
+    var self = this;
+    return {
+      queryModel: {
+        name: "",
+      },
+      loading: false,
+      tableData: [],
+      treeData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      tableHeight: 300,
+      showDeviceModal: false,
+      companyId: "",
+      qrCode: "",
+      companyResult: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      batchImportVisible: false,
+      batchImportFileList: [],
+      xlsLoading: false,
+      sceneData: [],
+      typeData: [],
+      deviceRelationTitle: "",
+      showIconModal: false,
+      iconModalTitle: "",
+    };
+  },
+  created() {
+
+    this.changePage(1);
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("name", self.queryModel.name);
+
+      hobbyInfoApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+          //45为分页栏的高度
+          //页面高度-列表上面的高度-分页栏高度
+          self.tableHeight =
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 100;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          hobbyInfoApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        hobbyInfoApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+      this.showDeviceModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {},
+  components: {
+    "hobbyInfo-detail": hobbyInfoDetail,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/memberInfo-detail.vue

@@ -0,0 +1,183 @@
+
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="true"
+    append-to-body
+    style="text-align:left;"
+    width="500px"
+    :close-on-click-modal="false"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="formModel" inline :rules="ruleValidate" :label-width="'100px'">
+        <el-form-item label="真实姓名" prop="realName">
+          <el-input v-model="formModel.realName" placeholder="请输入真实姓名" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="身份证" prop="idCard">
+          <el-input v-model="formModel.idCard" placeholder="请输入身份证" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="所属工会" prop="orgId">
+          <el-select-tree
+            :props="props"
+            :options="orgResult"
+            v-model="formModel.orgId"
+            height="400"
+            size="large"
+            style="width:300px"
+          ></el-select-tree>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import memberInfoApi from "@/api/base/memberInfo";
+import orgInfoApi from "@/api/base/orgInfo";
+import SelectTree from "@/components/SelectTree";
+
+export default {
+  props: ["businessKey", "title","companyResult"],
+  computed: {
+      ruleValidate (){
+        var rules = null;
+        rules = {
+            realName: [
+                { required: true, message: "真实姓名不能为空", trigger: "blur" }
+            ],
+            idCard: [
+                { required: true, message: "身份证号不能为空", trigger: "blur" }
+            ],
+            orgId: [
+                { required: true, message: "所属工会不能为空", trigger: "blur" }
+            ],
+        };
+        return rules;
+      }
+  },
+  data() {
+    return {
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      formModel: {
+        id:"",
+        name:"",
+        parentId:"",
+      },
+      templateList: [],
+      defaultPriceList:[],
+      chargingStationResult:[],
+      orgResult:[],
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children"
+      },
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return memberInfoApi.add(self.formModel);
+            } else {
+              return memberInfoApi.update(self.formModel);
+            }
+          })().then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success",
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning",
+              });
+
+              //self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+  },
+  created() {
+    var self = this;
+
+    orgInfoApi.treeList().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.orgResult = jsonData.data;
+        }
+      }
+    });
+
+    //self.loadTree();
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return memberInfoApi.create();
+      } else {
+        return memberInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+  components: {
+    "el-select-tree": SelectTree,
+  },
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.user-panel {
+  margin: 10px auto;
+}
+.input-form-main{
+    width: 300px;
+}
+.link-span{
+    margin-right: 20px;
+}
+.el-form-item{
+    margin-bottom: 25px;
+}
+</style>

src/views/base/memberInfo-list.vue

@@ -0,0 +1,415 @@
+<template>
+  <div style="padding-left: 5px">
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">基础信息管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/memberInfo">会员管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="真实姓名" prop="realName">
+        <el-input type="text" size="mini" v-model="queryModel.realName"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        @click="handleAdd"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-remove"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchDelete"
+        >删除选中项</el-button
+      >
+    </el-row>
+    <el-table
+      ref="formTable"
+      :data="tableData"
+      v-loading="loading"
+      stripe
+      :height="tableHeight"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column
+            prop="faceImage"
+            label="头像"
+            fixed="left"
+        >
+            <template slot-scope="{ row }">
+            <a :href="row.faceImage" target="_blank">
+                <el-avatar
+                :size="48"
+                shape="circle"
+                :src="
+                    row.faceImage +
+                    '?x-oss-process=image/resize,m_fill,w_64,h_64'
+                "
+                :key="row.id"
+                ></el-avatar>
+            </a>
+            </template>
+        </el-table-column>
+        <el-table-column
+            prop="realName"
+            label="真实姓名"
+            width="100"
+            fixed="left"
+        ></el-table-column>
+        <el-table-column
+            prop="phone"
+            label="手机号码"
+            width="150"
+        ></el-table-column>
+        <el-table-column
+            prop="idCard"
+            label="身份证号"
+            width="200"
+        ></el-table-column>
+        <el-table-column
+            prop="orgName"
+            label="所属工会"
+            width="150"
+        ></el-table-column>
+        <el-table-column prop="status"  label="审核状态">
+            <template slot-scope="{ row }">
+                <span v-if="row.status=='0'" style="color:red">未审核</span>
+                <span v-else-if="row.status=='1'" style="color:green">已审核</span>
+                <span v-else-if="row.status=='2'">审核不通过</span>
+            </template>
+        </el-table-column>
+        <el-table-column prop="publicNot" label="信息公开">
+            <template slot-scope="{ row }">
+                <span v-if="row.publicNot">公开</span>
+                <span v-else style="color:red">不公开</span>
+            </template>
+        </el-table-column>
+        <el-table-column
+            prop="registeredResidence"
+            label="户口所在地"
+            width="200"
+        ></el-table-column>
+        <el-table-column
+            prop="educationN"
+            label="学历"
+        ></el-table-column>
+        <el-table-column
+            prop="industryN"
+            label="行业"
+            width="150"
+        ></el-table-column>
+        <el-table-column
+            prop="salaryRangeN"
+            label="月薪"
+            width="150"
+        ></el-table-column>
+        <el-table-column
+            prop="housingSituationN"
+            label="住房情况"
+            width="150"
+        ></el-table-column>
+        <el-table-column
+            prop="maritalStatusN"
+            label="婚姻情况"
+        ></el-table-column>
+        <el-table-column
+            prop="childStatusN"
+            label="子女情况"
+        ></el-table-column>
+        <el-table-column label="操作" width="200" fixed="right">
+            <template slot-scope="{ row }">
+            <el-row>
+                <el-col>
+                <el-link
+                    type="primary"
+                    :underline="false"
+                    @click="handleView(row)"
+                    >查看详情</el-link
+                >-
+                <el-link
+                    type="primary"
+                    :underline="false"
+                    @click="handleEdit(row)"
+                    >编辑</el-link
+                >-
+                <el-link
+                    type="danger"
+                    :underline="false"
+                    @click="handleDelete(row)"
+                    >删除</el-link>
+                </el-col>
+            </el-row>
+            </template>
+        </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <memberInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></memberInfo-detail>
+    <memberInfo-view
+      v-if="showModal2"
+      :businessKey="businessKey"
+      :title="modalTitle2"
+      @close="onDetailModalClose2"
+    ></memberInfo-view>
+  </div>
+</template>
+<script>
+
+import memberInfoDetail from "./memberInfo-detail";
+import memberInfoApi from "@/api/base/memberInfo";
+import memberInfoView from './memberInfo-view.vue';
+
+export default {
+  name: "BaseNewsTypeList",
+  data() {
+    var self = this;
+    return {
+      queryModel: {
+        name: "",
+      },
+      loading: false,
+      tableData: [],
+      treeData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      showModal2: false,
+      modalTitle: "",
+      modalTitle2: "",
+      businessKey: "",
+      tableHeight: 300,
+      showDeviceModal: false,
+      orgResult: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      batchImportVisible: false,
+      batchImportFileList: [],
+      xlsLoading: false,
+      sceneData: [],
+      typeData: [],
+      deviceRelationTitle: "",
+      showIconModal: false,
+      iconModalTitle: "",
+    };
+  },
+  created() {
+
+    this.changePage(1);
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("name", self.queryModel.name);
+
+      memberInfoApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+          //45为分页栏的高度
+          //页面高度-列表上面的高度-分页栏高度
+          self.tableHeight =
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 100;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleView(record) {
+      this.modalTitle2 = "会员详情";
+      this.businessKey = record.id;
+      this.showModal2 = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          memberInfoApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        memberInfoApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    onDetailModalClose2(refreshed) {
+      //保存成功后回调
+      this.showModal2 = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {},
+  components: {
+    "memberInfo-detail": memberInfoDetail,
+    "memberInfo-view": memberInfoView,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/memberInfo-view.vue

@@ -0,0 +1,433 @@
+
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="true"
+    append-to-body
+    style="text-align:left;"
+    width="1250px"
+    :close-on-click-modal="false"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+        <el-form ref="form" :model="formModel" inline :rules="ruleValidate" :label-width="'100px'">
+            <el-container>
+                <el-aside width="900px">
+                    <span class="span-realName">{{formModel.realName}}</span> 
+                    <el-row>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="联系方式：">
+                                    <span class="grid-content-span">{{formModel.phone}}</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="会员ID：">
+                                    <span class="grid-content-span">NO0001</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="审核状态：">
+                                    <span class="grid-content-span" v-if="formModel.status=='0'" style="color:red">未审核</span>
+                                    <span class="grid-content-span" v-else-if="formModel.status=='1'" style="color:green">已审核</span>
+                                    <span class="grid-content-span" v-else-if="formModel.status=='2'">审核不通过</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="身份证号：">
+                                    <span class="grid-content-span">{{formModel.idCard}}</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="性别：">
+                                    <span class="grid-content-span" v-if="formModel.gender">女</span>
+                                    <span class="grid-content-span" v-else>男</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="行业：">
+                                    <span class="grid-content-span">{{formModel.industryN}}</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="出生年月：">
+                                    <span class="grid-content-span">{{formModel.birthday}}</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="年龄：">
+                                    <span class="grid-content-span">28岁</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="职业：">
+                                    <span class="grid-content-span">{{formModel.birthday}}</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="出生地：">
+                                    <span class="grid-content-span">{{formModel.birthplace}}</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="学历：">
+                                    <span class="grid-content-span">{{formModel.educationN}}</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="月薪：">
+                                    <span class="grid-content-span">{{formModel.salaryRangeN}}</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="户口所在地：">
+                                    <span class="grid-content-span">{{formModel.registeredResidence}}</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="身高：">
+                                    <span class="grid-content-span">{{formModel.height}}CM</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="工作单位：">
+                                    <span class="grid-content-span">{{formModel.workUnit}}</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="工作所在地：">
+                                    <span class="grid-content-span">{{formModel.workplace}}</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="体重：">
+                                    <span class="grid-content-span">{{formModel.weight}}kg</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="住房状况：">
+                                    <span class="grid-content-span">{{formModel.housingSituationN}}</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                    </el-row>
+                                        <el-row>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="婚姻状况：">
+                                    <span class="grid-content-span">{{formModel.maritalStatusN}}</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="子女情况：">
+                                    <span class="grid-content-span">{{formModel.childStatusN}}</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <el-form-item label="信息公开：">
+                                    <span class="grid-content-span" v-if="formModel.publicNot">公开</span>
+                                    <span class="grid-content-span" v-else style="color:red">不公开</span>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                    </el-row>
+                    <el-divider></el-divider>
+                    <div class="hobby-div">
+                        <h1>兴趣爱好</h1>
+                        <el-tag type="danger" v-for="item in formModel.hobbyInfoList" v-bind:key="item">
+                            {{item.name}}
+                        </el-tag>
+                    </div>
+                    <el-divider></el-divider>
+                    <h1>自我评价</h1> 
+                    <p class="p-content">
+                        {{formModel.selfEvaluation}}
+                    </p>
+                    <el-divider></el-divider>
+                    <h1>择偶标准</h1> 
+                    <div>
+                        <el-form ref="form2" :model="formModel2" inline :rules="ruleValidate" :label-width="'100px'">
+                        <el-row>
+                            <el-col :span="8">
+                                <div class="grid-content bg-purple">
+                                    <el-form-item label="年龄范围：">
+                                        <span class="grid-content-span">{{formModel.taAgeRangeN}}</span>
+                                    </el-form-item>
+                                </div>
+                            </el-col>
+                            <el-col :span="8">
+                                <div class="grid-content bg-purple">
+                                    <el-form-item label="月薪：">
+                                        <span class="grid-content-span">{{formModel.taIncomeRangeN}}</span>
+                                    </el-form-item>
+                                </div>
+                            </el-col>
+                            <el-col :span="8">
+                                <div class="grid-content bg-purple">
+                                    <el-form-item label="学历：">
+                                        <span class="grid-content-span">{{formModel.taEduN}}</span>
+                                    </el-form-item>
+                                </div>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="8">
+                                <div class="grid-content bg-purple">
+                                    <el-form-item label="职业：">
+                                        <span class="grid-content-span">{{formModel.taOccupationN}}</span>
+                                    </el-form-item>
+                                </div>
+                            </el-col>
+                            <el-col :span="8">
+                                <div class="grid-content bg-purple">
+                                    <el-form-item label="工作地区：">
+                                        <span class="grid-content-span">{{formModel.taWorkplace}}</span>
+                                    </el-form-item>
+                                </div>
+                            </el-col>
+                            <el-col :span="8">
+                                <div class="grid-content bg-purple">
+                                    <el-form-item label="其他要求：">
+                                        <span class="grid-content-span">{{formModel.taOther}}</span>
+                                    </el-form-item>
+                                </div>
+                            </el-col>
+                        </el-row>
+                        </el-form>
+                    </div>
+                </el-aside>
+            <el-main>
+                <div class="right-main">
+                    <el-image
+                    style="width: 200px; height: 200px"
+                    :src="formModel.faceImage"
+                    fit="fit">
+                    </el-image>
+                </div>
+                <div class="right-button-group">
+                    <el-row class="right-button-group-row">
+                        <el-col :span="12">
+                            <el-button type="primary" plain @click="dialog = true">编辑资料</el-button>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-button type="warning" plain>删除档案</el-button>
+                        </el-col>
+                    </el-row>
+                     <el-row v-if="formModel.status=='0'">
+                         <el-col :span="12">
+                            <el-button type="danger" plain style="width:100px">不通过</el-button>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-button type="success" plain>审核通过</el-button>
+                        </el-col>
+                     </el-row>
+                </div>
+            </el-main>
+            </el-container>
+        </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import memberInfoApi from "@/api/base/memberInfo";
+
+export default {
+  props: ["businessKey", "title","companyResult"],
+  computed: {
+      ruleValidate (){
+        var rules = null;
+        rules = {
+            realName: [
+                { required: true, message: "真实姓名不能为空", trigger: "blur" }
+            ],
+            idCard: [
+                { required: true, message: "身份证号不能为空", trigger: "blur" }
+            ],
+            orgId: [
+                { required: true, message: "所属工会不能为空", trigger: "blur" }
+            ],
+        };
+        return rules;
+      }
+  },
+  data() {
+    return {
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      formModel: {},
+      formModel2: {},
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return memberInfoApi.add(self.formModel);
+            } else {
+              return memberInfoApi.update(self.formModel);
+            }
+          })().then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success",
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning",
+              });
+
+              //self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+  },
+  created() {
+    var self = this;
+
+    //self.loadTree();
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+        return memberInfoApi.view(self.businessKey);
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.user-panel {
+  margin: 10px auto;
+}
+.span-realName{
+    font-weight: bold;
+    font-size: 24px;
+    line-height: 40px;
+}
+
+  .el-aside {
+    margin:0px 0px 0px 20px
+  }
+  .el-row{
+      line-height: 30px;
+  }
+  .row-bg {
+    padding: 10px 0;
+  }
+  .el-form-item{
+      margin-bottom: 0px;
+      
+      .el-form-item__label{
+        font-size: 12px;
+      }
+  }
+
+  .grid-content-span{
+    font-weight: bold;
+  }
+  .right-main{
+      text-align: center;
+      margin-top: 30px;
+  }
+  .right-button-group{
+      margin-top: 90px;
+      text-align: center;
+  }
+  .el-tag{
+      margin-left: 20px;
+  }
+  .right-button-group-row{
+      margin-bottom: 10px;
+  }
+  .hobby-div{
+      margin-bottom: 50px;
+  }
+  .p-content{
+      line-height: 30px;
+  }
+
+</style>

src/views/base/newsInfo-detail.vue

@@ -0,0 +1,242 @@
+
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="true"
+    append-to-body
+    style="text-align:left;"
+    width="800px"
+    :close-on-click-modal="false"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+        <el-form-item label="新闻类别" prop="newsTypeId">
+          <el-select
+            v-model="formModel.newsTypeId"
+            placeholder="请选择"
+            style="width: 90%"
+          >
+            <el-option
+              v-for="item in newsTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="新闻标题" prop="title">
+          <el-input v-model="formModel.title" placeholder="请输入新闻标题" style="width: 90%"></el-input>
+        </el-form-item>
+        <el-form-item label="新闻图片" prop="images">
+          <el-upload
+                class="avatar-uploader"
+                name="photoFile"
+                :action="uploadUrl"
+                :show-file-list="false"
+                :headers="headers"
+                :data="uploadData"
+                :on-success="handleAvatarSuccess"
+                :before-upload="beforeAvatarUpload"
+              >
+                <img v-if="fileUrl" :src="fileUrl" class="avatar" />
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+        </el-form-item>
+        <el-form-item label="新闻作者" prop="author">
+          <el-input v-model="formModel.author" placeholder="请输入新闻作者" style="width: 90%"></el-input>
+        </el-form-item>
+        <el-form-item label="新闻内容" prop="content">
+            <mce-editor
+                ref="editor"
+                uploadName="upfile"
+                v-model="formModel.content"
+                :url="uploadUrl"
+                :config="editorConfig"
+                style="width: 90%"
+            ></mce-editor>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import newsInfoApi from "@/api/base/newsInfo";
+import MceEditor from "@/components/Tinymce";
+import newsTypeApi from "@/api/base/newsType";
+
+import { getToken } from "@/utils/auth"; // get token from cookie
+
+export default {
+  props: ["businessKey", "title","companyResult"],
+  computed: {
+      ruleValidate (){
+        var rules = null;
+        rules = {
+            newsTypeId: [
+                { required: true, message: "类别名称不能为空", trigger: "blur" }
+            ],
+            title: [
+                { required: true, message: "新闻标题不能为空", trigger: "blur" }
+            ],
+            content: [
+                { required: true, message: "新闻内容不能为空", trigger: "blur" }
+            ],
+        };
+        return rules;
+      }
+  },
+  data() {
+    return {
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      formModel: {
+        id:"",
+        titel:"",
+        content:"",
+        images:"",
+        author:"",
+      },
+      newsTypeList: [],
+      //上传地址
+      uploadUrl: Constant.serverUrl + "/uploadPicture",
+      uploadData: {
+        subFolder: "newsInfo",
+      },
+      fileUrl: "",
+      headers: {
+        Authorization: getToken(),
+      },
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if(self.fileUrl!=null&&self.fileUrl!=""){
+              self.formModel.images = self.fileUrl;
+            }
+
+            if (id == null || id.length == 0) {
+              return newsInfoApi.add(self.formModel);
+            } else {
+              return newsInfoApi.update(self.formModel);
+            }
+          })().then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success",
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning",
+              });
+
+              //self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+    handleAvatarSuccess(res, file) {
+      var self = this;
+      self.formModel.faceImageUrl = res.data;
+      self.fileUrl =
+        res.data + "?x-oss-process=image/resize,m_lfit,h_300,w_300";
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === "image/jpeg";
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
+      if (!isJPG) {
+        this.$message.error("上传头像图片只能是 JPG 格式!");
+      }
+      if (!isLt2M) {
+        this.$message.error("上传头像图片大小不能超过 2MB!");
+      }
+      return isJPG && isLt2M;
+    },
+  },
+  created() {
+    var self = this;
+
+    newsTypeApi.list().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.newsTypeList = jsonData.data;
+        }
+      }
+    });
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return newsInfoApi.create();
+      } else {
+        return newsInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+
+          let images = self.formModel.images;
+          if (images != null) {
+            self.fileUrl = images 
+          }
+
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+  components: {
+    "mce-editor": MceEditor,
+  },
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.user-panel {
+  margin: 10px auto;
+}
+.input-form-main{
+    width: 300px;
+}
+.link-span{
+    margin-right: 20px;
+}
+.el-form-item{
+    margin-bottom: 25px;
+}
+</style>

src/views/base/newsInfo-list.vue

@@ -0,0 +1,344 @@
+<template>
+  <div style="padding-left: 5px">
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">基础信息管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/newsType">新闻类别管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="新闻标题" prop="title">
+        <el-input type="text" size="mini" v-model="queryModel.title"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        @click="handleAdd"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-remove"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchDelete"
+        >删除选中项</el-button
+      >
+    </el-row>
+    <el-table
+      ref="formTable"
+      :data="tableData"
+      v-loading="loading"
+      stripe
+      :height="tableHeight"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column
+        prop="newsTypeName"
+        label="新闻类别"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="title"
+        label="新闻标题"
+        width="200"
+      ></el-table-column>
+      <el-table-column
+        prop="content"
+        label="新闻内容"
+        width="300"
+        :show-overflow-tooltip="true"
+      ></el-table-column>
+      <el-table-column prop="images" label="新闻图片" >
+        <template slot-scope="{ row }">
+            <a v-if="row.images" :href="row.images" target="_blank">
+                <el-image
+                :size="50"
+                :src="row.images"
+                :key="row.id"
+                ></el-image>
+            </a>
+        </template>
+      </el-table-column>
+     <el-table-column
+        prop="visitorsNum"
+        label="浏览人数"
+      ></el-table-column>
+        <el-table-column
+        prop="author"
+        label="新闻作者"
+      ></el-table-column>
+      <el-table-column
+        prop="createTime"
+        label="创建时间"
+        width="150"
+      ></el-table-column>
+      <el-table-column label="操作" fixed="right">
+        <template slot-scope="{ row }">
+          <el-row>
+            <el-col>
+              <el-link
+                type="primary"
+                :underline="false"
+                @click="handleEdit(row)"
+                >编辑</el-link
+              >-
+              <el-link
+                type="danger"
+                :underline="false"
+                @click="handleDelete(row)"
+                >删除</el-link>
+            </el-col>
+          </el-row>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <newsInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></newsInfo-detail>
+  </div>
+</template>
+<script>
+
+import newsInfoDetail from "./newsInfo-detail";
+import newsInfoApi from "@/api/base/newsInfo";
+
+export default {
+  name: "BaseNewsInfoList",
+  data() {
+    var self = this;
+    return {
+      queryModel: {
+        title: "",
+      },
+      loading: false,
+      tableData: [],
+      treeData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      tableHeight: 300,
+      showDeviceModal: false,
+      companyId: "",
+      qrCode: "",
+      companyResult: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      batchImportVisible: false,
+      batchImportFileList: [],
+      xlsLoading: false,
+      sceneData: [],
+      typeData: [],
+      deviceRelationTitle: "",
+      showIconModal: false,
+      iconModalTitle: "",
+    };
+  },
+  created() {
+
+    this.changePage(1);
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("title", self.queryModel.title);
+
+      newsInfoApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+          //45为分页栏的高度
+          //页面高度-列表上面的高度-分页栏高度
+          self.tableHeight =
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 100;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          newsInfoApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        newsInfoApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+      this.showDeviceModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {},
+  components: {
+    "newsInfo-detail": newsInfoDetail,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/newsType-detail.vue

@@ -0,0 +1,150 @@
+
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="true"
+    append-to-body
+    style="text-align:left;"
+    width="500px"
+    :close-on-click-modal="false"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="formModel" inline :rules="ruleValidate" :label-width="'100px'">
+        <el-form-item label="类别名称" prop="name">
+          <el-input v-model="formModel.name" placeholder="请输入新闻类别名称" style="width:300px"></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import newsTypeApi from "@/api/base/newsType";
+
+export default {
+  props: ["businessKey", "title","companyResult"],
+  computed: {
+      ruleValidate (){
+        var rules = null;
+        rules = {
+            name: [
+                { required: true, message: "类别名称不能为空", trigger: "blur" }
+            ],
+        };
+        return rules;
+      }
+  },
+  data() {
+    return {
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      formModel: {
+        id:"",
+        name:"",
+        parentId:"",
+      },
+      templateList: [],
+      defaultPriceList:[],
+      chargingStationResult:[],
+      orgResult:[],
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children"
+      },
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return newsTypeApi.add(self.formModel);
+            } else {
+              return newsTypeApi.update(self.formModel);
+            }
+          })().then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success",
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning",
+              });
+
+              //self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+  },
+  created() {
+    var self = this;
+
+    //self.loadTree();
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return newsTypeApi.create();
+      } else {
+        return newsTypeApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.user-panel {
+  margin: 10px auto;
+}
+.input-form-main{
+    width: 300px;
+}
+.link-span{
+    margin-right: 20px;
+}
+.el-form-item{
+    margin-bottom: 25px;
+}
+</style>

src/views/base/newsType-list.vue

@@ -0,0 +1,313 @@
+<template>
+  <div style="padding-left: 5px">
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">基础信息管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/newsType">新闻类别管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="类别名称" prop="name">
+        <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        @click="handleAdd"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-remove"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchDelete"
+        >删除选中项</el-button
+      >
+    </el-row>
+    <el-table
+      ref="formTable"
+      :data="tableData"
+      v-loading="loading"
+      stripe
+      :height="tableHeight"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column
+        prop="name"
+        label="新闻类别名称"
+        width="200"
+      ></el-table-column>
+      <el-table-column
+        prop="createTime"
+        label="创建时间"
+      ></el-table-column>
+      <el-table-column label="操作" width="350" fixed="right">
+        <template slot-scope="{ row }">
+          <el-row>
+            <el-col>
+              <el-link
+                type="primary"
+                :underline="false"
+                @click="handleEdit(row)"
+                >编辑</el-link
+              >-
+              <el-link
+                type="danger"
+                :underline="false"
+                @click="handleDelete(row)"
+                >删除</el-link>
+            </el-col>
+          </el-row>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <newsType-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></newsType-detail>
+  </div>
+</template>
+<script>
+
+import newsTypeDetail from "./newsType-detail";
+import newsTypeApi from "@/api/base/newsType";
+
+export default {
+  name: "BaseNewsTypeList",
+  data() {
+    var self = this;
+    return {
+      queryModel: {
+        name: "",
+      },
+      loading: false,
+      tableData: [],
+      treeData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      tableHeight: 300,
+      showDeviceModal: false,
+      companyId: "",
+      qrCode: "",
+      companyResult: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      batchImportVisible: false,
+      batchImportFileList: [],
+      xlsLoading: false,
+      sceneData: [],
+      typeData: [],
+      deviceRelationTitle: "",
+      showIconModal: false,
+      iconModalTitle: "",
+    };
+  },
+  created() {
+
+    this.changePage(1);
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("name", self.queryModel.name);
+
+      newsTypeApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+          //45为分页栏的高度
+          //页面高度-列表上面的高度-分页栏高度
+          self.tableHeight =
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 100;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          newsTypeApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        newsTypeApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+      this.showDeviceModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {},
+  components: {
+    "newsType-detail": newsTypeDetail,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>