bug修改

src/data/menus.js

@@ -121,17 +121,8 @@ export default [
 				permission: 'system:role:query'
 			}]
 		}, {
-			path: '/point/number',
-			name: '表号功能号总览',
-			icon: '',
-			opts: [{
-				name: '查看',
-				basic: true,
-				permission: 'system:role:query'
-			}]
-		}, {
 			path: '/point/report',
-			name: '系统集成报告',
+			name: '系统集成成果管理',
 			icon: '',
 			opts: [{
 				name: '查看',

src/framework/layout/PageSidebar.vue

@@ -90,8 +90,8 @@ export default {
 </script>
 <style>
 .page-sidebar-wrapper .el-menu-item, .el-submenu__title {
-    height: 46px;
-    line-height: 46px;
+    height: 40px;
+    line-height: 40px;
 }
 </style>
 

src/framework/style/layout.scss

@@ -131,6 +131,7 @@ body {
 #page-main .page-container #page-sidebar-wrapper {
     .sidebar-menu.el-menu {
         border-right: none;
+        padding-bottom: 10px;
         .el-submenu {
             .el-menu-item {
                 height: $pageSidebarItemHeight;

src/router/system.js

@@ -26,7 +26,6 @@ import pointConfig from '@/views/point/config_point'
 import editDataSouce from '@/views/point/config_point/edit_origin'
 import pointSteps from '@/views/point/config_point/steps'
 import objectData from '@/views/point/objectData'
-import numberView from '@/views/point/number'
 import integrateReport from '@/views/point/report'
 import dynamicdata from '@/views/point/dynamicdata'
 import equipRela from '@/views/point/dynamicdata/addRelation/equipRela'
@@ -151,16 +150,10 @@ export default [
                 meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成', path: '/point/pointsetting' }, { label: '配置动参从对象取值' }] }
             },
             {
-                path: 'number',
-                name: 'numberView',
-                component: numberView,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成', path: '/point/pointsetting' }, { label: '表号功能号总览' }] }
-            },
-            {
                 path: 'report',
                 name: 'integrateReport',
                 component: integrateReport,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成', path: '/point/pointsetting' }, { label: '系统集成报告' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成', path: '/point/pointsetting' }, { label: '系统集成成果管理' }] }
             }
         ]
     },

src/views/data_admin/buildData/index.vue

@@ -1174,7 +1174,6 @@
                 let isSort = this.myHotArr[this.tabChecked]
                     .getPlugin("columnSorting")
                     .isSorted();
-                // debugger
                 if (trimmedArr.length && isSort) {
                     let sortArr = this.myHotArr[this.tabChecked].getPlugin("columnSorting")
                         .rowsMapper.__arrayMap;
@@ -1225,54 +1224,6 @@
                 this.createPicSwiper();
                 this.rowArr = rowArr;
             },
-            //插件修改
-            customDropdownRenderer(
-                instance,
-                td,
-                row,
-                col,
-                prop,
-                value,
-                cellProperties
-            ) {
-                var selectedId;
-                var optionsList = cellProperties.chosenOptions.data;
-                if (
-                    typeof optionsList === "undefined" ||
-                    typeof optionsList.length === "undefined" ||
-                    !optionsList.length
-                ) {
-                    Handsontable.renderers.TextRenderer(
-                        instance,
-                        td,
-                        row,
-                        col,
-                        prop,
-                        value,
-                        cellProperties
-                    );
-                    return td;
-                }
-                var values = (value + "").split(",");
-                value = [];
-                for (var index = 0; index < optionsList.length; index++) {
-                    if (values.indexOf(optionsList[index].code + "") > -1) {
-                        selectedId = optionsList[index].code;
-                        value.push(optionsList[index].name);
-                    }
-                }
-                value = value.join(", ");
-                Handsontable.renderers.TextRenderer(
-                    instance,
-                    td,
-                    row,
-                    col,
-                    prop,
-                    value,
-                    cellProperties
-                );
-                return td;
-            },
             //下层的弹窗不显示
             picNoShow() {
                 this.picShow = false;
@@ -1771,7 +1722,7 @@
                 }, {
                     editor: "chosen",
                     data: "Family",
-                    renderer: this.customDropdownRenderer,
+                    renderer: tools.customDropdownRenderer,
                     chosenOptions: {
                         data: this.AllFamily
                     }
@@ -1784,8 +1735,8 @@
                 if (arr.length) {
                     return arr.map(item => {
                         return {
-                            code: item.code,
-                            name: item.name
+                            Code: item.code,
+                            Name: item.name
                         };
                     });
                 } else {

src/views/point/config_point/index.vue

@@ -3,7 +3,7 @@
         <div style="line-height:34px;padding-left:10px">
             <span style="display:inline-block;height: 35px;line-height:34px;">此项目包括<i style="color:#409EFF;">{{list.length}}</i>个数据源</span>
             <div style="float:right;height:34px;line-height:34px;padding-bottom: 1px;">
-                <el-button @click="sameData">同步配置文件到云端</el-button>
+                <!-- <el-button @click="sameData">同步配置文件到云端</el-button> -->
                 <el-button style="width:140px;" @click="addItem">添加数据源</el-button>
             </div>
         </div>

src/views/point/number/index.vue

@@ -1,36 +0,0 @@
-<template>
-    <div>
-      <das-board>
-        <template v-slot:plan>
-          <span>{{plan?plan:"yyyy-mm-dd"}}</span>
-        </template>
-        <template v-slot:finish>
-          <span>{{finish?finish:"yyyy-mm-dd"}}</span>
-        </template>
-        <template v-slot:onLine>
-          <span>{{onLine?onLine:"yyyy-mm-dd"}}</span>
-        </template>
-        <template v-slot:explain>
-          <span>{{explain?explain:"yyyy-mm-dd"}}</span>
-        </template>
-      </das-board>
-    </div>
-</template>
-
-<script>
-import dasBoard from "@/views/dasboard/index";
-export default {
-    components: {
-      dasBoard
-    },
-    data() {
-        return {
-          plan: "2019-8-5",
-          finish: "2019-9-24",
-          onLine: "2019-10-31",
-          explain: "表号功能号检索查看,点位信息维护"
-        }
-    },
-    mounted() {}
-}
-</script>

src/views/point/report/index.vue

@@ -26,9 +26,9 @@ export default {
     data() {
         return {
           plan: "2019-8-5",
-          finish: "2019-9-6",
-          onLine: "2019-9-30",
-          explain: "系统集成信息的展示查看"
+          finish: "2019-9-24",
+          onLine: "2019-10-31",
+          explain: "表号功能号检索查看,点位信息维护"
         }
     },
     mounted() {}