Explorar el Código

Merge remote-tracking branch 'origin/dataType' into dataType

shaun-sheep hace 4 años
padre
commit
674901c0a1

+ 1 - 1
package.json

@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@saga-web/base": "2.1.27",
-    "@saga-web/cad-engine": "2.0.583",
+    "@saga-web/cad-engine": "2.0.588",
     "@saga-web/draw": "2.1.110",
     "@saga-web/graph": "2.1.133",
     "axios": "^0.18.0",

+ 1 - 1
src/framework/layout/PageHeader.vue

@@ -19,7 +19,7 @@
     </div>
     <div id='page-header-user-menu' class='user-menu'>
         <span class='el-dropdown-link' style="margin-top: 11px;">
-              yanruolan
+              {{userInfo.userName}}
               <i class='el-icon-fa-user el-icon--right'></i>
           </span>
 <!--      <el-dropdown trigger='hover' class='user-menu-dropdown' @command='userMenuCommand'>-->

+ 1 - 1
src/framework/layout/layout-store.js

@@ -13,7 +13,7 @@ export default {
     sidebarSelected: '', // sidebar选中的选项
     // userInfo: null, //{ username: 'admin' },
     userInfo: {
-      username: 'yanruolan',
+      userName: 'yanruolan',
       userId: '06328a53c69a41bb8f5bb1a552c6e8d6'
     },
     permissions: {

+ 1 - 1
src/views/ready/buildfloor/repetitionGraphy.vue

@@ -166,7 +166,7 @@ export default {
       }
       let pa = {
         content: [{ id: this.FloorID, outline: Outline }],
-        projection: ['Outline'],
+        projection: ['outline'],
       }
       floorUpdateOutline(pa, (res) => {
         this.isEdit = false