Merge pull request #22 from wenjianzhang/v1.0.0

V1.0.0

src/api/calendar.js

@@ -1,29 +0,0 @@
-import request from '@/utils/request'
-
-export function GetCalendarList(query) {
-  return request({
-    url: '/api/v1/calendar',
-    method: 'get',
-    params: query
-  })
-}
-export function CreateCalendar(value) {
-  return request({
-    url: '/api/v1/calendar',
-    method: 'post',
-    data: value
-  })
-}
-export function UpdateCalendar(id, value) {
-  return request({
-    url: '/api/v1/calendar/' + id,
-    method: 'put',
-    data: value
-  })
-}
-export function DeleteCalendar(id) {
-  return request({
-    url: '/api/v1/calendar/' + id,
-    method: 'delete'
-  })
-}

src/directive/permission/index.js

@@ -9,7 +9,8 @@ const install = function(Vue) {
 if (window.Vue) {
   window['permission'] = permission
   window['permisaction'] = permisaction
-  Vue.use(install); // eslint-disable-line
+  // eslint-disable-next-line no-undef
+  Vue.use(install)
 }
 
 permission.install = install

src/layout/components/Sidebar/Logo.vue

@@ -24,7 +24,7 @@ export default {
   },
   data() {
     return {
-      title: 'DEV后台管理系统',
+      title: 'go-admin后台管理系统',
       logo: 'https://gitee.com/mydearzwj/image/raw/master/img/go-admin.png'
     }
   }

src/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: 'DEV后台管理系统',
+  title: 'go-admin后台管理系统',
 
   /**
    * @type {boolean} true | false

src/store/modules/user.js

@@ -8,7 +8,8 @@ const state = {
   avatar: '',
   introduction: '',
   roles: [],
-  permissions: []
+  permissions: [],
+  permisaction: []
 }
 
 const mutations = {

src/utils/request.js

@@ -44,10 +44,9 @@ service.interceptors.response.use(
    */
   response => {
     const code = response.data.code
-    debugger
     if (code === 401) {
       store.dispatch('user/resetToken')
-      if (URL.indexOf('login') !== -1) {
+      if (location.href.indexOf('login') !== -1) {
         location.reload() // 为了重新实例化vue-router对象 避免bug
       } else {
         MessageBox.confirm(
@@ -76,7 +75,7 @@ service.interceptors.response.use(
         location.reload() // 为了重新实例化vue-router对象 避免bug
       })
       return false
-    } else if (code === 400) {
+    } else if (code === 400 || code === 403) {
       Message({
         message: response.data.msg,
         type: 'error',

src/utils/zipdownload.js

@@ -18,6 +18,15 @@ export function downLoadZip(str, filename) {
     resolveBlob(res, mimeMap.zip)
   })
 }
+
+export function downLoadFile(str) {
+  var url = baseUrl + str
+  const aLink = document.createElement('a')
+  aLink.href = url
+  document.body.appendChild(aLink)
+  aLink.click()
+  document.body.appendChild(aLink)
+}
 /**
  * 解析blob响应内容并下载
  * @param {*} res blob响应内容

src/views/calendar/index.vue

@@ -1,58 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-calendar>
-      <!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
-      <template
-        slot="dateCell"
-        slot-scope="{date, data}"
-      >
-        <el-row :gutter="24">
-          <el-col :span="18">
-            <div :class="data.isSelected ? 'is-selected' : ''">
-              {{ data.day.split('-')[2] }} {{ data.isSelected ? '✔️' : '' }}
-            </div>
-          </el-col>
-          <el-col :span="6">
-            <div class="gz">
-              {{ getData(data).term }}
-            </div>
-          </el-col>
-        </el-row>
-        <div class="gz">
-          {{ getData(data).gzYear }}年 {{ getData(data).gzMonth }}月 {{ getData(data).gzDay }}日
-        </div>
-        <div class="gz">
-          {{ getData(data).monthCn }}-{{ getData(data).dayCn }}
-        </div>
-
-      </template>
-    </el-calendar>
-  </div>
-</template>
-<script>
-import solarLunar from 'solarlunar'
-export default {
-  methods: {
-    getData(data) {
-      console.log(data)
-      var list = data.day.split('-')
-      var solar2lunarData = solarLunar.solar2lunar(list[0], list[1], list[2])
-      return solar2lunarData
-    }
-  }
-}
-</script>
-<style>
-  .is-selected {
-    color: #1989FA;
-  }
-  .gz{
-      font-size: 10px;
-      margin-top: 3px;
-  }
-  .gz > .greenc{      color:green;}
-  .gz > .redc{      color: red;}
-  .gz > .bluec{color: blue}
-  .gz > .goldc{color: gold}
-  .gz > .siennac{color: sienna}
-</style>

src/views/dept/index.vue

@@ -56,7 +56,11 @@
           >{{ statusFormat(scope.row) }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createdAt" width="200" />
+      <el-table-column label="创建时间" align="center" prop="createdAt" width="200">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdAt) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

src/views/login/index.vue

@@ -3,7 +3,7 @@
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on" label-position="left">
 
       <div class="title-container">
-        <h3 class="title">DEV后台管理系统</h3>
+        <h3 class="title">go-admin后台管理系统</h3>
       </div>
 
       <el-form-item prop="username">

src/views/role/index.vue

@@ -361,19 +361,17 @@ export default {
     // 所有部门节点数据
     getDeptAllCheckedKeys() {
       // 目前被选中的部门节点
-      const checkedKeys = this.$refs.dept.getHalfCheckedKeys()
+      const checkedKeys = this.$refs.dept.getCheckedKeys()
       // 半选中的部门节点
-      const halfCheckedKeys = this.$refs.dept.getCheckedKeys()
-      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
+      // const halfCheckedKeys = this.$refs.dept.getCheckedKeys()
+      // checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
       return checkedKeys
     },
     /** 根据角色ID查询菜单树结构 */
     getRoleMenuTreeselect(roleId) {
       roleMenuTreeselect(roleId).then(response => {
         this.menuOptions = response.menus
-        if (response.checkedKeys.length > 0) {
-          this.$refs.menu.setCheckedKeys(response.checkedKeys)
-        }
+        this.$refs.menu.setCheckedKeys(response.checkedKeys)
       })
     },
     /** 根据角色ID查询部门树结构 */
@@ -454,7 +452,6 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
-
       const roleId = row.roleId || this.ids
       this.$nextTick(() => {
         this.getRoleMenuTreeselect(roleId)
@@ -511,7 +508,7 @@ export default {
     submitDataScope: function() {
       if (this.form.roleId !== undefined) {
         this.form.deptIds = this.getDeptAllCheckedKeys()
-
+        console.log(this.getDeptAllCheckedKeys())
         dataScope(this.form).then(response => {
           if (response.code === 200) {
             this.msgSuccess('修改成功')

src/views/sysuser/index.vue

@@ -64,18 +64,6 @@
               />
             </el-select>
           </el-form-item>
-          <!-- <el-form-item label="创建时间">
-            <el-date-picker
-              v-model="dateRange"
-              size="small"
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            />
-          </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>
@@ -112,24 +100,6 @@
               @click="handleDelete"
             >删除</el-button>
           </el-col>
-          <!-- <el-col :span="1.5">
-            <el-button
-              v-permisaction="['system:sysuser:import']"
-              type="info"
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-            >导入</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              v-permisaction="['system:sysuser:export']"
-              type="warning"
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-            >导出</el-button>
-          </el-col> -->
         </el-row>
 
         <el-table
@@ -153,7 +123,7 @@
               />
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createdAt" width="160">
+          <el-table-column label="创建时间" align="center" prop="createdAt" width="165">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createdAt) }}</span>
             </template>

src/views/tools/gen/index.vue

@@ -89,12 +89,12 @@
         :show-overflow-tooltip="true"
         width="130"
       />
-      <el-table-column label="创建时间" align="center" prop="createdAt" width="160">
+      <el-table-column label="创建时间" align="center" prop="createdAt" width="165">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createdAt) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updatedAt" width="160">
+      <el-table-column label="更新时间" align="center" prop="updatedAt" width="165">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updatedAt) }}</span>
         </template>
@@ -122,13 +122,6 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
           >删除</el-button>
-          <!-- <el-button
-
-            type="text"
-            size="small"
-            icon="el-icon-download"
-            @click="handleGenTable(scope.row)"
-          >生成代码</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -159,7 +152,7 @@
 <script>
 import { listTable, previewTable, delTable } from '@/api/tools/gen'
 import importTable from './importTable'
-import { downLoadZip } from '@/utils/zipdownload'
+import { downLoadFile } from '@/utils/zipdownload'
 export default {
   name: 'Gen',
   components: { importTable },
@@ -195,7 +188,7 @@ export default {
         open: false,
         title: '代码预览',
         data: {},
-        activeName: 'domain.java'
+        activeName: 'api.go'
       }
     }
   },
@@ -227,12 +220,12 @@ export default {
     },
     /** 生成代码操作 */
     handleGenTable(row) {
-      const tableNames = row.tableName || this.tableNames
-      if (tableNames === '') {
+      const ids = row.tableId || this.ids
+      if (ids === '') {
         this.msgError('请选择要生成的数据')
         return
       }
-      downLoadZip('/tool/gen/batchGenCode?tables=' + tableNames, 'ruoyi')
+      downLoadFile('/api/v1/gen/gencode/' + ids)
     },
     /** 打开导入表弹窗 */
     openImportTable() {