Merge branch 'bigdata' of gitlab.gongsibao.com:jiangyong/zhichan into bigdata

bigdata/app/base/db/metadata/bizs/wx76a324c5d201d1a4/pmgmyapps.js

@@ -67,9 +67,11 @@ module.exports={
     "add":[
     "add":[
       {"icon":"el-icon-plus","title":"新增","type":"default","key":"new","isOnGrid":true},
       {"icon":"el-icon-plus","title":"新增","type":"default","key":"new","isOnGrid":true},
       {"icon":"el-icon-save","title":"保存","type":"default","key":"save","isOnForm":true},
       {"icon":"el-icon-save","title":"保存","type":"default","key":"save","isOnForm":true},
+      {"icon":"el-icon-cancel","title":"取消","type":"default","key":"cancel","isOnForm":true},
     ],
     ],
     "edit":[
     "edit":[
       {"icon":"el-icon-edit","title":"修改","type":"default","key":"edit","isInRow":true},
       {"icon":"el-icon-edit","title":"修改","type":"default","key":"edit","isInRow":true},
+  
       // {"icon":"el-icon-edit","title":"管理员","type":"default","key":"adminModi","isInRow":true},
       // {"icon":"el-icon-edit","title":"管理员","type":"default","key":"adminModi","isInRow":true},
       // {"icon":"el-icon-edit","title":"重置密码","type":"default","key":"resetpwd","isInRow":true},
       // {"icon":"el-icon-edit","title":"重置密码","type":"default","key":"resetpwd","isInRow":true},
     ],
     ],
@@ -77,7 +79,7 @@ module.exports={
       {"icon":"el-icon-remove","title":"删除","type":"default","key":"delete","isInRow":true},
       {"icon":"el-icon-remove","title":"删除","type":"default","key":"delete","isInRow":true},
     ],
     ],
     "common":[
     "common":[
-      {"icon":"el-icon-cancel","title":"取消","type":"default","key":"cancel","isOnForm":true},
+    
     ],
     ],
   }
   }
 }
 }