合并分支 'thy' 到 'master'

config.js

@@ -3,12 +3,13 @@
  */
 
 // 服务地址
-const IP = 'http://120.55.57.35'; // 刘杰
-// const IP = 'http://192.168.1.104'; // 刘杰
+
+const IP = 'http://192.168.1.248'; // 刘杰
+// const IP = 'http://192.168.0.114'; // 刘杰
 
 // 请求目标服务器域名配置
 const DOMAIN_NAME = {
-    URL_CNODEJS: IP + ':12345', // 网关 服务端口
+    URL_CNODEJS: IP + ':8079', // 网关 服务端口
 };
 
 export default DOMAIN_NAME;

src/components/reportAssess/reportAssess.vue

@@ -23,8 +23,8 @@
                     <div class="one">
                         <div class="oneTitle"> <i></i>概要</div>
                         <div class="lineTop">
-                            <span @click="jump">导出PDF格式</span>
-                            <span @click="reback">改造替换</span>
+                            <span>导出PDF格式</span>
+                            <span @click="reback">信息填报</span>
                             <span @click="goBackprev">关闭</span>
                             <!-- <div ><span @click="goBackprev">返回</span> -->
                         </div>
@@ -84,9 +84,9 @@
                                 </el-row>
                                 <el-row>
                                     <el-col :span="8">
-                                        <div style="padding-left:35px;"> 建议：<span  class="nmmsl">
+                                        <div> 修改建议：<span  class="nmmsl">
                                             {{ this.type === 1 ?
-                                            '修改' : (this.type === 2 && this.language ===1 &&this.framework ===1) ? '修改': '重构' }}
+                                            '修改' : (this.type === 2 && this.language ===1 &&this.framework ===1) ? '代码修改': '系统重构' }}
                                         </span>
                                         </div>
                                     </el-col>
@@ -148,7 +148,7 @@
                                     <tr>
                                         <th></th>
                                         <th>计算值</th>
-                                        <th>操作</th>
+                                        <th>人工审核</th>
                                         <th>调整后</th>
                                     </tr>
                                     <tbody>

src/services/axios.js

@@ -9,6 +9,7 @@ let v = new Vue();
 // 添加请求拦截器
 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') {

src/services/server.js

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