选项修改

config.js

@@ -4,7 +4,7 @@
 
 // 服务地址
 const IP = 'http://120.55.57.35'; // 刘杰
-// const IP = 'http://localhost'; // 刘杰
+// const IP = 'http://192.168.0.114'; // 刘杰
 
 // 请求目标服务器域名配置
 const DOMAIN_NAME = {

package-lock.json

@@ -5261,7 +5261,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5282,12 +5283,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5302,17 +5305,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5429,7 +5435,8 @@
         "inherits": {
           "version": "2.0.4",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5441,6 +5448,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5455,6 +5463,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5462,12 +5471,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.9.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5486,6 +5497,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5575,7 +5587,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5587,6 +5600,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5672,7 +5686,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5708,6 +5723,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5727,6 +5743,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5770,12 +5787,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },

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;
             });

src/components/XCalliance/XCalliance/imgs.vue

@@ -28,7 +28,6 @@ export default {
     created() {
     },
     mounted(){
-        this.imgload();
         window.addEventListener('resize',()=>{
             this.height = this.$refs.height[0].height;
             this.imgload();
@@ -38,7 +37,6 @@ export default {
         imgload() {
             this.$nextTick(()=>{
                 this.height = this.$refs.height[0].height;
-                console.log(this.$refs.height[0].height);
             })
         }
     },

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:[
                 {

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: '', // 当前弹框内容

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}],

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: '', // 当前弹框内容

src/components/assessment/homeDetailcopy.vue

@@ -1645,6 +1645,9 @@ export default {
       e === this[objKey][objName]
         ? (this[objKey][objName] = "")
         : (this[objKey][objName] = e);
+        if(objKey === 'browser' && objName !== 'plugInUnit'){
+          this.browser.plugInUnit = 1
+        }
     },
     addZip(name, file, git) {
       this.loading = false;

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: '', // 当前弹框内容

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: '', // 当前弹框内容
@@ -133,9 +132,8 @@ export default {
                         }
                         let val = {
                             name: '基础资料管理',
-                            index: 11,
                             childPath: 'person',
-                            childIndex: 2
+                            childName: '人员管理'
                         }
                         this.$store.commit('changeJumpOther', val);
                         this.init()

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}],

src/components/basicInformation/role/authority.vue

@@ -14,14 +14,19 @@
                 <span>角色权限：</span>
                 <span style="margin-left: 180px;">
                     <span class="selected" @click="selected">
-                        <span class="img"></span>
                         <span class="val">全选</span>
                     </span>
                 </span>
             </p>
+            <div class="authorityAll">
+                <el-scrollbar style="height: 100%">
                     <p class="authorityList">
-                <span v-for="(item,index) of authority" @click="clickList(index,item)"><span class="author"></span>{{item.name}}</span>
+                        <span v-for="(item,index) of authority" @click="clickList(index,item)">
+                            <span class="author"></span>{{item.name}}
+                        </span>
                     </p>
+                </el-scrollbar>
+            </div>
         </div>
         <p class="line"></p>
         <p class="buttonClick">
@@ -66,9 +71,17 @@ export default {
                 }
                 setTimeout(()=>{
                     for (let item of this.allAuthority) {
-                        let val = '.authorityList>span:nth(' + (item - 1) + ')';
+                        for (let arr of this.authority) {
+                            if (item === arr.id) {
+                                for (let i = 0; i < $('.authorityList>span').length; i++) {
+                                    if ($('.authorityList>span')[i].innerText === arr.name) {
+                                        let val = '.authorityList>span:nth(' + i + ')';
                                         $(val).addClass('authorityListClick')
                                     }
+                                }
+                            }
+                        }
+                    }
                 },300)
 
             } else {
@@ -120,7 +133,6 @@ export default {
             if (this.clickAll === false) {
                 $('.selected').addClass('selectedClick');
                 $('.authorityList>span').addClass('authorityListClick');
-                $('.selected .img').addClass('noClick')
                 $('.val').html('全不选')
                 this.allAuthority = [];
                 for (let item of this.authority) {
@@ -128,7 +140,6 @@ export default {
                 }
                 this.clickAll = true;
             } else {
-                $('.selected .img').removeClass('noClick')
                 $('.selected').removeClass('selectedClick');
                 $('.val').html('全选')
                 this.allAuthority = [];
@@ -199,27 +210,23 @@ export default {
         cursor: pointer;
         color: #4877e6;
     }
-    .authority .img{
-        display: inline-block;
-        width: 19px;
-        height: 19px;
-        background: url("./img/selected.png");
-    }
-    .authority .noClick{
-        background: url("./img/selectedN.png");
+    .authority .authorityAll{
+        width: 340px;
+        height: 160px;
+        margin: 10px 0 0 305px;
+        text-align: center;
     }
     .authority .authorityList{
-        width: 280px;
         display: flex;
         flex-wrap: wrap;
-        margin: 10px 0 0 305px;
     }
     .authority .authorityList>span{
         margin-left: 25px;
         margin-top: 10px;
         display: inline-block;
-        width: 100px;
+        width: 140px;
         cursor: pointer;
+        text-align: left;
     }
     .authority .author{
         margin-right: 5px;
@@ -232,4 +239,7 @@ export default {
     .authority .authorityListClick>span{
         background: url("./img/click.png");
     }
+    .authority .authorityAll>>>.el-scrollbar__wrap {
+        overflow-x: hidden;
+    }
 </style>

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: '', // 当前弹框内容

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:[] // 列表内容
         }

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:[] // 列表内容
         }

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:[] // 列表内容
         }
@@ -86,7 +85,14 @@ export default {
     methods: {
         add(){
             console.log(this.$store.state.userData.userName)
-
+            this.$router.push({
+                name: 'assessmentReport',
+                query: {
+                    username:this.$store.state.userData.userName,
+                    authority: this.$store.state.userData.type,
+                    id: null,
+                }
+            });
         //    let Logistics= this.$router.resolve({
         //         path:'/assessmentReport',
         //         query:{
@@ -96,19 +102,11 @@ export default {
         //         }
         //     })
         //     window.open(Logistics.href)
-               this.$router.push({
-          name: "assessmentReport",
-          query: {
-            username:this.$store.state.userData.userName,
-            authority: this.$store.state.userData.type,
-            id: null,
-          }
-        });
         },
         // 初始请求
         init() {
-            var username = ''
-            if(this.$store.state.userData.userName != 'admin'){
+            let username = ''
+            if (this.$store.state.userData.userName !== 'admin'){
                 username =this.$store.state.userData.userName
             }
             let val = {
@@ -145,6 +143,11 @@ export default {
         evaluation(row) {
             console.log(row)
             console.log(this.$store.state.userData)
+            this.$router.push({name:'assessmentReport',  query: {
+                username: row.username,
+                id: row.id,
+                authority: this.$store.state.userData.type
+            }})
             // // return
             //  let Logistics= this.$router.resolve({
             //     path:'/assessmentReport',
@@ -155,15 +158,11 @@ export default {
             //     }
             // })
             // window.open(Logistics.href)
-           this.$router.push({name:'assessmentReport',  query: {
-            username: row.username,
-            id: row.id,
-            authority: this.$store.state.userData.type
-          }})
             // this.$router.push({name: 'complaintManagementDetail',params:{'value': row}});
         },
         // 报告
         report(row) {
+            console.log(row)
             // console.log(row)
             //   let Logistics= this.$router.resolve({
             //     path:'/reportAssess',
@@ -207,19 +206,15 @@ export default {
         },
         // 时间换算
         time(value) {
-          // console.log(timestamp)
-        //    value = value.replace(/-/g, '/').replace('T', ' ').replace('.000+0000', '')
+            value = value.replace(/-/g, '/').replace('T', ' ').replace('.000+0000', '')
             if (value !== undefined && value !== null) {
                 let date = new Date(value); // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
-              var day = moment(value).format('YYYY-MM-DD HH:mm:ss');
-            var day2 = moment(day).utc().format()
-              // console.log(day)
-              // console.log(timestamp.length)
+                let day = moment(value).format('YYYY-MM-DD HH:mm:ss');
+                let day2 = moment(day).utc().format()
                 return day
             } else {
                 return ''
             }
-      
         }
     },
     components: {

src/components/header/header.vue

@@ -29,7 +29,7 @@
         <div style="height: 40px;background: #fff;" v-if=" $route.name == 'assessmentReport'?false:$route.name == 'reportAssess'?false:$route.path == '/firstHome'?false:true">
             <p class="list">
                 <span class="menuTitle goTitle" @click="go">{{sidebar.name}}</span>
-                <span v-for="(item,index) of sidebar.menu" :key="index" class="listVal" @click="jump(item.path, index)">
+                <span v-for="(item,index) of sidebar.menu" :key="index" class="listVal" @click="jump(item.path, index)" v-if="getUserData.authorityCode.indexOf(item.code) !== -1">
                     <span>{{item.name}}</span>
                     <img src="./img/line.png" v-show="index !== sidebar.menu.length - 1">
                 </span>
@@ -105,7 +105,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters(['getSidebar','getJumpOther'])
+        ...mapGetters(['getSidebar','getJumpOther', 'getUserData'])
     },
     components: {
     },
@@ -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')
@@ -131,12 +131,18 @@ export default {
         getJumpOther: {
             handler: function (val) {
                 if (val !== '') {
+                    let index;
+                    for (let i = 0; i < $('.sidebar div').length; i++) {
+                        if (val.name === $('.sidebar div')[i].innerText) {
+                            index = i + 1;
+                        }
+                    }
                     $('.sidebar .menu').removeClass('click'); // 样式修改
                     $('.sidebar .font').removeClass('fontClick');
                     $('.sidebar .line').removeClass('lineClick');
-                    let menu = '.sidebar>div:nth-child(' + val.index + ') .menu';
-                    let font = '.sidebar>div:nth-child(' + val.index + ') .font';
-                    let line = '.sidebar>div:nth-child(' + val.index + ') .line';
+                    let menu = '.sidebar>div:nth-child(' + index + ') .menu';
+                    let font = '.sidebar>div:nth-child(' + index + ') .font';
+                    let line = '.sidebar>div:nth-child(' + index + ') .line';
                     $(menu).addClass('click');
                     $(font).addClass('fontClick');
                     $(line).addClass('lineClick');
@@ -148,7 +154,13 @@ export default {
                         $('.listVal>span').removeClass('menuClick') // 修改样式
                         $('.menuTitle').removeClass('goTitle')
                         setTimeout(()=>{ // 新增样式，vux更新延迟，需要加延时
-                            let va = '.list>span:nth-child(' + (val.childIndex + 2) + ')>span';
+                            let childIndex;
+                            for (let i = 0; i < $('.listVal').length; i++) {
+                                if (val.childName === $('.listVal')[i].innerText) {
+                                    childIndex = i;
+                                }
+                            }
+                            let va = '.list>span:nth-child(' + (childIndex + 2) + ')>span';
                             $(va).addClass('menuClick')
                             this.$store.commit('changeJumpOther', '');
                         },50)

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:[
                 {

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, // 弹框开关

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{

src/components/projectManagement/document/document.vue

@@ -84,7 +84,7 @@ export default {
     data () {
         return {
             searchVal: '',
-            allData: [{name:'1',roleName: '123',unitName: '1',number: '1'}],
+            allData: [],
             currentPage: 1, // 分页第一页
             pageSize: 8,  // 每页个数
             totalLength: 0, // 获取后台传的所有数据的长度

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 // 获取后台传的所有数据的长度
         }
     },

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">

src/components/projectManagement/projectInformation/projectInformation.vue

@@ -150,8 +150,8 @@ export default {
                     time: '2020-03-02'
                 }
             ],
-            now: 3, // 当前进度
-            forecase: 2 // 预计进度
+            now: 0, // 当前进度
+            forecase: 0 // 预计进度
         }
     },
     created() {
@@ -204,12 +204,20 @@ export default {
                 $('.trasLine').css('opacity', '0')
             }
             if (this.now === 4) { // 终验
+                if (this.now === 4 && this.forecase === 4) { // 判断当前进度和期望进度都是终验
                     $('.blueLine').css('width', '');
                     $('.trasLine').css('opacity', '0')
                     $('.processAll>p:nth-child(1) .processList').addClass('blue');
                     $('.processAll>p:nth-child(2) .processList').addClass('blue');
                     $('.processAll>p:nth-child(3) .processList').addClass('blue');
                     $('.processAll>p:nth-child(4) .processList').addClass('blue')
+                } else { // 判断期望进度不是终验
+                    $('.blueLine').css('width', '');
+                    $('.processAll>p:nth-child(1) .processList').addClass('blue');
+                    $('.processAll>p:nth-child(2) .processList').addClass('blue');
+                    $('.processAll>p:nth-child(3) .processList').addClass('blue');
+                    $('.processAll>p:nth-child(4) .processList').addClass('blue')
+                }
             } else if (this.now === 3) { // 试运行阶段
                 $('.blueLine').css('width', '80%');
                 $('.processAll>p:nth-child(1) .processList').addClass('blue');

src/components/roleDispose/addRole.vue

@@ -141,7 +141,7 @@ export default {
     font-size: 18px;
     color: #666;
     text-align: center;
-    margin-top: 40px;
+    margin-top: 25px;
   }
   .add-role .addVal>span{
     width: 160px;
@@ -157,7 +157,7 @@ export default {
   .add-role .buttonClick{
     display: flex;
     justify-content: space-evenly;
-    margin-top: 30px;
+    margin-top: 36px;
   }
   .add-role .company-content>>>.el-radio{
     margin-right: 30px;

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;
             })

src/services/server.js

@@ -10,6 +10,7 @@ import axios from '@/services/axios';
  * dataType
  */
 import qs from 'qs';
+const assess = 'http://120.55.57.35:8079'
 const server = {
     getfindAll() { // 获取权限列表
         return axios('/authority/findAll', {
@@ -279,113 +280,109 @@ const server = {
         })
     },
     getEvaluationList(page,size,data) { // 评估报告管理
-        return axios( '/evaluation/search/' + page + '/' + size,{
+        return axios( assess + '/evaluation/search/' + page + '/' + size,{
             method: 'post',
             data: data
         })
     },
     delEvaluationList(id) { // 删除评估报告管理
-        return axios('/evaluation/' + id,{
+        return axios( assess + '/evaluation/' + id,{
             method: 'delete'
         })
     },
     getAllPageList(page,size,data){ // 关键技术管理列表
-        return axios( '/technology/search/' + page + '/' + size,{
+        return axios( assess + '/technology/search/' + page + '/' + size,{
             method: 'post',
             data: data
         })
     },
     getAllKeySelect(){ // 获取关键技术类型
-        return axios('/category',{
+        return axios( assess + '/category',{
             method: 'get'
         })
     },
     addTec(data){ // 新增关键技术管理
-        return axios('/technology/add',{
+        return axios( assess + '/technology/add',{
             method: 'post',
             data: data
         })
     },
     editKey(id,data){ // 修改关键技术管理
-        return axios('/technology/' + id,{
+        return axios( assess + '/technology/' + id,{
             method: 'post',
             data: data
         })
     },
     getConfigValue(){ // 获取参数配置
-        return axios( '/config',{
+        return axios( assess + '/config',{
             method: 'get',
         })
     },
     editConfigValue(data){ // 修改参数配置
-        return axios( '/config/updates',{
+        return axios( assess + '/config/updates',{
             method: 'post',
             data: data
         })
     },
     getAllList(){ // 关键技术
-        return axios('/technology',{
+        return axios( assess + '/technology',{
             method: 'get'
         })
     },
     editConfigUpdate(data){ // 修改规则配置
-        return axios('/rule/update',{
+        return axios( assess + '/rule/update',{
             method: 'post',
             data:data
         })
     },
     addConfig(data){ // 规则
-        return axios('/rule',{
+        return axios( assess + '/rule',{
             method: 'post',
             data: data
         })
     },
     delConfig(data){ // 规则配置删除
-        return axios('/rule/',{
+        return axios( assess + '/rule/',{
             method: 'delete',
             data: data
         })
     },
     getConfigPageList(page,size,data){ // 未知规则配置搜索
-        return axios( '/rule/search/' + page + '/' + size,{
+        return axios( assess + '/rule/search/' + page + '/' + size,{
             method: 'post',
             data: data
         })
     },
     goPg(data){
-		return axios("/inspect/rapidAssessment",{
-			method:"post",
+        return axios( assess + '/inspect/rapidAssessment',{
+            method:'post',
             data:data
         })
     },
     pgName(name){
-		return axios( "/evaluation/in/"+ name,{
-			method:"get",
-		
+        return axios( assess + '/evaluation/in/'+ name,{
+            method:'get',
         })
     },
     getTechnology(data){
-	
-        return axios(  "/evaluation/eva?id="+data.id+'&name='+data.name,{
-            method:"get",
-			
+        return axios( assess + '/evaluation/eva?id='+data.id+'&name='+data.name,{
+            method:'get',
         })
     },
     upZip(data){
-		return axios(  "/inspect/uploads",{
-			method:"post",
+        return axios( assess + '/inspect/uploads',{
+            method:'post',
             data:data
         })
     },
     upGit(data){
-		return axios("/inspect/gitdownload",{
+        return axios( assess + '/inspect/gitdownload',{
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
             },
-			// application/x-www-form-urlencode
-			method:"post",
+            method:'post',
             data:qs.stringify(data)
         })
-	},
+    }
 }
 export default server;