yangjunjing 5 jaren geleden
bovenliggende
commit
857d5ac158

+ 0 - 4
src/components/business_space/newGraphy/graphy.vue

@@ -146,11 +146,7 @@ export default {
       zoneList: [], // 业务空间-canvas图中
       groupCreateDialogVis: false, //批量创建业务空间弹窗
       groupCreateType: 1, //批量创建方式
-<<<<<<< HEAD
-      hidden: true
-=======
       zoneDisable: true, // 重新划分是否禁用
->>>>>>> 37001d3372c630523546307a3029267b6cab6664
     }
   },
   computed: {

+ 0 - 4
src/components/ledger/handsontables/system.vue

@@ -393,11 +393,7 @@ export default {
         columnSorting: true, //添加排序
         sortIndicator: true, //添加排序
         renderAllRows: true,
-<<<<<<< HEAD
-        observeChanges: false,
-=======
         // observeChanges: false, //启用observeChanges插件
->>>>>>> 37001d3372c630523546307a3029267b6cab6664
         // colWidths: 200,
         autoColumnSize: true,
         language: "zh-CN",

+ 0 - 12
src/router/system.js

@@ -109,17 +109,6 @@ export default [{
     { path: '/auth', name: 'auth', component: auth },
     { path: '/noUser', name: 'noUser', component: noUser },
     // 业务空间数据导入工具
-<<<<<<< HEAD
-    { path: '/dataUtil', name: 'dataUtil', component: LayoutMain, children: [{ path: 'index', component: dataUtil }] },
-    // 辅助屏
-    {
-        path: '/splitScreen',
-        name: 'splitScreen',
-        component: splitScreen,
-        children: [
-            { path: 'spaceledger', name: 'spaceLedger', component: spaceLedger },
-            { path: 'integrateresults', name: 'integrateResults', component: integrateResults }
-=======
     {
         path: '/dataUtil',
         name: 'dataUtil',
@@ -127,7 +116,6 @@ export default [{
         children: [
             { path: 'index', component: dataUtil },
             { path: 'index2', component: dataUtil2 }
->>>>>>> 37001d3372c630523546307a3029267b6cab6664
         ]
     },
     // 平台管理