merge

README.md

@@ -1,89 +1,7 @@
-# vue-admin-template
+### dy-admin-manager
 
-English | [简体中文](./README-zh.md)
+#### 项目简介
 
-> A minimal vue admin template with Element UI & axios & iconfont & permission control & lint
+本项目为管理后台系统。
 
-**Live demo:** http://panjiachen.github.io/vue-admin-template
-
-
-**The current version is `v4.0+` build on `vue-cli`. If you want to use the old version , you can switch branch to [tag/3.11.0](https://github.com/PanJiaChen/vue-admin-template/tree/tag/3.11.0), it does not rely on `vue-cli`**
-
-## Build Setup
-
-
-```bash
-# clone the project
-git clone https://github.com/PanJiaChen/vue-admin-template.git
-
-# enter the project directory
-cd vue-admin-template
-
-# install dependency
-npm install
-
-# develop
-npm run dev
-```
-
-This will automatically open http://localhost:9528
-
-## Build
-
-```bash
-# build for test environment
-npm run build:stage
-
-# build for production environment
-npm run build:prod
-```
-
-## Advanced
-
-```bash
-# preview the release environment effect
-npm run preview
-
-# preview the release environment effect + static resource analysis
-npm run preview -- --report
-
-# code format check
-npm run lint
-
-# code format check and auto fix
-npm run lint -- --fix
-```
-
-Refer to [Documentation](https://panjiachen.github.io/vue-element-admin-site/guide/essentials/deploy.html) for more information
-
-## Demo
-
-![demo](https://github.com/PanJiaChen/PanJiaChen.github.io/blob/master/images/demo.gif)
-
-## Extra
-
-If you want router permission && generate menu by user roles , you can use this branch [permission-control](https://github.com/PanJiaChen/vue-admin-template/tree/permission-control)
-
-For `typescript` version, you can use [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) (Credits: [@Armour](https://github.com/Armour))
-
-## Related Project
-
-[vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)
-
-[electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin)
-
-[vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template)
-
-## Browsers support
-
-Modern browsers and Internet Explorer 10+.
-
-| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari |
-| --------- | --------- | --------- | --------- |
-| IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions
-
-## License
-
-[MIT](https://github.com/PanJiaChen/vue-admin-template/blob/master/LICENSE) license.
-
-Copyright (c) 2017-present PanJiaChen
+主要使用 [Vue 2.X](https://cn.vuejs.org/v2/guide/)、[Element UI](https://element.eleme.io/#/zh-CN/component/installation)，进行封装

dist/static/css/chunk-22a7ecae.b252ee13.css

@@ -0,0 +1 @@
+.btns[data-v-1d89de46]{text-align:right}.remark[data-v-7dfb10a6]{display:inline;overflow:hidden;white-space:pre}

dist/static/css/chunk-750a728a.33481f89.css

@@ -1 +0,0 @@
-.btns[data-v-3b950f08]{text-align:right}.remark[data-v-2db81401]{display:inline;overflow:hidden;white-space:pre}

src/views/accompaniment/index.vue

@@ -178,7 +178,7 @@ export default {
     },
   },
   mounted() {
-    this.$store.dispatch('setSubject')
+    this.$store.dispatch('setSubjects')
     this.FetchList()
   },
   methods: {

src/views/accompaniment/modals/form.vue

@@ -68,7 +68,7 @@ export default {
     }
   },
   mounted() {
-    this.$store.dispatch('setSubject')
+    this.$store.dispatch('setSubjects')
     if (this.detail) {
       for (const key in this.form) {
         if (this.form.hasOwnProperty(key)) {