Merge branch 'develop' into 'test'

Develop

See merge request LAWS/laws-system-front-FOTON!164

src/pages/config/pages/attributeCustom/components/stand.vue

@@ -269,7 +269,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="排序号" prop="showIndex" class="add-form-item">
-          <el-input v-model="displayLocationDialogFormData.showIndex" placeholder="请输入排序号"></el-input>
+          <el-input v-model.number="displayLocationDialogFormData.showIndex" placeholder="请输入排序号"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -333,7 +333,7 @@ export default {
         showIndex: [
           { required: true, message: '排序号不能为空且为正整数', trigger: 'blur'},
           { type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'},
-          { min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
+          { type: 'number', min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
         ]
       },
       attributeDataLoading: false,

src/pages/config/pages/mechanismManage/index.vue

@@ -12,6 +12,8 @@
           :data="treeData"
           :props="defaultProps"
           default-expand-all
+          :current-node-key="nodeKeyId"
+          node-key="id"
           :filter-node-method="filterNode"
           highlight-current
           ref="tree"
@@ -166,6 +168,7 @@ export default {
   name: 'MechanismManage',
   data () {
     return {
+      nodeKeyId:'',
       searchForm: {
         uname:"",
         email:""
@@ -279,8 +282,12 @@ export default {
         _this: this,
         loading: 'treeLoading'
       }, res => {
-        console.log(res);
         this.treeData = res.data
+        console.log(this.treeData);
+        this.nodeKeyId = this.treeData[0].id
+        this.$nextTick(function () {
+          this.$refs.tree.setCurrentKey(this.nodeKeyId)
+        })
         this.id = res.data[0].id
         this.getData()
       }, e => {