合并分支 'crs' 到 'master'

config.js

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

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/basicInformation/person/person.vue

@@ -132,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/role/authority.vue

@@ -18,9 +18,15 @@
                     </span>
                 </span>
             </p>
-            <p class="authorityList">
-                <span v-for="(item,index) of authority" @click="clickList(index,item)"><span class="author"></span>{{item.name}}</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>
+                    </p>
+                </el-scrollbar>
+            </div>
         </div>
         <p class="line"></p>
         <p class="buttonClick">
@@ -65,8 +71,16 @@ export default {
                 }
                 setTimeout(()=>{
                     for (let item of this.allAuthority) {
-                        let val = '.authorityList>span:nth(' + (item - 1) + ')';
-                        $(val).addClass('authorityListClick')
+                        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)
 
@@ -196,18 +210,23 @@ export default {
         cursor: pointer;
         color: #4877e6;
     }
+    .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;
@@ -220,4 +239,7 @@ export default {
     .authority .authorityListClick>span{
         background: url("./img/click.png");
     }
+    .authority .authorityAll>>>.el-scrollbar__wrap {
+        overflow-x: hidden;
+    }
 </style>

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: {
     },
@@ -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/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/projectInformation/projectInformation.vue

@@ -150,8 +150,8 @@ export default {
                     time: '2020-03-02'
                 }
             ],
-            now: 3, // 当前进度
-            forecase: 2 // 预计进度
+            now: 0, // 当前进度
+            forecase: 0 // 预计进度
         }
     },
     created() {

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",
-			data:data
-		})
+        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",
-			data:data
-		})
+        return axios( assess + '/inspect/uploads',{
+            method:'post',
+            data:data
+        })
     },
     upGit(data){
-		return axios("/inspect/gitdownload",{
-			headers: {
-				'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' 
-			  },
-			// application/x-www-form-urlencode
-			method:"post",
-			data:qs.stringify(data)
-		})
-	},
+        return axios( assess + '/inspect/gitdownload',{
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+            },
+            method:'post',
+            data:qs.stringify(data)
+        })
+    }
 }
 export default server;