合并分支 'crs' 到 'master'

src/components/XCalliance/dynamicList/dynamicList.vue

@@ -6,8 +6,8 @@
                     <p class="title">最新动态</p>
                     <p class="search">
                         <span class="searchVal">
-                            <span>名称：</span>
-                            <el-input v-model="searchVal" size="medium" placeholder="请输入"></el-input>
+                            <span>查询：</span>
+                            <el-input v-model="searchVal" size="medium" placeholder="请输入查询内容"></el-input>
                         </span>
                         <span class="button">搜索</span>
                     </p>
@@ -189,13 +189,13 @@ export default {
         display: flex;
     }
     .dynamicList .content .searchVal{
-        width: 245px;
+        width: 280px;
         display: flex;
         font-size: 18px;
         color: #4663a6;
     }
     .dynamicList .content .searchVal>span{
-        width: 85px;
+        width: 75px;
         display: inline-block;
         line-height: 34px;
     }
@@ -205,7 +205,6 @@ export default {
         font-size: 18px;
         height: 34px;
         line-height: 34px;
-        width: 180px;
     }
     .dynamicList .content .button{
         display: inline-block;
@@ -218,6 +217,7 @@ export default {
         border-radius: 4px;
         color: #fff;
         font-size: 18px;
+        margin-left: 100px;
     }
     .dynamicList .content .button:hover{
         background: rgba(72,119,230,.6);

src/components/basicInformation/person/person.vue

@@ -133,7 +133,7 @@ export default {
                         }
                         let val = {
                             name: '基础资料管理',
-                            index: 4,
+                            index: 11,
                             childPath: 'person',
                             childIndex: 2
                         }

src/components/basicInformation/role/role.vue

@@ -6,8 +6,8 @@
                     <p class="title">角色管理</p>
                     <p class="search">
                         <span class="searchVal">
-                            <span>角色名称：</span>
-                            <el-input v-model="searchVal" size="medium" placeholder="请输入" @change="search"></el-input>
+                            <span>查询：</span>
+                            <el-input v-model="searchVal" size="medium" placeholder="请输入角色名称" @change="search"></el-input>
                         </span>
                         <span class="button" @click="search">搜索</span>
                         <span class="button new" @click="addrole" title="新增角色"><img src="./img/add.png"></span>
@@ -198,7 +198,7 @@ export default {
         color: #4663a6;
     }
     .role .content .searchVal>span{
-        width: 140px;
+        width: 75px;
         display: inline-block;
         line-height: 34px;
     }
@@ -219,7 +219,6 @@ export default {
         font-size: 18px;
         height: 34px;
         line-height: 34px;
-        width: 180px;
     }
     .role .content .button{
         display: inline-block;
@@ -232,6 +231,7 @@ export default {
         border-radius: 4px;
         color: #fff;
         font-size: 18px;
+        margin-left: 100px;
     }
     .role .content .button:hover{
         background: rgba(72,119,230,.6);

src/components/complaint/complaint/complaint.vue

@@ -6,6 +6,7 @@
                     <p class="title">意见建议</p>
                     <p class="search">
                         <span class="searchVal">
+                            <span>查询：</span>
                             <el-input v-model="searchVal" size="medium" placeholder="请输入查询内容" @change="search"></el-input>
                         </span>
                         <span class="button" @click="search">搜索</span>
@@ -206,13 +207,13 @@ export default {
         display: flex;
     }
     .complaint .content .searchVal{
-        width: 190px;
+        width: 280px;
         display: flex;
         font-size: 18px;
         color: #4663a6;
     }
     .complaint .content .searchVal>span{
-        width: 140px;
+        width: 75px;
         display: inline-block;
         line-height: 34px;
     }
@@ -229,7 +230,6 @@ export default {
         font-size: 18px;
         height: 34px;
         line-height: 34px;
-        width: 180px;
     }
     .complaint .content .button{
         display: inline-block;
@@ -242,7 +242,7 @@ export default {
         border-radius: 4px;
         color: #fff;
         font-size: 18px;
-        margin-left: 12px;
+        margin-left: 100px;
     }
     .complaint .content .button:hover{
         background: rgba(72,119,230,.6);

src/components/complaint/complaintManagement/complaintManagement.vue

@@ -6,6 +6,7 @@
                     <p class="title">投诉管理</p>
                     <p class="search">
                         <span class="searchVal">
+                            <span>查询：</span>
                             <el-input v-model="searchVal" size="medium" placeholder="请输入查询内容" @change="search"></el-input>
                         </span>
                         <span class="button" @click="search">搜索</span>
@@ -204,13 +205,13 @@ export default {
         display: flex;
     }
     .complaintManagement .content .searchVal{
-        width: 190px;
+        width: 280px;
         display: flex;
         font-size: 18px;
         color: #4663a6;
     }
     .complaintManagement .content .searchVal>span{
-        width: 140px;
+        width: 75px;
         display: inline-block;
         line-height: 34px;
     }
@@ -227,7 +228,6 @@ export default {
         font-size: 18px;
         height: 34px;
         line-height: 34px;
-        width: 180px;
     }
     .complaintManagement .content .button{
         display: inline-block;
@@ -240,7 +240,7 @@ export default {
         border-radius: 4px;
         color: #fff;
         font-size: 18px;
-        margin-left: 12px;
+        margin-left: 100px;
     }
     .complaintManagement .content .button:hover{
         background: rgba(72,119,230,.6);

src/components/evaluationReport/evaluationReport.vue

@@ -8,7 +8,7 @@
                     <p class="search">
                         <span class="searchVal">
                             <span>查询：</span>
-                            <el-input v-model="searchVal" size="medium" placeholder="请输入查询内容" @change="search"></el-input>
+                            <el-input v-model="searchVal" size="medium" placeholder="请输入项目名称" @change="search"></el-input>
                         </span>
                         <span class="button" @click="search">搜索</span>
                         <span class="button new"  title="新增报告"><img src="./img/add.png"></span>
@@ -189,12 +189,13 @@ export default {
         display: flex;
     }
     .evaluationReport .content .searchVal{
+        width: 280px;
         display: flex;
         font-size: 18px;
         color: #4663a6;
     }
     .evaluationReport .content .searchVal>span{
-        width: 70px;
+        width: 75px;
         display: inline-block;
         line-height: 34px;
     }
@@ -211,7 +212,6 @@ export default {
         font-size: 18px;
         height: 34px;
         line-height: 34px;
-        width: 180px;
     }
     .evaluationReport .content .button{
         display: inline-block;
@@ -224,7 +224,7 @@ export default {
         border-radius: 4px;
         color: #fff;
         font-size: 18px;
-        margin-left: 12px;
+        margin-left: 100px;
     }
     .evaluationReport .content .button:hover{
         background: rgba(72,119,230,.6);

src/components/header/header.vue

@@ -133,10 +133,13 @@ export default {
                 if (val !== '') {
                     $('.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';
                     $(menu).addClass('click');
                     $(font).addClass('fontClick');
+                    $(line).addClass('lineClick');
                     if (val.childPath === '') {
                         $('.listVal>span').removeClass('menuClick') // 修改样式
                         $('.menuTitle').addClass('goTitle')

src/components/home/home.vue

@@ -8,19 +8,27 @@
                         <img src="./img/JD.png">
                         <span>基地建设</span>
                     </p>
-                    <p class="bg" @click="jump('XCalliance',9,'XX联盟')">
+                    <p class="bg" @click="jump('XCalliance',9,'XX联盟')" v-if="this.$store.getters.getUserData.type === 1">
                         <img src="./img/XC.png">
                         <span>XX联盟</span>
                     </p>
-                    <p class="bg" @click="jump('integration',10,'XXX一体化')">
+                    <p class="bg" @click="jump('integration',10,'XXX一体化')" v-if="this.$store.getters.getUserData.type === 1">
                         <img src="./img/ZQ.png">
                         <span>XXX一体化</span>
                     </p>
-                    <p class="bg" v-if="this.$store.getters.getUserData.type !== 1" @click="jump('company',11,'国家名录')">
+                    <p class="bg" @click="jump('XCalliance',5,'XX联盟')" v-if="this.$store.getters.getUserData.type !== 1">
+                        <img src="./img/XC.png">
+                        <span>XX联盟</span>
+                    </p>
+                    <p class="bg" @click="jump('integration',6,'XXX一体化')" v-if="this.$store.getters.getUserData.type !== 1">
+                        <img src="./img/ZQ.png">
+                        <span>XXX一体化</span>
+                    </p>
+                    <p class="bg" v-if="this.$store.getters.getUserData.type !== 1" @click="jump('company',7,'国家名录')">
                         <img src="./img/GJ.png">
                         <span>国家名录</span>
                     </p>
-                    <p class="bg" v-if="this.$store.getters.getUserData.type !== 1" @click="jump('product',12,'市级名录')">
+                    <p class="bg" v-if="this.$store.getters.getUserData.type !== 1" @click="jump('product',8,'市级名录')">
                         <img src="./img/SJ.png">
                         <span>市级名录</span>
                     </p>

src/components/integration/dynamicList/dynamicList.vue

@@ -6,8 +6,8 @@
                     <p class="title">最新动态</p>
                     <p class="search">
                         <span class="searchVal">
-                            <span>名称：</span>
-                            <el-input v-model="searchVal" size="medium" placeholder="请输入"></el-input>
+                            <span>查询：</span>
+                            <el-input v-model="searchVal" size="medium" placeholder="请输入查询内容"></el-input>
                         </span>
                         <span class="button">搜索</span>
                     </p>
@@ -175,13 +175,13 @@ export default {
         display: flex;
     }
     .dynamicList .content .searchVal{
-        width: 245px;
+        width: 280px;
         display: flex;
         font-size: 18px;
         color: #4663a6;
     }
     .dynamicList .content .searchVal>span{
-        width: 85px;
+        width: 75px;
         display: inline-block;
         line-height: 34px;
     }
@@ -191,7 +191,6 @@ export default {
         font-size: 18px;
         height: 34px;
         line-height: 34px;
-        width: 180px;
     }
     .dynamicList .content .button{
         display: inline-block;
@@ -204,6 +203,7 @@ export default {
         border-radius: 4px;
         color: #fff;
         font-size: 18px;
+        margin-left: 100px;
     }
     .dynamicList .content .button:hover{
         background: rgba(72,119,230,.6);

src/components/keyTechnology/keyTechnology.vue

@@ -185,12 +185,13 @@ export default {
         display: flex;
     }
     .keyTechnology .content .searchVal{
+        width: 280px;
         display: flex;
         font-size: 18px;
         color: #4663a6;
     }
     .keyTechnology .content .searchVal>span{
-        width: 70px;
+        width: 75px;
         display: inline-block;
         line-height: 34px;
     }
@@ -201,13 +202,12 @@ export default {
     .keyTechnology .content .change>img{
         margin-right: 3px;
     }
-    .keyTechnology>>>.el-input__inner{
+    .keyTechnology .searchVal>>>.el-input__inner{
         border: 1px solid rgba(8,104,157,.3);
         border-radius: 2px;
         font-size: 18px;
         height: 34px;
         line-height: 34px;
-        width: 180px;
     }
     .keyTechnology .content .button{
         display: inline-block;
@@ -220,7 +220,7 @@ export default {
         border-radius: 4px;
         color: #fff;
         font-size: 18px;
-        margin-left: 12px;
+        margin-left: 100px;
     }
     .keyTechnology .content .button:hover{
         background: rgba(72,119,230,.6);

src/components/keyTechnology/keyTechnologyAdd.vue

@@ -171,7 +171,7 @@ export default {
         font-size: 18px;
         height: 34px;
         line-height: 34px;
-        width: 150px;
+        width: 190px;
     }
     .addkeyTechnology .line{
         margin: 55px 20px 0 20px;

src/components/projectManagement/hardware/hardware.vue

@@ -6,7 +6,8 @@
         <div class="content">
           <p class="search">
             <span class="searchVal">
-                <el-input v-model="searchVal" size="medium" placeholder="请输入" @change="search"></el-input>
+                <span>查询：</span>
+                <el-input v-model="searchVal" size="medium" placeholder="请输入查询内容" @change="search"></el-input>
             </span>
             <span class="button buttonSave" @click="search">搜索</span>
           </p>
@@ -141,7 +142,12 @@ export default {
     font-size: 18px;
     color: #4663a6;
   }
+  .hardware .content .searchVal>span{
+    width: 75px;
+    display: inline-block;
+    line-height: 34px;
+  }
   .hardware .content .button {
-    margin-left: 12px;
+    margin-left: 100px;
   }
 </style>

src/components/projectManagement/journal/journal.vue

@@ -6,7 +6,8 @@
         <div class="content">
           <p class="search">
             <span class="searchVal">
-                <el-input v-model="searchVal" size="medium" placeholder="请输入" @change="search"></el-input>
+                <span>查询：</span>
+                <el-input v-model="searchVal" size="medium" placeholder="请输入查询内容" @change="search"></el-input>
             </span>
             <span class="button buttonSave" @click="search">搜索</span>
           </p>
@@ -148,7 +149,12 @@ export default {
     font-size: 18px;
     color: #4663a6;
   }
+  .journal .content .searchVal>span{
+    width: 75px;
+    display: inline-block;
+    line-height: 34px;
+  }
   .journal .content .button {
-    margin-left: 12px;
+    margin-left: 100px;
   }
 </style>

src/components/projectManagement/project/projectManagement.vue

@@ -7,7 +7,8 @@
           <p class="title">{{pageName}}</p>
           <p class="search">
             <span class="searchVal">
-                <el-input v-model="searchVal" size="medium" placeholder="请输入查询内容" @change="search"></el-input>
+                <span>查询：</span>
+                <el-input v-model="searchVal" size="medium" placeholder="请输入项目名称" @change="search"></el-input>
             </span>
             <span class="button buttonSave" @click="search">搜索</span>
             <span class="button add" @click="addProject" title="新增项目"><img src="./img/addpro.png"></span>
@@ -213,13 +214,12 @@ export default {
     display: flex;
   }
   .project .content .searchVal{
-    width: 280px;
     display: flex;
     font-size: 18px;
     color: #4663a6;
   }
   .project .content .button {
-    margin-left: 12px;
+    margin-left: 100px;
     display: inline-block;
     width: 100px;
     height: 34px;
@@ -240,13 +240,13 @@ export default {
     background: rgba(72,119,230,.6);
   }
   .project .content .searchVal{
-    width: 190px;
+    width: 280px;
     display: flex;
     font-size: 18px;
     color: #4663a6;
   }
   .project .content .searchVal>span{
-    width: 140px;
+    width: 75px;
     display: inline-block;
     line-height: 34px;
   }
@@ -256,6 +256,5 @@ export default {
     font-size: 18px;
     height: 34px;
     line-height: 34px;
-    width: 180px;
   }
 </style>

src/components/projectManagement/software/software.vue

@@ -6,7 +6,8 @@
         <div class="content">
           <p class="search">
             <span class="searchVal">
-                <el-input v-model="searchVal" size="medium" placeholder="请输入" @change="search"></el-input>
+                <span>查询：</span>
+                <el-input v-model="searchVal" size="medium" placeholder="请输入查询内容" @change="search"></el-input>
             </span>
             <span class="button buttonSave" @click="search">搜索</span>
           </p>
@@ -154,7 +155,12 @@ export default {
     font-size: 18px;
     color: #4663a6;
   }
+  .software .content .searchVal>span{
+    width: 75px;
+    display: inline-block;
+    line-height: 34px;
+  }
   .software .content .button {
-    margin-left: 12px;
+    margin-left: 100px;
   }
 </style>

src/components/roleDispose/roleDispose.vue

@@ -254,4 +254,4 @@ export default {
     color: #ffffff;
     /*表格单行hover样式*/
   }
-</style>
+</style>
\ No newline at end of file

src/components/sidebar/sidebar.vue

 <template>
     <div class="sidebarAll">
-        <div class="sidebar">
+        <div class="sidebar" v-if="this.$store.getters.getUserData.type !== 1">
             <div @click="clickMenu('evaluationReport',1,'评估报告管理')">
                 <p class="menu">
                     <span class="font">评估报告管理</span>
@@ -8,30 +8,80 @@
                 </p>
             </div>
 
-            <div @click="clickMenu('projectManagement',2,'项目管理')" v-if="this.$store.getters.getUserData.type === 1">
+            <div  @click="clickMenu('projectManagement',2,'我的项目')" v-if="this.$store.getters.getUserData.type !== 1">
                 <p class="menu">
-                    <span class="font">项目管理</span>
+                    <span class="font">我的项目</span>
                     <span class="line"></span>
                 </p>
             </div>
 
-            <div  @click="clickMenu('projectManagement',2,'我的项目')" v-if="this.$store.getters.getUserData.type !== 1">
+            <div @click="clickMenu('complaint',3,'意见建议')" v-if="this.$store.getters.getUserData.type !== 1">
                 <p class="menu">
-                    <span class="font">我的项目</span>
+                    <span class="font">意见建议</span>
                     <span class="line"></span>
                 </p>
             </div>
 
-            <div @click="clickMenu('complaintManagement',3,'投诉管理')" v-if="this.$store.getters.getUserData.type === 1">
+            <div>
                 <p class="menu">
-                    <span class="font">投诉管理</span>
+                    <span class="font">基地建设</span>
                     <span class="line"></span>
                 </p>
             </div>
 
-            <div @click="clickMenu('complaint',3,'意见建议')" v-if="this.$store.getters.getUserData.type !== 1">
+            <div @click="clickMenu('XCalliance',5,'XX联盟')">
                 <p class="menu">
-                    <span class="font">意见建议</span>
+                    <span class="font">XX联盟</span>
+                    <span class="line"></span>
+                </p>
+            </div>
+
+            <div @click="clickMenu('integration',6,'XXX一体化')">
+                <p class="menu">
+                    <span class="font">XXX一体化</span>
+                    <span class="line"></span>
+                </p>
+            </div>
+
+            <div @click="clickMenu('',7,'国家名录')"  v-if="this.$store.getters.getUserData.type !== 1">
+                <p class="menu">
+                    <span class="font">国家名录</span>
+                    <span class="line"></span>
+                </p>
+            </div>
+
+            <div @click="clickMenu('',8,'市级名录')"  v-if="this.$store.getters.getUserData.type !== 1">
+                <p class="menu">
+                    <span class="font">市级名录</span>
+                    <span class="line"></span>
+                </p>
+            </div>
+
+            <div>
+                <p class="menu">
+                    <span class="font">课题攻关</span>
+                    <span class="line"></span>
+                </p>
+            </div>
+        </div>
+        <div class="sidebar" v-if="this.$store.getters.getUserData.type === 1">
+            <div @click="clickMenu('evaluationReport',1,'评估报告管理')">
+                <p class="menu">
+                    <span class="font">评估报告管理</span>
+                    <span class="line"></span>
+                </p>
+            </div>
+
+            <div @click="clickMenu('projectManagement',2,'项目管理')" v-if="this.$store.getters.getUserData.type === 1">
+                <p class="menu">
+                    <span class="font">项目管理</span>
+                    <span class="line"></span>
+                </p>
+            </div>
+
+            <div @click="clickMenu('complaintManagement',3,'投诉管理')" v-if="this.$store.getters.getUserData.type === 1">
+                <p class="menu">
+                    <span class="font">投诉管理</span>
                     <span class="line"></span>
                 </p>
             </div>
@@ -85,20 +135,6 @@
                 </p>
             </div>
 
-            <div @click="clickMenu('',11,'国家名录')"  v-if="this.$store.getters.getUserData.type !== 1">
-                <p class="menu">
-                    <span class="font">国家名录</span>
-                    <span class="line"></span>
-                </p>
-            </div>
-
-            <div @click="clickMenu('',12,'市级名录')"  v-if="this.$store.getters.getUserData.type !== 1">
-                <p class="menu">
-                    <span class="font">市级名录</span>
-                    <span class="line"></span>
-                </p>
-            </div>
-
             <div @click="clickMenu('',11,'基础资料管理')" v-if="this.$store.getters.getUserData.type === 1">
                 <p class="menu">
                     <span class="font">基础资料管理</span>

src/services/axios.js

@@ -6,7 +6,7 @@ import store from '../store';
 // 添加请求拦截器
 axios.interceptors.request.use(function (config) {
     // console.log(store.getters.getSession.session)
-    // config.headers.session = store.getters.getSession.session;
+    config.headers.session = store.getters.getSession.session;
     // 预处理请求信息（config 发出的数据） 下方是三种请求，李迪凡的
     if (config.method === 'post' || config.method === 'put' || config.method === 'delete') {
     // POST传参序列化

src/services/server.js

@@ -9,7 +9,6 @@ import axios from '@/services/axios';
  * headers
  * dataType
  */
-const assessment = 'http://120.55.57.35:8079'
 const server = {
     getfindAll() { // 获取权限列表
         return axios('/authority/findAll', {
@@ -279,75 +278,75 @@ const server = {
         })
     },
     getEvaluationList(page,size,data) { // 评估报告管理
-        return axios(assessment + '/evaluation/search/' + page + '/' + size,{
+        return axios('/evaluation/search/' + page + '/' + size,{
             method: 'post',
             data: data
         })
     },
     delEvaluationList(id) { // 删除评估报告管理
-        return axios(assessment + '/evaluation/' + id,{
+        return axios('/evaluation/' + id,{
             method: 'delete'
         })
     },
     getAllPageList(page,size,data){ // 关键技术管理列表
-        return axios(assessment + '/technology/search/' + page + '/' + size,{
+        return axios('/technology/search/' + page + '/' + size,{
             method: 'post',
             data: data
         })
     },
     getAllKeySelect(){ // 获取关键技术类型
-        return axios(assessment + '/category',{
+        return axios('/category',{
             method: 'get'
         })
     },
     addTec(data){ // 新增关键技术管理
-        return axios(assessment + '/technology/add',{
+        return axios('/technology/add',{
             method: 'post',
             data: data
         })
     },
     editKey(id,data){ // 修改关键技术管理
-        return axios(assessment + '/technology/' + id,{
+        return axios('/technology/' + id,{
             method: 'post',
             data: data
         })
     },
     getConfigValue(){ // 获取参数配置
-        return axios(assessment + '/config',{
+        return axios('/config',{
             method: 'get',
         })
     },
     editConfigValue(data){ // 修改参数配置
-        return axios(assessment + '/config/updates',{
+        return axios('/config/updates',{
             method: 'post',
             data: data
         })
     },
     getAllList(){ // 关键技术
-        return axios(assessment + '/technology',{
+        return axios('/technology',{
             method: 'get'
         })
     },
     editConfigUpdate(data){ // 修改规则配置
-        return axios(assessment + '/rule/update',{
+        return axios('/rule/update',{
             method: 'post',
             data:data
         })
     },
     addConfig(data){ // 规则
-        return axios(assessment + '/rule',{
+        return axios('/rule',{
             method: 'post',
             data: data
         })
     },
     delConfig(data){ // 规则配置删除
-        return axios(assessment + '/rule/',{
+        return axios('/rule/',{
             method: 'delete',
             data: data
         })
     },
     getConfigPageList(page,size,data){ // 未知规则配置搜索
-        return axios(assessment + '/rule/search/' + page + '/' + size,{
+        return axios('/rule/search/' + page + '/' + size,{
             method: 'post',
             data: data
         })