Merge branch 'dev-baobiao0808'

epmet-oper-web/src/main.js

@@ -4,7 +4,6 @@ import Element from 'element-ui'
 import App from '@/App'
 import i18n from '@/i18n'
 import router from '@/router'
-// import store1 from '@/store'
 import '@/icons'
 import '@/element-ui/theme/index.css'
 import '@/assets/scss/aui.scss'

epmet-oper-web/src/store/index.js

@@ -1,44 +0,0 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
-import cloneDeep from 'lodash/cloneDeep'
-import user from './modules/user'
-
-Vue.use(Vuex)
-
-export default new Vuex.Store({
-  namespaced: true,
-  state: {
-    // 导航条, 布局风格, defalut(白色) / colorful(鲜艳)
-    navbarLayoutType: 'colorful',
-    // 侧边栏, 布局皮肤, default(白色) / dark(黑色)
-    sidebarLayoutSkin: 'dark',
-    // 侧边栏, 折叠状态
-    sidebarFold: false,
-    // 侧边栏, 菜单
-    sidebarMenuList: [],
-    sidebarMenuActiveName: '',
-    // 内容, 是否需要刷新
-    contentIsNeedRefresh: false,
-    // 内容, 标签页(默认添加首页)
-    contentTabs: [
-      {
-        ...window.SITE_CONFIG['contentTabDefault'],
-        'name': 'home',
-        'title': 'home'
-      }
-    ],
-    contentTabsActiveName: 'home'
-  },
-  modules: {
-    user
-
-  },
-  mutations: {
-    // 重置vuex本地储存状态
-    resetStore (state) {
-      Object.keys(state).forEach((key) => {
-        state[key] = cloneDeep(window.SITE_CONFIG['storeState'][key])
-      })
-    }
-  }
-})

epmet-oper-web/src/store/modules/user.js

@@ -1,8 +0,0 @@
-export default {
-  state: {
-    id: 0,
-    name: '',
-    realName: '',
-    superAdmin: 0
-  }
-}

epmet-oper-web/src/utils/index.js

@@ -1,5 +1,5 @@
 import Cookies from 'js-cookie'
-import store from '@/store'
+import store from '@/js/store'
 
 /**
  * 获取字典数据列表

epmet-oper-web/src/utils/request.js

@@ -68,4 +68,22 @@ http.interceptors.response.use(response => {
   return Promise.reject(error)
 })
 
+// http.put = function (url, data, config) {
+//   http.post(url, data, {
+//     ...config,
+//     headers: {
+
+// };
+// "X-HTTP-Method-Override": "PUT",
+//     },
+//   });
+// };
+
+// http.delete = function (url, config) {
+//   http.post(url, config.data || {}, {
+//     ...config,
+//     headers: {
+//       "X-HTTP-Method-Override": "DELETE",
+//     },
+//   });
 export default http