diff --git a/src/components/ehsSelect/select.vue b/src/components/ehsSelect/select.vue
new file mode 100644
index 00000000..9e20ca9f
--- /dev/null
+++ b/src/components/ehsSelect/select.vue
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
diff --git a/src/components/ehsSelect/tableSelect.vue b/src/components/ehsSelect/tableSelect.vue
new file mode 100644
index 00000000..152df008
--- /dev/null
+++ b/src/components/ehsSelect/tableSelect.vue
@@ -0,0 +1,225 @@
+
+
+
+
+
+
+
+
+ {{scope.$index+(currentPage - 1) * pageSize + 1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/config/tableSelect.js b/src/config/tableSelect.js
index fe407a6e..fa2120ca 100644
--- a/src/config/tableSelect.js
+++ b/src/config/tableSelect.js
@@ -14,10 +14,10 @@ export default {
request: {
page: 'page', //规定当前分页字段
pageSize: 'page_size', //规定一页条数字段
- keyword: 'keyword' //规定搜索字段
+ keyword: 'search' //规定搜索字段
},
props: {
- label: 'label', //映射label显示字段
- value: 'value', //映射value值字段
+ label: 'name', //映射label显示字段
+ value: 'id', //映射value值字段
}
}
diff --git a/src/ehs.js b/src/ehs.js
index c9fc647b..601e3ef8 100644
--- a/src/ehs.js
+++ b/src/ehs.js
@@ -1,8 +1,12 @@
import ehsUserSelect from './components/ehsSelect/userselect'
import ehsEpSelect from './components/ehsSelect/epselect'
+import ehsSelect from './components/ehsSelect/select'
+import ehsTableSelect from './components/ehsSelect/tableSelect'
export default {
install(app) {
app.component('ehsUserSelect', ehsUserSelect);
app.component('ehsEpSelect', ehsEpSelect);
+ app.component('ehsSelect', ehsSelect);
+ app.component('ehsTableSelect', ehsTableSelect);
}
}
diff --git a/src/scui.js b/src/scui.js
index 1c1e0448..56a64092 100644
--- a/src/scui.js
+++ b/src/scui.js
@@ -21,6 +21,7 @@ import scForm from './components/scForm'
import scTitle from './components/scTitle'
import scWaterMark from './components/scWaterMark'
import scQrCode from './components/scQrCode'
+import scIconSelect from './components/scIconSelect'
import scStatusIndicator from './components/scMini/scStatusIndicator'
import scTrend from './components/scMini/scTrend'
@@ -68,6 +69,7 @@ export default {
app.component('scUserSelect', scUserSelect);
app.component('scTrend', scTrend);
app.component('scFire', scFire);
+ app.component('scIconSelect', scIconSelect);
//注册全局指令
app.directive('auth', auth)