new report

d6049bb4 · CRS · ea561344 · d6049bb4 · d6049bb4 · d6049bb4
--- a/912功能文档-crs.docx
+++ b/912功能文档-crs.docx
--- a/src/components/UnDependenceDispose/UnDependence.vue
+++ b/src/components/UnDependenceDispose/UnDependence.vue
@@ -3,7 +3,6 @@
    <el-row>
      <el-col :span="24">
        <div class="content">
-          <p class="title">未知依赖配置</p>
          <p class="search">
            <span class="searchVal">
              <span>查询：</span>
@@ -71,7 +70,7 @@ export default {
            tableData: [],
            tablePageSize: 0,
            myPage: 1, // 分页第一页
-            pageSize: 8,  // 每页个数
+            pageSize: 9,  // 每页个数
            openModel: false,
            components: '',
            technologyId:'内部依赖(未知)',
@@ -89,7 +88,7 @@ export default {
                technologyName: this.technologyId,
                target: this.input2
            }
-            this.$server.getConfigPageList(this.myPage, 8, obj).then(res => {
+            this.$server.getConfigPageList(this.myPage, this.pageSize, obj).then(res => {
                console.log(res);
                this.tableData = res.data.objects;
                this.tablePageSize = res.data.totalElement;
@@ -100,7 +99,7 @@ export default {
            let obj = {
                technologyName:this.technologyId
            }
-            this.$server.getConfigPageList(this.myPage,8,obj).then(res => {
+            this.$server.getConfigPageList(this.myPage,this.pageSize,obj).then(res => {
                this.tableData = res.data.objects;
                this.tablePageSize = res.data.totalElement;
            });

--- a/src/components/XCalliance/dynamicList/dynamicList.vue
+++ b/src/components/XCalliance/dynamicList/dynamicList.vue
@@ -3,7 +3,6 @@
        <el-row>
            <el-col :span="24">
                <div class="content">
-                    <p class="title">最新动态</p>
                    <p class="search">
                        <span class="searchVal">
                            <span>查询：</span>
@@ -76,7 +75,7 @@ export default {
        return {
            searchVal: '',
            currentPage: 1, // 分页第一页
-            pagesize: 8,  // 每页个数
+            pagesize: 9,  // 每页个数
            totleLength: 8, // 获取后台传的所有数据的长度
            allData:[
                {

--- a/src/components/admittance/company/company.vue
+++ b/src/components/admittance/company/company.vue
@@ -3,7 +3,6 @@
    <el-row>
      <el-col :span="24">
        <div class="content">
-          <p class="title">单位管理</p>
          <p class="search">
            <span class="searchVal">
                <span>单位名称：</span>
@@ -78,7 +77,7 @@ export default {
        return {
            totalLength: 0,
            currentPage: 1, // 分页第一页
-            pageSize: 8,  // 每页个数
+            pageSize: 9,  // 每页个数
            searchName: '',
            openModel: false, // 弹框开关
            components: '', // 当前弹框内容

--- a/src/components/admittance/product/product.vue
+++ b/src/components/admittance/product/product.vue
@@ -3,7 +3,6 @@
    <el-row>
      <el-col :span="24">
        <div class="content">
-          <p class="title">产品管理</p>
          <p class="search">
            <span class="searchVal">
                <span>产品名称：</span>
@@ -95,7 +94,7 @@ export default {
        return {
            totalLength: 0,
            currentPage: 1, // 分页第一页
-            pageSize: 8,  // 每页个数
+            pageSize: 9,  // 每页个数
            formValue: '',
            name: '',
            formList: [{form: 1},{form: 2},{form: 3},{form: 4},{form: 5},{form: 6}],

--- a/src/components/admittance/technical/technical.vue
+++ b/src/components/admittance/technical/technical.vue
@@ -3,7 +3,6 @@
        <el-row>
            <el-col :span="24">
                <div class="content">
-                    <p class="title">技术路线管理</p>
                    <p class="search">
                        <span class="searchVal">
                            <span>技术路线名称：</span>
@@ -88,7 +87,7 @@ export default {
    data () {
        return {
            currentPage: 1, // 分页第一页
-            pagesize: 8,  // 每页个数
+            pagesize: 9,  // 每页个数
            totleLength: 0, // 获取后台传的所有数据的长度
            openModel: false, // 弹框开关
            components: '', // 当前弹框内容

--- a/src/components/basicInformation/company/company.vue
+++ b/src/components/basicInformation/company/company.vue
@@ -3,7 +3,6 @@
    <el-row>
      <el-col :span="24">
        <div class="content">
-          <p class="title">单位管理</p>
          <p class="search">
            <span class="searchVal">
                <span>单位名称：</span>
@@ -94,7 +93,7 @@ export default {
        return {
            totalLength: 0,
            currentPage: 1, // 分页第一页
-            pageSize: 8,  // 每页个数
+            pageSize: 9,  // 每页个数
            searchName: '',
            openModel: false, // 弹框开关
            components: '', // 当前弹框内容

--- a/src/components/basicInformation/person/person.vue
+++ b/src/components/basicInformation/person/person.vue
@@ -3,7 +3,6 @@
        <el-row>
            <el-col :span="24">
                <div class="content">
-                    <p class="title">人员管理</p>
                    <p class="search">
                        <span class="searchVal">
                            <span>姓名：</span>
@@ -94,7 +93,7 @@ export default {
    data () {
        return {
            currentPage: 1, // 分页第一页
-            pagesize: 8,  // 每页个数
+            pagesize: 9,  // 每页个数
            totleLength: 0, // 获取后台传的所有数据的长度
            openModel: false, // 弹框开关
            components: '', // 当前弹框内容

--- a/src/components/basicInformation/product/product.vue
+++ b/src/components/basicInformation/product/product.vue
@@ -3,7 +3,6 @@
    <el-row>
      <el-col :span="24">
        <div class="content">
-          <p class="title">产品管理</p>
          <p class="search">
            <span class="searchVal">
                <span>产品名称：</span>
@@ -111,7 +110,7 @@ export default {
        return {
            totalLength: 0,
            currentPage: 1, // 分页第一页
-            pageSize: 8,  // 每页个数
+            pageSize: 9,  // 每页个数
            formValue: '',
            name: '',
            formList: [{form: 1},{form: 2},{form: 3},{form: 4},{form: 5},{form: 6}],

--- a/src/components/basicInformation/role/role.vue
+++ b/src/components/basicInformation/role/role.vue
@@ -3,7 +3,6 @@
        <el-row>
            <el-col :span="24">
                <div class="content">
-                    <p class="title">角色管理</p>
                    <p class="search">
                        <span class="searchVal">
                            <span>查询：</span>
@@ -74,7 +73,7 @@ export default {
        return {
            searchVal: '',
            currentPage: 1, // 分页第一页
-            pagesize: 8,  // 每页个数
+            pagesize: 9,  // 每页个数
            totleLength: 0, // 获取后台传的所有数据的长度
            openModel: false, // 弹框开关
            components: '', // 当前弹框内容

--- a/src/components/complaint/complaint/complaint.vue
+++ b/src/components/complaint/complaint/complaint.vue
@@ -3,7 +3,6 @@
        <el-row>
            <el-col :span="24">
                <div class="content">
-                    <p class="title">意见建议</p>
                    <p class="search">
                        <span class="searchVal">
                            <span>查询：</span>
@@ -88,7 +87,7 @@ export default {
        return {
            searchVal: '',
            currentPage: 1, // 分页第一页
-            pagesize: 8,  // 每页个数
+            pagesize: 9,  // 每页个数
            totleLength: 0, // 获取后台传的所有数据的长度
            allData:[] // 列表内容
        }

--- a/src/components/complaint/complaintManagement/complaintManagement.vue
+++ b/src/components/complaint/complaintManagement/complaintManagement.vue
@@ -3,7 +3,6 @@
        <el-row>
            <el-col :span="24">
                <div class="content">
-                    <p class="title">投诉管理</p>
                    <p class="search">
                        <span class="searchVal">
                            <span>查询：</span>
@@ -89,7 +88,7 @@ export default {
        return {
            searchVal: '',
            currentPage: 1, // 分页第一页
-            pagesize: 8,  // 每页个数
+            pagesize: 9,  // 每页个数
            totleLength: 0, // 获取后台传的所有数据的长度
            allData:[] // 列表内容
        }

--- a/src/components/evaluationReport/evaluationReport.vue
+++ b/src/components/evaluationReport/evaluationReport.vue
@@ -4,7 +4,6 @@
        <el-row>
            <el-col :span="24">
                <div class="content">
-                    <p class="title">评估报告管理</p>
                    <p class="search">
                        <span class="searchVal">
                            <span>查询：</span>
@@ -73,7 +72,7 @@ export default {
        return {
            searchVal: '',
            currentPage: 1, // 分页第一页
-            pagesize: 8,  // 每页个数
+            pagesize: 9,  // 每页个数
            totleLength: 0, // 获取后台传的所有数据的长度
            allData:[] // 列表内容
        }

--- a/src/components/header/header.vue
+++ b/src/components/header/header.vue
@@ -113,8 +113,8 @@ export default {
        'getSidebar': { // 监听侧边栏点击
            handler: function (val) {
                this.sidebar = val;
-                if (val.path !== this.$store.getters.getNowPath && val.menu !== undefined) { // 判断是否显示首页
-                    for (let i = 0; i < val.menu.length; i++) { // 没有显示首页，轮询子菜单对比名称
+                if (val.menu !== undefined) {
+                    for (let i = 0; i < val.menu.length; i++) { // 当前页与子菜单进行对比
                        if (val.menu[i].path === this.$store.getters.getNowPath) { // 判断子菜单path与当前path
                            $('.listVal>span').removeClass('menuClick') // 修改样式
                            $('.menuTitle').removeClass('goTitle')

--- a/src/components/integration/dynamicList/dynamicList.vue
+++ b/src/components/integration/dynamicList/dynamicList.vue
@@ -3,7 +3,6 @@
        <el-row>
            <el-col :span="24">
                <div class="content">
-                    <p class="title">最新动态</p>
                    <p class="search">
                        <span class="searchVal">
                            <span>查询：</span>
@@ -76,7 +75,7 @@ export default {
        return {
            searchVal: '',
            currentPage: 1, // 分页第一页
-            pagesize: 8,  // 每页个数
+            pagesize: 9,  // 每页个数
            totleLength: 8, // 获取后台传的所有数据的长度
            allData:[
                {

--- a/src/components/keyTechnology/keyTechnology.vue
+++ b/src/components/keyTechnology/keyTechnology.vue
@@ -4,7 +4,6 @@
        <el-row>
            <el-col :span="24">
                <div class="content">
-                    <p class="title">关键技术管理</p>
                    <p class="search">
                        <span class="searchVal">
                            <span>查询：</span>
@@ -93,7 +92,7 @@ export default {
        return {
            searchVal: '',
            currentPage: 1, // 分页第一页
-            pagesize: 8,  // 每页个数
+            pagesize: 9,  // 每页个数
            totleLength: 0, // 获取后台传的所有数据的长度
            allData:[], // 列表内容
            openModel: false, // 弹框开关

--- a/src/components/parameterConfiguration/parameterConfiguration.vue
+++ b/src/components/parameterConfiguration/parameterConfiguration.vue
@@ -3,7 +3,6 @@
        <el-row>
            <el-col :span="24">
                <div class="content">
-                    <p class="title">人员信息</p>
                    <p class="buttonP" @click="change">
                        <span class="button" title="编辑"><span></span></span>
                    </p>
@@ -159,14 +158,8 @@ export default {
        background: #fff;
        overflow: hidden;
    }
-    .parameter .content .title{
-        padding: 30px 0 0 60px;
-        font-size: 20px;
-        color: #233b6e;
-        position: relative;
-    }
    .parameter .content .buttonP{
-        padding: 10px 70px 40px 0px;
+        padding: 30px 70px 40px 0px;
        text-align: right;
    }
    .parameter .content .button{

--- a/src/components/projectManagement/project/projectManagement.vue
+++ b/src/components/projectManagement/project/projectManagement.vue
@@ -4,7 +4,6 @@
    <el-row>
      <el-col :span="24">
        <div class="content">
-          <p class="title">{{pageName}}</p>
          <p class="search">
            <span class="searchVal">
                <span>查询：</span>
@@ -92,7 +91,7 @@ export default {
            allData: [],
            pageName: '',
            currentPage: 1, // 分页第一页
-            pagesize: 8,  // 每页个数
+            pagesize: 9,  // 每页个数
            totleLength: 0 // 获取后台传的所有数据的长度
        }
    },

--- a/src/components/projectManagement/projectDetails/projectDetails.vue
+++ b/src/components/projectManagement/projectDetails/projectDetails.vue
@@ -4,7 +4,7 @@
        <el-row>
            <el-col :span="24">
                <div class="contentAll">
-                    <p class="title">项目管理
+                    <p class="title">
                        <span class="back" @click="back" title="返回"></span>
                    </p>
                    <p class="titleList">

--- a/src/components/reportAssess/reportAssess.vue
+++ b/src/components/reportAssess/reportAssess.vue
@@ -126,7 +126,7 @@
                        </div>
                    </div>

-                    <div class="six">
+                    <div class="six" v-if="this.$route.query.authority === 1">
                        <div class="oneTitle">
                            <!--<div @click="openMenuFour">-->
                            <!--&lt;!&ndash;<img src="../assets/img/tab.png" alt="">&ndash;&gt;-->
@@ -195,7 +195,7 @@
                        <div style="height: 20px"></div>
                    </div>

-                    <div class="seven">
+                    <div class="seven" v-if="this.$route.query.authority !== 1">
                        <div class="oneTitle"> <i></i>评估建议</div>
                        <!-- 评估建议各项 -->
                        <div class="seven-title">
@@ -721,6 +721,17 @@

                    </div>

+                    <div class="seven" v-if="this.$route.query.authority === 1">
+                        <div class="oneTitle"> <i></i>评估建议</div>
+                        <p class="otherTitle">1、关键技术及替换策略建议</p>
+                        <p class="bird">{{this.firstDetial.des}}</p>
+                        <p class="otherTitle">2、工作量评估</p>
+                        <p class="bird">{{this.newWork.des}}</p>
+                        <p class="otherTitle">3、额外依赖服务申请</p>
+                        <p class="bird">额外依赖服务申请费用 <span></span> {{this.newApply.cost === -1 ? '无' : this.newApply.cost}}</p>
+                        <p class="otherTitle">4、适配难度评估</p>
+                        <p class="bird">{{this.newDifficuty.des}}</p>
+                    </div>



@@ -739,16 +750,16 @@
 </template>

 <script>
-//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
-//例如：import 《组件名称》 from '《组件路径》';
+// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
+// 例如：import 《组件名称》 from '《组件路径》';

 export default {
    name: 'reportAssess',
-    //import引入的组件需要注入到对象中才能使用
+    // import引入的组件需要注入到对象中才能使用
    components: {
    },
    data() {
-        //这里存放数据
+        // 这里存放数据
        return {
            orgName: '',
            sysName: '',
@@ -804,22 +815,22 @@ export default {

        };
    },
-    //监听属性 类似于data概念
+    // 监听属性 类似于data概念
    // computed: {},

    computed: {
        sumAmount(){
-            if(this.newCost == ''){
+            if (this.newCost === ''){
                return 0
-            }else{
+            } else {

                return  Number(this.newCost.artificial.calculation)  + Number(this.popp.basic )
            }
        },
        sumAmount1(){
-               if(this.newCost == ''){
+            if (this.newCost === ''){
                return 0
-            }else if(this.isAgree){
+            } else if (this.isAgree){

                return ( ( (Number(this.newCost.artificial.calculation) + Number(this.popp.basic )) * Number(this.newCost.workLoad.calculation) ) + Number(this.newCost.apply.calculation) ).toFixed(3)

@@ -831,7 +842,7 @@ export default {
        },

    },
-    //监控data中的数据变化
+    // 监控data中的数据变化
    watch: {
        // popp: {
        //     handler (val, oldVal) {
@@ -843,10 +854,9 @@ export default {
        //     deep: true
        // }
    },
-    //方法集合
+    // 方法集合
    methods: {
        goBackprev(){
-     
            this.$router.push({name:'evaluationReport', query:{
                username: this.$route.query.username,
                id: this.$route.query.id,
@@ -869,7 +879,7 @@ export default {
            //     }

        },
-        openMenu() { //展开
+        openMenu() { // 展开
            this.isShow = !this.isShow;
        },
        // tear() {
@@ -887,16 +897,16 @@ export default {
        tableShow() {
            this.isTableShow = !this.isTableShow;
        },
-        openMenuOne() { //展开
+        openMenuOne() { // 展开
            this.isShowOne = !this.isShowOne;
        },
-        openMenuTwo() { //展开
+        openMenuTwo() { // 展开
            this.isShowTwo = !this.isShowTwo;
        },
-        openMenuThree() { //展开
+        openMenuThree() { // 展开
            this.isShowThree = !this.isShowThree;
        },
-        openMenuFour() { //展开
+        openMenuFour() { // 展开
            this.isShowFour = !this.isShowFour;
        },

@@ -933,7 +943,7 @@ export default {
            this.$server.getTechnology(name).then(res=>{
                console.log('数据请求结果',res.data)

-                if(res.data == 500) {
+                if (res.data === 500) {
                    this.picture = true

                    // this.orgName = res.data.orgName
@@ -942,7 +952,7 @@ export default {
                    // this.difficulty = res.data.difficulty
                    // this.type = res.data.type

-                }else {
+                } else {

                    this.orgName = res.data.orgName
                    this.sysName = res.data.sysName
@@ -960,7 +970,7 @@ export default {
                    console.log( '3333',this.tableData)
                    console.log( 'type',this.type)

-                    //technologyReports 技术和替换策略建议
+                    // technologyReports 技术和替换策略建议

                    // 循环表格
                    this.table1Data = res.data.technologyList.technologyReports
@@ -990,52 +1000,52 @@ export default {

                    // 中间件

-                    //系统部署架构难度
+                    // 系统部署架构难度
                    this.newDifficuty.frameDifficulty.details === 1 ?
                        this.newDifficuty.frameDifficulty.details = '混合' : this.newDifficuty.frameDifficulty.details ===2 ?
-                        this.newDifficuty.frameDifficulty.details = '前后端分离' : this.newDifficuty.frameDifficulty.details == -1 ?
+                            this.newDifficuty.frameDifficulty.details = '前后端分离' : this.newDifficuty.frameDifficulty.details === -1 ?
                                this.newDifficuty.frameDifficulty.details = '-':''


                    this.newDifficuty.frameDifficulty.distributed === 1 ?
                        this.newDifficuty.frameDifficulty.distributed = '是' : this.newDifficuty.frameDifficulty.distributed === 2 ?
-                        this.newDifficuty.frameDifficulty.distributed = '否' : this.newDifficuty.frameDifficulty.distributed == -1 ?
+                            this.newDifficuty.frameDifficulty.distributed = '否' : this.newDifficuty.frameDifficulty.distributed === -1 ?
                                this.newDifficuty.frameDifficulty.distributed = '-' :''

                    this.newDifficuty.frameDifficulty.loadBalance === 1 ?
                        this.newDifficuty.frameDifficulty.loadBalance = '是' : this.newDifficuty.frameDifficulty.loadBalance === 2 ?
-                        this.newDifficuty.frameDifficulty.loadBalance = '否' :this.newDifficuty.frameDifficulty.loadBalance == -1 ?
+                            this.newDifficuty.frameDifficulty.loadBalance = '否' :this.newDifficuty.frameDifficulty.loadBalance === -1 ?
                                this.newDifficuty.frameDifficulty.loadBalance = '-' : ''

                    this.newDifficuty.frameDifficulty.disaster === 1 ?
                        this.newDifficuty.frameDifficulty.disaster = '分布式' : this.newDifficuty.frameDifficulty.disaster === 2 ?
-                        this.newDifficuty.frameDifficulty.disaster = '否' : this.newDifficuty.frameDifficulty.disaster == -1 ?
+                            this.newDifficuty.frameDifficulty.disaster = '否' : this.newDifficuty.frameDifficulty.disaster === -1 ?
                                this.newDifficuty.frameDifficulty.disaster = '-' : ''

-                    //系统部署架构难度
+                    // 系统部署架构难度

-                    //中间件难度
+                    // 中间件难度
                    this.newDifficuty.middlewareDifficulty.web === 1 ?
                        this.newDifficuty.middlewareDifficulty.web = '是' : this.newDifficuty.middlewareDifficulty.web === 2 ?
-                        this.newDifficuty.middlewareDifficulty.web = '否' : this.newDifficuty.middlewareDifficulty.web == -1 ?
+                            this.newDifficuty.middlewareDifficulty.web = '否' : this.newDifficuty.middlewareDifficulty.web === -1 ?
                                this.newDifficuty.middlewareDifficulty.web = '-' : ''

                    this.newDifficuty.middlewareDifficulty.jndi === 1 ?
                        this.newDifficuty.middlewareDifficulty.jndi = '是' : this.newDifficuty.middlewareDifficulty.jndi === 2 ?
-                        this.newDifficuty.middlewareDifficulty.jndi = '否' : this.newDifficuty.middlewareDifficulty.jndi == -1 ?
+                            this.newDifficuty.middlewareDifficulty.jndi = '否' : this.newDifficuty.middlewareDifficulty.jndi === -1 ?
                                this.newDifficuty.middlewareDifficulty.jndi = '-' : ''

                    this.newDifficuty.middlewareDifficulty.jms === 1 ?
                        this.newDifficuty.middlewareDifficulty.jms = '是' : this.newDifficuty.middlewareDifficulty.jms === 2 ?
-                        this.newDifficuty.middlewareDifficulty.jms = '否' : this.newDifficuty.middlewareDifficulty.jms == -1 ?
+                            this.newDifficuty.middlewareDifficulty.jms = '否' : this.newDifficuty.middlewareDifficulty.jms === -1 ?
                                this.newDifficuty.middlewareDifficulty.jms = '-' : ''

                    this.newDifficuty.middlewareDifficulty.route === 1 ?
                        this.newDifficuty.middlewareDifficulty.route = '是' : this.newDifficuty.middlewareDifficulty.route === 2 ?
-                        this.newDifficuty.middlewareDifficulty.route = '否' : this.newDifficuty.middlewareDifficulty.route == -1 ?
+                            this.newDifficuty.middlewareDifficulty.route = '否' : this.newDifficuty.middlewareDifficulty.route === -1 ?
                                this.newDifficuty.middlewareDifficulty.route = '-' : ''

-                    //中间件难度
+                    // 中间件难度

                    this.newDifficuty.databaseDifficulty.disasterTolerance === 1 ?
                        this.newDifficuty.databaseDifficulty.disasterTolerance = '否' : this.newDifficuty.databaseDifficulty.disasterTolerance === 2 ?
@@ -1043,23 +1053,23 @@ export default {
                                this.newDifficuty.databaseDifficulty.disasterTolerance = '分布式' : this.newDifficuty.databaseDifficulty.disasterTolerance === -1 ?
                                    this.newDifficuty.databaseDifficulty.disasterTolerance = '-' : ''

-                    //数据库难度
+                    // 数据库难度
                    this.newDifficuty.databaseDifficulty.safe ===1 ?
                        this.newDifficuty.databaseDifficulty.safe = '是' : this.newDifficuty.databaseDifficulty.safe === 2 ?
-                        this.newDifficuty.databaseDifficulty.safe = '否' : this.newDifficuty.databaseDifficulty.safe == -1 ?
+                            this.newDifficuty.databaseDifficulty.safe = '否' : this.newDifficuty.databaseDifficulty.safe === -1 ?
                                this.newDifficuty.databaseDifficulty.safe = '-' : ''

                    this.newDifficuty.databaseDifficulty.separate ===1 ?
                        this.newDifficuty.databaseDifficulty.separate = '是' : this.newDifficuty.databaseDifficulty.separate === 2 ?
-                        this.newDifficuty.databaseDifficulty.separate = '否' : this.newDifficuty.databaseDifficulty.separate == -1 ?
+                            this.newDifficuty.databaseDifficulty.separate = '否' : this.newDifficuty.databaseDifficulty.separate === -1 ?
                                this.newDifficuty.databaseDifficulty.separate = '-' : ''

                    this.newDifficuty.databaseDifficulty.performance ===1 ?
                        this.newDifficuty.databaseDifficulty.performance = '是' : this.newDifficuty.databaseDifficulty.performance === 2 ?
-                        this.newDifficuty.databaseDifficulty.performance = '不' : this.newDifficuty.databaseDifficulty.performance == -1 ?
+                            this.newDifficuty.databaseDifficulty.performance = '不' : this.newDifficuty.databaseDifficulty.performance === -1 ?
                                this.newDifficuty.databaseDifficulty.performance = '-' : ''

-                    //数据库难度
+                    // 数据库难度

                    // console.log('适配难度评估',this.newDifficuty)
                    // 系统部署架构难度
@@ -1106,9 +1116,9 @@ export default {
        //
        backTop() {
            console.log(11)
-            document.getElementById("isFlag").scrollIntoView({
-                behavior: "smooth",  // 平滑过渡
-                block:    "start"  // 上边框与视窗顶部平齐。默认值
+            document.getElementById('isFlag').scrollIntoView({
+                behavior: 'smooth',  // 平滑过渡
+                block:    'start'  // 上边框与视窗顶部平齐。默认值
            });
        },

@@ -1132,16 +1142,16 @@ export default {
        },

    },
-    //生命周期 - 创建完成（可以访问当前this实例）
+    // 生命周期 - 创建完成（可以访问当前this实例）
    created() {
        // this.getTechnology()
    },
-    //生命周期 - 挂载完成（可以访问DOM元素）
+    // 生命周期 - 挂载完成（可以访问DOM元素）
    mounted() {
        console.log('传参的name',this.$route.query.username)
        console.log('传参的id',this.$route.query.id)

-        var obj = {
+        let obj = {
            name:this.$route.query.username,
            id:this.$route.query.id
        }
@@ -1160,13 +1170,13 @@ export default {
    destroyed () {  // 销毁监听事件,当我们离开这个页面的时候，便会调用这个函数
        window.removeEventListener('scroll', this.showBtn)
    },
-    beforeCreate() {}, //生命周期 - 创建之前
-    beforeMount() {}, //生命周期 - 挂载之前
-    beforeUpdate() {}, //生命周期 - 更新之前
-    updated() {}, //生命周期 - 更新之后
-    beforeDestroy() {}, //生命周期 - 销毁之前
-    destroyed() {}, //生命周期 - 销毁完成
-    activated() {} //如果页面有keep-alive缓存功能，这个函数会触发
+    beforeCreate() {}, // 生命周期 - 创建之前
+    beforeMount() {}, // 生命周期 - 挂载之前
+    beforeUpdate() {}, // 生命周期 - 更新之前
+    updated() {}, // 生命周期 - 更新之后
+    beforeDestroy() {}, // 生命周期 - 销毁之前
+    destroyed() {}, // 生命周期 - 销毁完成
+    activated() {} // 如果页面有keep-alive缓存功能，这个函数会触发
 }
 </script>

@@ -1713,4 +1723,9 @@ export default {
    }
    /*20200308*/

+    .otherTitle{
+        color: #000;
+        font-size: 18px;
+        margin-top: 30px;
+    }
 </style>
--- a/src/components/roleDispose/roleDispose.vue
+++ b/src/components/roleDispose/roleDispose.vue
@@ -3,7 +3,6 @@
    <el-row>
      <el-col :span="24">
        <div class="content">
-          <p class="title">规则配置</p>
          <p class="search">
            <span class="searchVal">
              <span>查询：</span>
@@ -78,7 +77,7 @@ export default {
            input2: '',
            tableData: [],
            tablePageSize: 0,
-            pageSize: 8,  // 每页个数
+            pageSize: 9,  // 每页个数
            openModel: false,
            components: '',
            myPage: 1,
@@ -96,7 +95,7 @@ export default {
            let obj = {
                technologyName:this.input2
            }
-            this.$server.getConfigPageList(this.myPage,8,obj).then(res => {
+            this.$server.getConfigPageList(this.myPage,this.pageSize,obj).then(res => {
                this.tableData = res.data.objects;
                this.tablePageSize = res.data.totalElement;
            })