Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

pages/resourceManagement/productionResources/index.vue

@@ -274,6 +274,8 @@ export default {
               this.disabled = false;
               if (r.success) {
                 this.$Message.success("保存成功");
+                this.$refs.grid.load();
+                this.$refs.grid.footerToolbar = false;
               } else {
                 this.$Message.error("保存失败");
               }

pages/test.vue

 <style lang="less">
 .test_layout {
-    height: 50%;
+    height: 100%;
     .bg1{
         background:#fefefe ;
     }
   .fg {
-    background-color: rgba(234,45,198, 1);
     overflow: auto;
   }
 }
@@ -20,20 +19,15 @@
     <div>
       <Menu mode="horizontal" active-name="1">
         <div class="layout-assistant">
-          <MenuItem name="1">Option 1</MenuItem>
+          <MenuItem name="1" to="/test/user">人员选择</MenuItem>
           <MenuItem name="2">Option 2</MenuItem>
           <MenuItem name="3">Option 3</MenuItem>
         </div>
       </Menu>
     </div>
     <div class="fg">
-        <h4 v-for="i in 200">
-            {{i}}内容部分
-        </h4>
-        </div>
-        <div>
-            这是一个问题
-        </div>
+        <nuxt-child></nuxt-child>
+    </div>
   </div>
 </template>
 <script>