diff --git a/package-lock.json b/package-lock.json
index 90aa9f0..eac1f3d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
"version": "0.1.0",
"dependencies": {
"axios": "^0.27.2",
+ "code-brick-zj": "^0.0.7",
"core-js": "^3.8.3",
"echarts": "^5.4.0",
"element-ui": "^2.15.8",
@@ -4079,6 +4080,11 @@
"node": ">=6"
}
},
+ "node_modules/code-brick-zj": {
+ "version": "0.0.7",
+ "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.7.tgz",
+ "integrity": "sha512-ZuhseY/9RUUUweAiTdumq5pJKAKAJxpvD8yjcVluY+cGDEKyoKzN9PjycPh2tUsE/gmwShfgrcIcm5DKcmzqvA=="
+ },
"node_modules/collection-visit": {
"version": "1.0.0",
"resolved": "https://registry.npmmirror.com/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -16035,6 +16041,11 @@
"shallow-clone": "^3.0.0"
}
},
+ "code-brick-zj": {
+ "version": "0.0.7",
+ "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.7.tgz",
+ "integrity": "sha512-ZuhseY/9RUUUweAiTdumq5pJKAKAJxpvD8yjcVluY+cGDEKyoKzN9PjycPh2tUsE/gmwShfgrcIcm5DKcmzqvA=="
+ },
"collection-visit": {
"version": "1.0.0",
"resolved": "https://registry.npmmirror.com/collection-visit/-/collection-visit-1.0.0.tgz",
diff --git a/package.json b/package.json
index dfac492..734dd49 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
},
"dependencies": {
"axios": "^0.27.2",
+ "code-brick-zj": "^0.0.7",
"core-js": "^3.8.3",
"echarts": "^5.4.0",
"element-ui": "^2.15.8",
diff --git a/src/components/BaseDialog/index.vue b/src/components/BaseDialog/index.vue
deleted file mode 100644
index 4c29963..0000000
--- a/src/components/BaseDialog/index.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- 取消
-
- 确定
-
-
-
-
-
-
-
-
-
-
diff --git a/src/components/BaseTable/index.vue b/src/components/BaseTable/index.vue
deleted file mode 100644
index 0a20e45..0000000
--- a/src/components/BaseTable/index.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.label }}
-
-
-
-
-
-
- {{
- scopeInner.row[sub.prop] | commonFilter(sub.filter)
- }}
-
-
-
-
-
- {{
- scope.row[item.prop] | commonFilter(item.filter)
- }}
-
-
-
-
-
{{ addButtonShow }}
-
-
-
-
-
-
diff --git a/src/components/BaseTable/subcomponents/MethodBtn.vue b/src/components/BaseTable/subcomponents/MethodBtn.vue
deleted file mode 100644
index 34af955..0000000
--- a/src/components/BaseTable/subcomponents/MethodBtn.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
-
- |
-
-
- {{ item.btnName }}
-
-
-
-
-
-
-
-
-
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
deleted file mode 100644
index 4ff6402..0000000
--- a/src/components/Pagination/index.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/components/SearchBar/index.vue b/src/components/SearchBar/index.vue
deleted file mode 100644
index a8518a0..0000000
--- a/src/components/SearchBar/index.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- {{ item.btnName }}
-
-
-
-
-
-
-
-
-
-
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 384ee4e..7719a33 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -4,7 +4,7 @@
G8.5 TFT-LCD 玻璃基板后工程段制造执行系统
-
+
diff --git a/src/main.js b/src/main.js
index ab51949..6770610 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,6 +11,9 @@ import './premission' // 路由守卫
Vue.config.productionTip = false
Vue.use(ElementUI)
+import myComponents from 'code-brick-zj'
+
+Vue.use(myComponents)
import './components/index'
new Vue({
diff --git a/src/views/basicConfig/accountConfig.vue b/src/views/basicConfig/accountConfig.vue
index ae3cdbd..3f0f5d7 100644
--- a/src/views/basicConfig/accountConfig.vue
+++ b/src/views/basicConfig/accountConfig.vue
@@ -29,7 +29,7 @@
/>
-
月份选择
-
-
-
查询
+
@@ -46,7 +34,25 @@ export default {
children: 'children',
label: 'name'
},
- chooseMonth: ''
+ chooseMonth: '',
+ formConfig: [
+ {
+ type: 'datePicker',
+ label: '月份选择',
+ dateType: 'month',
+ format: 'yyyy-MM',
+ valueFormat: 'yyyy-MM',
+ placeholder: '月份选择',
+ param: 'testTime',
+ width: 200
+ },
+ {
+ type: 'button',
+ btnName: '查询',
+ name: 'search',
+ color: 'primary'
+ }
+ ]
}
},
components: {
@@ -61,6 +67,9 @@ export default {
this.treeData = res.data
})
},
+ buttonClick(val) {
+ console.log(val)
+ },
clickDevice(val) {
console.log(val)
if (!val.children) {
diff --git a/src/views/deviceManagement/spareParts/sparePartsRecord.vue b/src/views/deviceManagement/spareParts/sparePartsRecord.vue
index d6b8d89..2214ef1 100644
--- a/src/views/deviceManagement/spareParts/sparePartsRecord.vue
+++ b/src/views/deviceManagement/spareParts/sparePartsRecord.vue
@@ -163,6 +163,9 @@ export default {
btnName: '重置',
name: 'reset'
},
+ {
+ type: 'separate'
+ },
{
type: 'button',
btnName: '导出',
diff --git a/src/views/deviceManagement/spareParts/sparePartsStock.vue b/src/views/deviceManagement/spareParts/sparePartsStock.vue
index 869819e..fd9f2eb 100644
--- a/src/views/deviceManagement/spareParts/sparePartsStock.vue
+++ b/src/views/deviceManagement/spareParts/sparePartsStock.vue
@@ -31,7 +31,7 @@
/>