前端代码提交

src/api/object-management/instance-management.js

+import request from '@/utils/request'
+// const baseURL = process.env.VUE_APP_BASE_API
+const baseURL = ''
+
+// 实例列表
+export function listInstance(data) {
+  return request({
+    url: `${baseURL}/iot/model/getModelInstance4Page`,
+    method: 'post',
+    data
+  })
+}
+
+// 实例增加
+export function addInstance(data) {
+  return request({
+    url: `${baseURL}/iot/model/instance/add`,
+    method: 'post',
+    data
+  })
+}
+
+// 实例编辑
+export function editInstance(data) {
+  return request({
+    url: `${baseURL}/iot/model/instance/edit`,
+    method: 'post',
+    data
+  })
+}
+
+// 实例删除
+export function deleteInstance(data) {
+  return request({
+    url: `${baseURL}/iot/model/instance/delete`,
+    method: 'post',
+    data
+  })
+}

src/api/object-management/model-management.js

@@ -46,3 +46,4 @@ export function deleteModel(data) {
     data
   })
 }
+

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

@@ -31,7 +31,7 @@
       <el-card class="margin-top-20">
         <div slot="header" class="clearfix">
           <span>模型数据</span>
-          <el-button v-if="!modelForm.hasInstance" style="float: right; padding: 0; margin-left: 10px" type="text" @click="addRow">添加</el-button>
+          <el-button v-if="!modelForm.hasInstance" style="float: right; margin-left: 10px" type="primary" @click="addRow">添加</el-button>
         </div>
         <el-form
           ref="listForm"
@@ -59,6 +59,7 @@
                   v-if="props.row.edit"
                   :prop="`propertyList.${props.$index}.propertyCode`"
                   label=""
+                  style="margin-bottom: 0px"
                 >
                   <el-input v-model="props.row.propertyCode" />
                 </el-form-item>
@@ -75,6 +76,7 @@
                   v-if="props.row.edit"
                   :prop="`propertyList.${props.$index}.propertyName`"
                   label=""
+                  style="margin-bottom: 0px"
                 >
                   <el-input v-model="props.row.propertyName" />
                 </el-form-item>
@@ -90,6 +92,7 @@
                   v-if="props.row.edit"
                   :prop="`propertyList.${props.$index}.propertyType`"
                   label=""
+                  style="margin-bottom: 0px"
                 >
                   <el-select v-model="props.row.propertyType">
                     <el-option
@@ -112,6 +115,7 @@
                   v-if="props.row.edit"
                   :prop="`propertyList.${props.$index}.propertyDefaultValue`"
                   label=""
+                  style="margin-bottom: 0px"
                 >
                   <el-input v-model="props.row.propertyDefaultValue" />
                 </el-form-item>
@@ -127,6 +131,7 @@
                   v-if="props.row.edit"
                   :prop="`propertyList.${props.$index}.propertyUnit`"
                   label=""
+                  style="margin-bottom: 0px"
                 >
                   <el-input v-model="props.row.propertyUnit" />
                 </el-form-item>
@@ -274,7 +279,7 @@ export default {
         })
         .catch(err => {
           console.error(err.message)
-          this.$message.error('保存失败')
+          this.$message.error(err.message)
         })
     },
     editModel() {
@@ -318,5 +323,7 @@ export default {
 </script>
 
 <style scoped>
-
+.clearfix {
+  line-height: 36px;
+}
 </style>

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

@@ -28,6 +28,7 @@
       <el-table
         :data="tableData"
         border
+        height="500px"
       >
         <el-table-column
           type="index"
@@ -176,11 +177,11 @@ export default {
     },
     handleSizeChange(val) {
       this.pageForm.pageSize = val
-      this.getTableData(1)
+      this.listModel(1)
     },
     handleCurrentChange(val) {
       this.pageForm.pageNum = val
-      this.getTableData(val)
+      this.listModel(val)
     },
     onConfirm() {
       this.dialogVisible = false