src/api/system/book.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询muyu列表
+export function listBook(query) {
+  return request({
+    url: '/system/book/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询muyu详细
+export function getBook(id) {
+  return request({
+    url: '/system/book/' + id,
+    method: 'get'
+  })
+}
+
+// 新增muyu
+export function addBook(data) {
+  return request({
+    url: '/system/book',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改muyu
+export function updateBook(data) {
+  return request({
+    url: '/system/book/'+data.id,
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除muyu
+export function delBook(id) {
+  return request({
+    url: '/system/book/' + id,
+    method: 'delete'
+  })
+}

src/components/ImageUpload/index.vue

@@ -61,7 +61,7 @@ export default {
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["png", "jpg", "jpeg"],
+      default: () => ["png", "jpg", "jpeg","gif"],
     },
     // 是否显示提示
     isShowTip: {
@@ -149,7 +149,7 @@ export default {
     },
     // 上传成功回调
     handleUploadSuccess(res, file) {
-      if (res.data.code === 200) {
+      if (res.code === 200) {
         this.uploadList.push({name: res.data.url, url: res.data.url});
         this.uploadedSuccessfully();
       } else {

src/utils/request.js

@@ -73,7 +73,6 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(res => {
-  debugger
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
     // 获取错误信息

src/views/system/book/index.vue

@@ -0,0 +1,342 @@
+<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="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入书籍名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="作者" prop="auther">
+        <el-input
+          v-model="queryParams.auther"
+          placeholder="请输入作者"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="上架时间">
+        <el-date-picker
+          v-model="daterangeShelTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </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="['system:book: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="['system:book: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="['system:book:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:book:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="bookList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="书籍名称" align="center" prop="name" />
+      <el-table-column label="作者" align="center" prop="auther" />
+      <el-table-column label="类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.book_type" :value="scope.row.type ? scope.row.type.split(',') : []"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="图片" align="center" prop="url" width="100">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.url" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="书籍描述" align="center" prop="url" width="100">
+        <template slot-scope="scope">
+          <span v-html="scope.row.message"></span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="上架时间" align="center" prop="shelTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.shelTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:book:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:book: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"
+    />
+
+    <!-- 添加或修改muyu对话框 -->
+    <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="name">
+          <el-input v-model="form.name" placeholder="请输入书籍名称" />
+        </el-form-item>
+        <el-form-item label="作者" prop="auther">
+          <el-input v-model="form.auther" placeholder="请输入作者" />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-checkbox-group v-model="form.type">
+            <el-checkbox
+              v-for="dict in dict.type.book_type"
+              :key="dict.value"
+              :label="dict.value">
+              {{dict.label}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <el-form-item label="图片" prop="url">
+          <image-upload v-model="form.url"/>
+        </el-form-item>
+
+        <el-form-item label="书籍描述">
+          <editor v-model="form.message" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="上架时间" prop="shelTime">
+          <el-date-picker clearable
+                          v-model="form.shelTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择上架时间">
+          </el-date-picker>
+        </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 { listBook, getBook, delBook, addBook, updateBook } from "@/api/system/book";
+
+export default {
+  name: "Book",
+  dicts: ['book_type'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // muyu表格数据
+      bookList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 上架时间时间范围
+      daterangeShelTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        auther: null,
+        type: null,
+        message: null,
+        shelTime: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询muyu列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeShelTime && '' != this.daterangeShelTime) {
+        this.queryParams.params["beginShelTime"] = this.daterangeShelTime[0];
+        this.queryParams.params["endShelTime"] = this.daterangeShelTime[1];
+      }
+      listBook(this.queryParams).then(response => {
+        this.bookList = response.data.rows;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        auther: null,
+        type: [],
+        url: null,
+        userId: null,
+        deptId: null,
+        message: null,
+        remark: null,
+        shelTime: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeShelTime = [];
+      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 = "添加muyu";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getBook(id).then(response => {
+        this.form = response.data;
+        this.form.type = this.form.type.split(",");
+        this.open = true;
+        this.title = "修改muyu";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.form.type = this.form.type.join(",");
+          if (this.form.id != null) {
+            updateBook(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBook(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除muyu编号为"' + ids + '"的数据项？').then(function() {
+        return delBook(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/book/export', {
+        ...this.queryParams
+      }, `book_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/tool/gen/editTable.vue

@@ -183,7 +183,7 @@ export default {
       const basicForm = this.$refs.basicInfo.$refs.basicInfoForm;
       const genForm = this.$refs.genInfo.$refs.genInfoForm;
       Promise.all([basicForm, genForm].map(this.getFormPromise)).then(res => {
-        const validateResult = res.data.every(item => !!item);
+        const validateResult = res.every(item => !!item);
         if (validateResult) {
           const genTable = Object.assign({}, basicForm.model, genForm.model);
           genTable.columns = this.columns;
@@ -194,7 +194,7 @@ export default {
             parentMenuId: genTable.parentMenuId
           };
           updateGenTable(genTable).then(res => {
-            this.$modal.msgSuccess(res.data.msg);
+            this.$modal.msgSuccess(res.msg);
             if (res.code === 200) {
               this.close();
             }

src/views/tool/gen/importTable.vue

@@ -108,7 +108,7 @@ export default {
         return;
       }
       importTable({tables: tableNames}).then(res => {
-        this.$modal.msgSuccess(res.data.msg);
+        this.$modal.msgSuccess("导入成功");
         this.visible = false;
         this.$emit("ok");
       });