Merge branch 'demo_' of http://123.60.19.203:8088/hitch/hitch-antd

src/views/remote/opc/modules/BaseForm.vue

@@ -156,7 +156,7 @@
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
-              v-decorator="['width', {initialValue:50, rules: [{required: true, message: '位置宽度不能为空'}]}]"/>
+              v-decorator="['width', {initialValue:60, rules: [{required: true, message: '位置宽度不能为空'}]}]"/>
           </a-form-item>
         </row-item>
         <row-item>
@@ -167,7 +167,7 @@
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
-              v-decorator="['height', {initialValue:50, rules: [{ required: true, message: '位置高度不能为空'}]}]"/>
+              v-decorator="['height', {initialValue:20, rules: [{ required: true, message: '位置高度不能为空'}]}]"/>
           </a-form-item>
         </row-item>
         <row-item>
@@ -181,7 +181,7 @@
               v-decorator="['description', {rules: [{required: true, message: '描述不能为空'}]}]"/>
           </a-form-item>
         </row-item>
-<!--        <row-item>
+        <!--        <row-item>
 
           <a-form-item
             label="实时数值"
@@ -284,6 +284,7 @@ export default {
           'sbName',
           'positionNum',
           'type',
+          'line',
           'description',
           'result',
           'ratio',

src/views/sb/position/SbPosition.vue

@@ -297,8 +297,8 @@ export default {
     /**
      * 设置位置树
      */
-    setTree (record = {}) {
-      getSbPositionTree({ id: record.id }).then(res => {
+    setTree () {
+      getSbPositionTree({}).then(res => {
         console.log(res.data)
         this.treeData = res.data
       })