合并分支 'crs' 到 'master'

src/components/XCalliance/dynamicList/dynamicList.vue

@@ -77,7 +77,7 @@ export default {
             searchVal: '',
             currentPage: 1, // 分页第一页
             pagesize: 8,  // 每页个数
-            totleLength: 100, // 获取后台传的所有数据的长度
+            totleLength: 8, // 获取后台传的所有数据的长度
             allData:[
                 {
                     name: '天津麒麟正式更名为麒麟软件 国产操作系统主力军吹响出征号角！',

src/components/admittance/technical/technical.vue

@@ -144,6 +144,7 @@ export default {
         },
         // 搜索栏
         search() {
+            this.currentPage = 1;
             this.init();
         },
         // 点击分页

src/components/basicInformation/person/person.vue

@@ -181,6 +181,7 @@ export default {
         },
         // 搜索栏
         search() {
+            this.currentPage = 1;
             this.init();
         },
         // 点击分页

src/components/basicInformation/role/role.vue

@@ -117,6 +117,7 @@ export default {
         },
         // 搜索栏
         search() {
+            this.currentPage = 1;
             this.init();
         },
         // 点击分页

src/components/complaint/complaint/complaint.vue

@@ -8,7 +8,7 @@
                         <span class="searchVal">
                             <el-input v-model="searchVal" size="medium" placeholder="请输入查询内容" @change="search"></el-input>
                         </span>
-                        <span class="button" @click="search">查询</span>
+                        <span class="button" @click="search">搜索</span>
                         <span class="button new" @click="addComplaint" title="新增意见"><img src="./img/add.png"></span>
                     </p>
                     <div class="common-table">
@@ -137,6 +137,7 @@ export default {
         },
         // 搜索栏
         search() {
+            this.currentPage = 1;
             this.init();
         },
         // 点击分页
@@ -241,6 +242,7 @@ export default {
         border-radius: 4px;
         color: #fff;
         font-size: 18px;
+        margin-left: 12px;
     }
     .complaint .content .button:hover{
         background: rgba(72,119,230,.6);

src/components/complaint/complaintManagement/complaintManagement.vue

@@ -8,7 +8,7 @@
                         <span class="searchVal">
                             <el-input v-model="searchVal" size="medium" placeholder="请输入查询内容" @change="search"></el-input>
                         </span>
-                        <span class="button" @click="search">查询</span>
+                        <span class="button" @click="search">搜索</span>
                         <span class="button new" @click="addComplaint" title="新增意见"><img src="./img/add.png"></span>
                     </p>
                     <div class="common-table">
@@ -138,6 +138,7 @@ export default {
         },
         // 搜索栏
         search() {
+            this.currentPage = 1;
             this.init();
         },
         // 点击分页
@@ -239,6 +240,7 @@ export default {
         border-radius: 4px;
         color: #fff;
         font-size: 18px;
+        margin-left: 12px;
     }
     .complaintManagement .content .button:hover{
         background: rgba(72,119,230,.6);

src/components/evaluationReport/evaluationReport.vue

@@ -7,9 +7,10 @@
                     <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>
+                        <span class="button" @click="search">搜索</span>
                         <span class="button new"  title="新增报告"><img src="./img/add.png"></span>
                     </p>
                     <div class="common-table">
@@ -188,13 +189,12 @@ export default {
         display: flex;
     }
     .evaluationReport .content .searchVal{
-        width: 190px;
         display: flex;
         font-size: 18px;
         color: #4663a6;
     }
     .evaluationReport .content .searchVal>span{
-        width: 140px;
+        width: 70px;
         display: inline-block;
         line-height: 34px;
     }
@@ -224,6 +224,7 @@ export default {
         border-radius: 4px;
         color: #fff;
         font-size: 18px;
+        margin-left: 12px;
     }
     .evaluationReport .content .button:hover{
         background: rgba(72,119,230,.6);

src/components/home/home.vue

@@ -38,8 +38,8 @@
                     </p>
                 </div>
                 <div class="menu">
-                    <p class="bg">
-                        <img src="./img/PG.png" @click="jump('evaluationReport',1,'评估报告管理')">
+                    <p class="bg" @click="jump('evaluationReport',1,'评估报告管理')">
+                        <img src="./img/PG.png">
                         <span>评估报告管理</span>
                     </p>
                     <p class="bg" v-if="this.$store.getters.getUserData.type !== 1" @click="jump('projectManagement',2,'我的项目')">
@@ -67,7 +67,7 @@
                         <img src="./img/GJJS.png">
                         <span>关键技术管理</span>
                     </p>
-                    <p class="bg" v-if="this.$store.getters.getUserData.type === 1">
+                    <p class="bg" v-if="this.$store.getters.getUserData.type === 1" @click="jump('roleDispose',5,'规则配置')">
                         <img src="./img/GZ.png">
                         <span>规则配置</span>
                     </p>
@@ -75,7 +75,7 @@
                         <img src="./img/CS.png">
                         <span>参数配置</span>
                     </p>
-                    <p class="bg" v-if="this.$store.getters.getUserData.type === 1">
+                    <p class="bg" v-if="this.$store.getters.getUserData.type === 1" @click="jump('UnDependence',7,'未知依赖配置')">
                         <img src="./img/WZ.png">
                         <span>未知依赖配置</span>
                     </p>
@@ -130,6 +130,8 @@ export default {
     .firstHome{
         background: #ebf0f8;
         padding: 116px 116px 0 150px;
+        height: 982px;
+        box-sizing: border-box;
     }
     .firstHome .bg{
         width: 180px;

src/components/integration/dynamicList/dynamicList.vue

@@ -77,7 +77,7 @@ export default {
             searchVal: '',
             currentPage: 1, // 分页第一页
             pagesize: 8,  // 每页个数
-            totleLength: 100, // 获取后台传的所有数据的长度
+            totleLength: 8, // 获取后台传的所有数据的长度
             allData:[
                 {
                     name: '市民政局领导到秀水中专调研与考察老年健康与护理实训基地',

src/components/keyTechnology/keyTechnology.vue

@@ -7,9 +7,10 @@
                     <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>
+                        <span class="button" @click="search">搜索</span>
                         <span class="button new"  title="新增技术" @click="add"><img src="./img/add.png"></span>
                     </p>
                     <div class="common-table">
@@ -184,13 +185,12 @@ export default {
         display: flex;
     }
     .keyTechnology .content .searchVal{
-        width: 190px;
         display: flex;
         font-size: 18px;
         color: #4663a6;
     }
     .keyTechnology .content .searchVal>span{
-        width: 140px;
+        width: 70px;
         display: inline-block;
         line-height: 34px;
     }
@@ -220,6 +220,7 @@ export default {
         border-radius: 4px;
         color: #fff;
         font-size: 18px;
+        margin-left: 12px;
     }
     .keyTechnology .content .button:hover{
         background: rgba(72,119,230,.6);

src/components/sidebar/sidebar.vue

@@ -36,28 +36,28 @@
                 </p>
             </div>
 
-            <div @click="clickMenu('keyTechnology',4,'关键技术管理')">
+            <div @click="clickMenu('keyTechnology',4,'关键技术管理')" v-if="this.$store.getters.getUserData.type === 1">
                 <p class="menu">
                     <span class="font">关键技术管理</span>
                     <span class="line"></span>
                 </p>
             </div>
 
-            <div @click="clickMenu('roleDispose',5,'规则配置')">
+            <div @click="clickMenu('roleDispose',5,'规则配置')" v-if="this.$store.getters.getUserData.type === 1">
                 <p class="menu">
                     <span class="font">规则配置</span>
                     <span class="line"></span>
                 </p>
             </div>
 
-            <div @click="clickMenu('parameterConfiguration',6,'参数配置')">
+            <div @click="clickMenu('parameterConfiguration',6,'参数配置')" v-if="this.$store.getters.getUserData.type === 1">
                 <p class="menu">
                     <span class="font">参数配置</span>
                     <span class="line"></span>
                 </p>
             </div>
 
-            <div @click="clickMenu('UnDependence',7,'未知依赖配置')">
+            <div @click="clickMenu('UnDependence',7,'未知依赖配置')" v-if="this.$store.getters.getUserData.type === 1">
                 <p class="menu">
                     <span class="font">未知依赖配置</span>
                     <span class="line"></span>