diff --git a/config/env.js b/config/env.js deleted file mode 100644 index e47b8144b..000000000 --- a/config/env.js +++ /dev/null @@ -1 +0,0 @@ -export default 'development' diff --git a/config/url.js b/config/url.js index c6fdf5835..581de634b 100644 --- a/config/url.js +++ b/config/url.js @@ -1,6 +1,4 @@ -import env from './env' - const DEV_URL = 'https://www.easy-mock.com/mock/5add9213ce4d0e69998a6f51/iview-admin/' const PRO_URL = 'https://produce.com' -export default env === 'development' ? DEV_URL : PRO_URL +export default process.env.NODE_ENV === 'development' ? DEV_URL : PRO_URL diff --git a/package-lock.json b/package-lock.json index 0da7ab9c6..76aae70d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14279,6 +14279,14 @@ "integrity": "sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg==", "dev": true }, + "vuedraggable": { + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.16.0.tgz", + "integrity": "sha512-fr9gcWKXMJlzbbtJcrQs4kU7qdOZqd4SEpAcx+r0nykbW8AygZN0aKVpadEtI53T8A2azhzCdXMvEqrLuKE2fA==", + "requires": { + "sortablejs": "1.7.0" + } + }, "vuex": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.0.1.tgz", diff --git a/package.json b/package.json index 8dafc1e6c..35f6e428a 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "vue": "^2.5.10", "vue-i18n": "^7.8.0", "vue-router": "^3.0.1", + "vuedraggable": "^2.16.0", "vuex": "^3.0.1", "wangeditor": "^3.1.1", "xlsx": "^0.13.3" diff --git a/src/api/data.js b/src/api/data.js index 824f3da6a..8bd8309a9 100644 --- a/src/api/data.js +++ b/src/api/data.js @@ -6,3 +6,10 @@ export const getTableData = () => { method: 'get' }) } + +export const getDragList = () => { + return axios.request({ + url: 'get_drag_list', + method: 'get' + }) +} diff --git a/src/components/drag-list/drag-list.vue b/src/components/drag-list/drag-list.vue new file mode 100644 index 000000000..664abc9a1 --- /dev/null +++ b/src/components/drag-list/drag-list.vue @@ -0,0 +1,92 @@ + + + + + + + {{ itemLeft }} + + + + + + + + {{ itemRight }} + + + + + + + diff --git a/src/components/drag-list/index.js b/src/components/drag-list/index.js new file mode 100644 index 000000000..d2bb9723a --- /dev/null +++ b/src/components/drag-list/index.js @@ -0,0 +1,2 @@ +import DragList from './drag-list.vue' +export default DragList diff --git a/src/main.js b/src/main.js index aa6a8f059..e88b35a98 100644 --- a/src/main.js +++ b/src/main.js @@ -13,9 +13,8 @@ import './index.less' import '@/assets/icons/iconfont.css' // import '@/mock' // 实际打包时应该不引入mock -import env from '../config/env' /* eslint-disable */ -env === 'development' ? require('@/mock') : '' +if (process.env.NODE_ENV !== 'production') require('@/mock') Vue.use(iView, { i18n: (key, value) => i18n.t(key, value) diff --git a/src/mock/data.js b/src/mock/data.js index 8a939d9fc..462624d73 100644 --- a/src/mock/data.js +++ b/src/mock/data.js @@ -1,5 +1,6 @@ import Mock from 'mockjs' import { doCustomTimes } from '@/libs/util' +const Random = Mock.Random export const getTableData = req => { let tableData = [] @@ -16,3 +17,18 @@ export const getTableData = req => { msg: '' } } + +export const getDragList = req => { + let dragList = [] + doCustomTimes(5, () => { + dragList.push(Mock.mock({ + name: Random.csentence(10, 13), + id: Random.increment(10) + })) + }) + return { + code: 200, + data: dragList, + msg: '' + } +} diff --git a/src/mock/index.js b/src/mock/index.js index a7e7832cb..a41a9edc1 100644 --- a/src/mock/index.js +++ b/src/mock/index.js @@ -1,11 +1,12 @@ import Mock from 'mockjs' import { login, logout, getUserInfo } from './login' -import { getTableData } from './data' +import { getTableData, getDragList } from './data' // 登录相关和获取用户信息 Mock.mock(/\/login/, login) Mock.mock(/\/get_info/, getUserInfo) Mock.mock(/\/logout/, logout) Mock.mock(/\/get_table_data/, getTableData) +Mock.mock(/\/get_drag_list/, getDragList) export default Mock diff --git a/src/router/routers.js b/src/router/routers.js index 5dec48c57..5b28e6871 100644 --- a/src/router/routers.js +++ b/src/router/routers.js @@ -86,6 +86,15 @@ export default [ }, component: () => import('@/view/components/count-to/count-to.vue') }, + { + path: 'drag_list_page', + name: 'drag_list_page', + meta: { + icon: 'ios-infinite', + title: '拖拽列表' + }, + component: () => import('@/view/components/drag-list/drag-list.vue') + }, { path: 'tables_page', name: 'tables_page', diff --git a/src/view/components/drag-list/drag-list.vue b/src/view/components/drag-list/drag-list.vue new file mode 100644 index 000000000..8fb75ff8b --- /dev/null +++ b/src/view/components/drag-list/drag-list.vue @@ -0,0 +1,113 @@ + + + + + + + + 待办事项 + {{ left.itemLeft.name }} + 完成事项 + {{ right.itemRight.name }} + + + + + 操作记录 + + {{ item }} + + + + {{ list1 }} + + + {{ list2 }} + + + + + + diff --git a/vue.config.js b/vue.config.js index ebe401a71..0c099e9bd 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,14 +1,9 @@ const path = require('path') -const fs = require('fs') const resolve = dir => { return path.join(__dirname, dir) } -const env = process.env.NODE_ENV || 'development' -fs.writeFileSync(path.join(__dirname, './config/env.js'), `export default '${env}' -`) - // 项目部署基础 // 默认情况下,我们假设你的应用将被部署在域的根目录下, // 例如:https://www.my-app.com/ @@ -39,4 +34,8 @@ module.exports = { }, // 打包时不生成.map文件 productionSourceMap: false + // 这里写你调用接口的基础路径,来解决跨域,如果设置了代理,那你本地开发环境的axios的baseUrl要写为 '' ,即空字符串 + // devServer: { + // proxy: 'localhost:3000' + // } }
{{ item }}
{{ list1 }}
{{ list2 }}