Merge remote-tracking branch 'origin/master'

src/router/modules/objectManagement.js

@@ -13,14 +13,14 @@ const router = {
       menuId: 'ObjectModel',
       path: 'object-model',
       name: '物模型',
-      component: () => import('@/views/dataset-management/mine-dataset'),
+      component: () => import('@/views/object-management/model-management'),
       meta: { title: '物模型', icon: 'object-model' }
     },
     {
       menuId: 'DatasetMgrMine',
       path: 'object-instance',
       name: '物实例',
-      component: () => import('@/views/dataset-management/mine-dataset'),
+      component: () => import('@/views/object-management/instance-management'),
       meta: { title: '物实例', icon: 'object-instance' }
     }
   ]

src/views/object-management/instance-management/index.vue

+<template>
+  <div>
+    <el-card class="no-bottom">
+      <el-form
+        ref="searchForm"
+        :model="searchForm"
+        label-width="80px"
+        inline
+      >
+        <el-form-item
+          label="input:"
+          prop="input"
+        >
+          <el-input v-model="searchForm.input" />
+        </el-form-item>
+        <el-form-item
+          label="status:"
+          prop="status"
+        >
+          <el-select v-model="searchForm.status" placeholder="请选择">
+            <el-option label="全部" :value="null" />
+            <el-option label="正常" :value="0" />
+            <el-option label="锁定" :value="1" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="getTableData">查询</el-button>
+          <el-button icon="el-icon-refresh" @click="resetForm">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <el-card class="margin-top-20">
+      <div class="buttons-group margin-bottom-20">
+        <el-button type="primary" icon="el-icon-plus" @click="addRow">增加系统</el-button>
+      </div>
+
+      <el-table
+        :data="tableData"
+        border
+      >
+        <el-table-column
+          type="index"
+          label="序号"
+          width="50px"
+          align="center"
+        />
+        <el-table-column
+          prop="a"
+          label="a"
+        />
+        <el-table-column
+          prop="b"
+          label="b"
+        />
+        <el-table-column
+          prop="c"
+          label="c"
+        />
+        <el-table-column
+          prop="d"
+          label="d"
+        />
+        <el-table-column
+          label="操作"
+          width="140px"
+          align="center"
+        >
+          <template slot-scope="props">
+            <el-button v-permission="'SysMgr_update'" type="text" @click="editItem(props.row)">编辑</el-button>
+            <el-popconfirm
+              title="确定要删除此条记录吗？"
+              @onConfirm="deleteItem(props.row.id)"
+            >
+              <el-button slot="reference" type="text">删除</el-button>
+            </el-popconfirm>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination
+        class="margin-top-20 text-align-right"
+        :current-page="pageForm.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="pageForm.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="pageForm.total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </el-card>
+
+    <el-dialog
+      :title="add ? '增加系统' : '编辑系统'"
+      :visible.sync="dialogVisible"
+      width="700px"
+    >
+      <el-form
+        :model="addForm"
+        label-width="90px"
+      >
+        <el-form-item
+          label="input:"
+        >
+          <el-input v-model="addForm.input" />
+        </el-form-item>
+        <el-form-item
+          label="status:"
+        >
+          <el-input v-model="addForm.status" />
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveSystem">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ObjectInstance',
+  props: {},
+  data() {
+    return {
+      searchForm: {
+        input: null,
+        status: null
+      },
+      add: true,
+      dialogVisible: false,
+      tableData: [],
+      addForm: {
+        input: null,
+        status: null
+      },
+      pageForm: {
+        pageSize: 10,
+        pageNum: 1,
+        total: 0
+      }
+    }
+  },
+  created() {},
+  mounted() {},
+  methods: {
+    getTableData(pageNum) {},
+    resetForm() {
+      this.$refs.searchForm.resetFields()
+    },
+    addRow() {
+      this.add = true
+      this.dialogVisible = true
+    },
+    editItem() {
+      this.add = false
+      this.dialogVisible = true
+    },
+    deleteItem(id) {},
+    saveSystem() {},
+    handleSizeChange(val) {
+      this.pageForm.pageSize = val
+      this.getTableData(1)
+    },
+    handleCurrentChange(val) {
+      this.pageForm.pageNum = val
+      this.getTableData(val)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/object-management/model-management/AddOrUpdate.vue

+<template>
+  <div>
+    <div>
+      <el-card class="no-bottom">
+        <div slot="header" class="clearfix">
+          <span>基本信息</span>
+        </div>
+        <el-form
+          :model="basicInfoForm"
+          label-width="90px"
+        >
+          <el-form-item
+            label="模型名称:"
+          >
+            <el-input v-model="basicInfoForm.name" style="width: 400px" />
+          </el-form-item>
+          <el-form-item
+            label="描述:"
+          >
+            <el-input v-model="basicInfoForm.description" type="textarea" :rows="4" style="width: 400px" />
+          </el-form-item>
+        </el-form>
+      </el-card>
+      <el-card class="margin-top-20">
+        <div slot="header" class="clearfix">
+          <span>模型数据</span>
+          <el-button style="float: right; padding: 0; margin-left: 10px" type="text" @click="addRow">添加</el-button>
+        </div>
+        <el-table
+          :data="basicInfoForm.propertyList"
+          style="width: 100%; height: 310px;"
+          border
+        >
+          <el-table-column
+            type="index"
+            label="序号"
+            width="50px"
+            align="center"
+          />
+          <el-table-column
+            prop="propCode"
+            label="属性编码"
+            width="155"
+          />
+          <el-table-column
+            prop="propName"
+            label="属性名称"
+            width="155"
+          />
+          <el-table-column
+            prop="propType"
+            label="数据类型"
+          />
+          <el-table-column
+            prop="defaultValue"
+            label="默认值"
+          />
+          <el-table-column
+            prop="unit"
+            label="单位"
+          />
+        </el-table>
+      </el-card>
+    </div>
+    <div class="el-dialog__footer" style="margin-top: 20px">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="confirm">提交</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Details',
+  data() {
+    return {
+      basicInfoForm: {
+        name: null,
+        description: null,
+        propertyList: []
+      }
+    }
+  },
+  computed: {
+
+  },
+  created() {
+
+  },
+  methods: {
+    cancel() {
+      this.$emit('cancel')
+    },
+    addRow() {
+      const newRow = {
+        'propCode': 'temperature',
+        'propName': '温度',
+        'propType': 'number',
+        'defaultValue': '0',
+        'unit': '摄氏度'
+      }
+      this.basicInfoForm.propertyList.push(newRow)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/object-management/model-management/detail.vue

+<template>
+  <div>
+    <div>
+      <el-card class="no-bottom">
+        <div slot="header" class="clearfix">
+          <span>基本信息</span>
+        </div>
+        <descriptions-item :span="8" label="模型名称" value="模型1" />
+        <descriptions-item :span="8" label="描述" value="描述1" />
+      </el-card>
+      <el-card class="margin-top-20">
+        <div slot="header" class="clearfix">
+          <span>模型数据</span>
+        </div>
+        <el-table
+          :data="detailTableData"
+          style="width: 100%"
+          border
+        >
+          <el-table-column
+            type="index"
+            label="序号"
+            width="50px"
+            align="center"
+          />
+          <el-table-column
+            prop="propCode"
+            label="属性编码"
+            width="155"
+          />
+          <el-table-column
+            prop="propName"
+            label="属性名称"
+            width="155"
+          />
+          <el-table-column
+            prop="propType"
+            label="数据类型"
+          />
+          <el-table-column
+            prop="defaultValue"
+            label="默认值"
+          />
+          <el-table-column
+            prop="unit"
+            label="单位"
+          />
+        </el-table>
+      </el-card>
+    </div>
+    <div class="el-dialog__footer">
+      <el-button type="primary" @click="cancel">关闭</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Details',
+  data() {
+    return {
+      detailTableData: [
+        {
+          'propCode': 'temperature',
+          'propName': '温度',
+          'propType': 'number',
+          'defaultValue': '0',
+          'unit': '摄氏度'
+        },
+        {
+          'propCode': 'humidity',
+          'propName': '湿度',
+          'propType': 'number',
+          'defaultValue': '0',
+          'unit': '%'
+        }
+      ]
+    }
+  },
+  computed: {
+
+  },
+  created() {
+
+  },
+  methods: {
+    cancel() {
+      this.$emit('cancel')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/object-management/model-management/index.vue

+<template>
+  <div>
+    <el-card class="no-bottom">
+      <el-form
+        ref="searchForm"
+        :model="searchForm"
+        label-width="80px"
+        inline
+      >
+        <el-form-item
+          label="模型名称:"
+          prop="input"
+        >
+          <el-input v-model="searchForm.input" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="getTableData">查询</el-button>
+          <el-button icon="el-icon-refresh" @click="resetForm">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <el-card class="margin-top-20">
+      <div class="buttons-group margin-bottom-20">
+        <el-button type="primary" icon="el-icon-plus" @click="addRow">增加模型</el-button>
+      </div>
+
+      <el-table
+        :data="tableData"
+        border
+      >
+        <el-table-column
+          type="index"
+          label="序号"
+          width="50px"
+          align="center"
+        />
+        <el-table-column
+          prop="name"
+          label="模型名称"
+          width="300px"
+        >
+          <template slot-scope="props">
+            <el-button type="text" @click="checkDetails()">{{ props.row.name }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="description"
+          label="描述"
+        />
+        <el-table-column
+          label="操作"
+          width="140px"
+          align="center"
+        >
+          <template slot-scope="props">
+            <el-button type="text" @click="editItem(props.row)">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination
+        class="margin-top-20 text-align-right"
+        :current-page="pageForm.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="pageForm.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="pageForm.total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </el-card>
+
+    <esv-dialog
+      :title="add ? '新增模型' : '编辑模型'"
+      :visible.sync="dialogVisible"
+      width="100%"
+      top="0"
+    >
+      <add-or-update
+        v-if="dialogVisible"
+        :id="currentRowId"
+        :add="add"
+        @cancel="dialogVisible = false"
+        @confirm="onConfirm"
+      />
+    </esv-dialog>
+
+    <esv-dialog
+      title="模型详情"
+      :visible.sync="detailDialogVisible"
+      width="100%"
+      top="0"
+    >
+      <Details
+        v-if="detailDialogVisible"
+        @cancel="detailDialogVisible = false"
+      />
+    </esv-dialog>
+  </div>
+</template>
+
+<script>
+import Details from '@/views/object-management/model-management/detail'
+import AddOrUpdate from '@/views/object-management/model-management/AddOrUpdate'
+export default {
+  name: 'ObjectModel',
+  components: {
+    Details,
+    AddOrUpdate
+  },
+  props: {},
+  data() {
+    return {
+      searchForm: {
+        name: null
+      },
+      add: true,
+      dialogVisible: false,
+      detailDialogVisible: false,
+      tableData: [
+        {
+          'name': '模型1',
+          'description': '描述1'
+        }
+      ],
+      addForm: {
+        input: null,
+        status: null
+      },
+      pageForm: {
+        pageSize: 10,
+        pageNum: 1,
+        total: 0
+      },
+      currentRowId: null
+    }
+  },
+  created() {},
+  mounted() {},
+  methods: {
+    getTableData(pageNum) {},
+    resetForm() {
+      this.$refs.searchForm.resetFields()
+    },
+    addRow() {
+      this.add = true
+      this.dialogVisible = true
+    },
+    editItem() {
+      this.add = false
+      this.dialogVisible = true
+    },
+    checkDetails() {
+      this.detailDialogVisible = true
+    },
+    deleteItem(id) {},
+    saveSystem() {},
+    handleSizeChange(val) {
+      this.pageForm.pageSize = val
+      this.getTableData(1)
+    },
+    handleCurrentChange(val) {
+      this.pageForm.pageNum = val
+      this.getTableData(val)
+    },
+    onConfirm() {
+      this.dialogVisible = false
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>