diff --git a/src/components/DialogWithMenu.vue b/src/components/DialogWithMenu.vue
index 7097969..79b4daa 100644
--- a/src/components/DialogWithMenu.vue
+++ b/src/components/DialogWithMenu.vue
@@ -12,50 +12,61 @@
{{ detailMode ? "查看详情" : dataForm.id ? "编辑" : "新增" }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 添加
-
-
-
-
-
+
{
if (res && res.code === 0) {
const dataFormKeys = Object.keys(this.dataForm);
@@ -312,11 +326,11 @@ export default {
}
},
handleTabClick(payload) {
- console.log("tab click payload: ", this.activeMenu);
- if (this.activeMenu === this.configs.menu[1].name) {
- // 获取数据
- this.getSubList();
- }
+ // console.log("tab click payload: ", this.activeMenu);
+ // if (this.activeMenu === this.configs.menu[1].name) {
+ // // 获取数据
+ // this.getSubList();
+ // }
},
getSubList(page = 1, size = 20) {
@@ -359,7 +373,7 @@ export default {
},
handleClose() {
- this.resetForm()
+ this.resetForm();
this.$emit("update:dialogVisible", false);
},
@@ -444,4 +458,15 @@ export default {
padding: 10px 20px 10px;
/* background: linear-gradient(to bottom, rgba(0, 0, 0, 0.25), white); */
}
+
+.relative {
+ position: relative;
+}
+
+.at-right-top {
+ position: absolute;
+ top: 0;
+ right: 0;
+ z-index: 10000;
+}
diff --git a/src/components/SmallDialog.vue b/src/components/SmallDialog.vue
index a7802ba..68888df 100644
--- a/src/components/SmallDialog.vue
+++ b/src/components/SmallDialog.vue
@@ -7,6 +7,10 @@
:distory-on-close="true"
:close-on-click-modal="false"
v-bind="$attrs"
+ :width="'30%'"
+ :modal="false"
+ :fullscreen="false"
+ :top="'10vh'"
>
@@ -163,9 +167,6 @@ export default {
this.$http
.get(this.urls.subase + `/${this.dataForm.id}`)
.then(({ data: res }) => {
- // dev env:
- // if (LOCAL) res.data.id = res.data._id;
- // end dev env
if (res && res.code === 0) {
const dataFormKeys = Object.keys(this.dataForm);
this.dataForm = __pick(res.data, dataFormKeys);
@@ -223,3 +224,10 @@ export default {
},
};
+
+
diff --git a/src/views/modules/pms/equipment/config.js b/src/views/modules/pms/equipment/config.js
index f689833..4b8e3d4 100644
--- a/src/views/modules/pms/equipment/config.js
+++ b/src/views/modules/pms/equipment/config.js
@@ -1,6 +1,8 @@
import TableOperaionComponent from '@/components/noTemplateComponents/operationComponent'
import TableTextComponent from '@/components/noTemplateComponents/detailComponent'
import switchBtn from '@/components/noTemplateComponents/switchBtn'
+import { timeFilter } from '@/utils/filters'
+
export default function () {
@@ -48,7 +50,7 @@ export default function () {
const dialogConfigs = {
clickModalToClose: true,
- menu: [{ name: '设备信息' }, { name: '设备属性信息', onlyEditMode: false }],
+ menu: [{ name: '设备信息' }, { name: '设备属性信息', onlyEditMode: true }],
form: {
rows: [
[
@@ -81,12 +83,13 @@ export default function () {
},
table: {
// extraParams: ['stepId'],
- extraParams: 'stepId',
+ extraParams: 'equipmentId',
props: [
- { prop: 'createTime', label: '创建时间' },
- { prop: 'equipmentId', label: '所属设备id' },
+ { prop: 'createTime', label: '创建时间', filter: timeFilter },
+ // { prop: 'equipmentId', label: '所属设备id' },
{ prop: 'attrName', label: '属性名称', isEditField: true },
{ prop: 'attrValue', label: '属性值', isEditField: true },
+ { prop: 'remark', label: '备注', isEditField: true },
{
prop: 'operations',
name: '操作',
@@ -108,7 +111,7 @@ export default function () {
extraParam: 'equipmentId',
rows: [
[
- { input: true, label: '属性名称', prop: 'attrName', elparams: { placeholder: '请输入属性名称' } },
+ { input: true, label: '属性名称', prop: 'attrName', rules: { required: true, message: 'not empty', trigger: 'blur' }, elparams: { placeholder: '请输入属性名称' } },
{ input: true, label: '属性值', prop: 'attrValue', rules: { required: true, message: 'not empty', trigger: 'blur' }, elparams: { placeholder: '请输入属性值' } },
],
[
@@ -116,8 +119,8 @@ export default function () {
]
],
operations: [
- { name: 'add', label: '保存', type: 'primary', permission: 'pms:equipment:save', showOnEdit: false },
- { name: 'update', label: '更新', type: 'primary', permission: 'pms:equipment:update', showOnEdit: true },
+ { name: 'add', label: '保存', type: 'primary', permission: 'pms:equipmentType:save', showOnEdit: false },
+ { name: 'update', label: '更新', type: 'primary', permission: 'pms:equipmentType:update', showOnEdit: true },
],
},
};
@@ -135,7 +138,9 @@ export default function () {
},
urls: {
base: '/pms/equipment',
- page: '/pms/equipment/page'
+ page: '/pms/equipment/page',
+ subase: '/pms/equipmentAttr',
+ subpage: '/pms/equipmentAttr/page'
}
}
}
\ No newline at end of file