diff --git a/README.md b/README.md
index 3107866..e96935e 100644
--- a/README.md
+++ b/README.md
@@ -153,19 +153,29 @@ sudo dnf install php-pgsql
### 前端
-添加依赖(使用npm):
+添加依赖(**使用npm**):
```bash
-npm i element-ui @d2-projects/d2-crud -S
-npm install -S vue-cheetah-grid
-npm i @d2-projects/vue-table-export --save
+npm i element-ui \
+ @d2-projects/d2-crud \
+ vue-cheetah-grid \
+ @d2-projects/vue-table-export \
+ @d2-projects/vue-table-import \
+ github-markdown-css \
+ marked@^2.0.0 \
+ jschardet -S
```
-添加依赖(使用yarn):
+添加依赖(**使用yarn**):
```bash
-yarn add element-ui @d2-projects/d2-crud
-yarn add vue-cheetah-grid
-yarn add @d2-projects/vue-table-export
+yarn add element-ui \
+ @d2-projects/d2-crud \
+ vue-cheetah-grid \
+ @d2-projects/vue-table-export \
+ @d2-projects/vue-table-import \
+ github-markdown-css \
+ marked@^2.0.0 \
+ jschardet
```
需要在`main.js`中增加(全局引入组件):
@@ -179,11 +189,13 @@ import D2Crud from '@d2-projects/d2-crud'
import vueCheetahGrid from 'vue-cheetah-grid'
// 表格导出插件
import pluginExport from '@d2-projects/vue-table-export'
+import pluginImport from '@d2-projects/vue-table-import'
Vue.use(ElementUI)
Vue.use(D2Crud)
Vue.use(vueCheetahGrid)
Vue.use(pluginExport)
+Vue.use(pluginImport)
```
*(可选)* 在`package.json`里更改`element-ui`版本:
@@ -207,6 +219,9 @@ Vue.use(pluginExport)
┃ ┗ 📜tools.js
┣ 📂assets
┣ 📂components
+ ┃ ┣ 📂d2-markdown # 渲染markdown所需组件(在D2Admin的基础上精简了功能)
+ ┃ ┃ ┗ 📜index.vue
+ ┃ ┗ 📜index.js # 在此处注册d2-markdown
┣ 📂libs
┣ 📂locales
┣ 📂menu
diff --git a/package.json b/package.json
index ff5fb6b..a5fc483 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
"dependencies": {
"@d2-projects/d2-crud": "^2.1.2",
"@d2-projects/vue-table-export": "^1.1.3",
+ "@d2-projects/vue-table-import": "^1.0.1",
"axios": "^0.19.0",
"axios-mock-adapter": "^1.18.1",
"better-scroll": "^1.15.2",
@@ -23,10 +24,13 @@
"faker": "^4.1.0",
"flex.css": "^1.1.7",
"fuse.js": "^5.2.3",
+ "github-markdown-css": "^5.1.0",
"hotkeys-js": "^3.7.3",
"js-cookie": "^2.2.1",
+ "jschardet": "^3.0.0",
"lodash": "^4.17.19",
"lowdb": "^1.0.0",
+ "marked": "^2.0.0",
"nprogress": "^0.2.0",
"screenfull": "^5.0.2",
"sortablejs": "^1.10.1",
diff --git a/src/main.js b/src/main.js
index cc1571d..06f9022 100644
--- a/src/main.js
+++ b/src/main.js
@@ -14,6 +14,7 @@ import D2Crud from '@d2-projects/d2-crud'
import vueCheetahGrid from 'vue-cheetah-grid'
// 导入D2-admin的导出EXCEL插件
import pluginExport from '@d2-projects/vue-table-export'
+import pluginImport from '@d2-projects/vue-table-import'
// 菜单和路由设置
import router from './router'
import { menuAside } from '@/menu'
@@ -25,6 +26,7 @@ Vue.use(ElementUI)
Vue.use(D2Crud)
Vue.use(vueCheetahGrid)
Vue.use(pluginExport)
+Vue.use(pluginImport)
new Vue({
router,
diff --git a/src/views/scada/scadaConfigure/index.vue b/src/views/scada/scadaConfigure/index.vue
index beaf113..e16ebab 100644
--- a/src/views/scada/scadaConfigure/index.vue
+++ b/src/views/scada/scadaConfigure/index.vue
@@ -16,16 +16,37 @@
@row-remove="handleRowRemove"
@dialog-cancel="handleDialogCancel">
新增
+
+
+ 批量导入
+
+
+
+
+
+
+
+