合并分支 'zax' 到 'master'

src/router/index.js

@@ -217,6 +217,18 @@ export default new Router({
                     name: 'parameterConfiguration',
                     component: resolve => require(['../components/parameterConfiguration/parameterConfiguration.vue'], resolve)
                 },
+                // 规则配置
+                {
+                    path: '/roleDispose',
+                    name: 'roleDispose',
+                    component: resolve => require(['../components/roleDispose/roleDispose.vue'], resolve)
+                },
+                // 未知依赖配置
+                {
+                    path: '/UnDependence',
+                    name: 'UnDependence',
+                    component: resolve => require(['../components/UnDependenceDispose/UnDependence.vue'], resolve)
+                },
             ]
 
         }

src/services/server.js

@@ -323,5 +323,34 @@ const server = {
             data: data
         })
     },
+    getAllList(){ // 关键技术
+        return axios(assessment + '/technology',{
+            method: 'get'
+        })
+    },
+    editConfigUpdate(data){ // 修改规则配置
+        return axios(assessment + '/rule/update',{
+            method: 'post',
+            data:data
+        })
+    },
+    addConfig(data){ // 规则
+        return axios(assessment + '/rule',{
+            method: 'post',
+            data: data
+        })
+    },
+    delConfig(data){ // 规则配置删除
+        return axios(assessment + '/rule/',{
+            method: 'delete',
+            data: data
+        })
+    },
+    getConfigPageList(page,size,data){ // 未知规则配置搜索
+        return axios(assessment + '/rule/search/' + page + '/' + size,{
+            method: 'post',
+            data: data
+        })
+    },
 }
 export default server;