合并分支 'thy' 到 'ningbo'

src/components/assessment/homeDetailcopy.vue

@@ -3585,7 +3585,8 @@ export default {
       obj.username = this.$route.query.username;
       obj.authority = Number(this.$route.query.authority);
       obj.developLanguageSystem = this.developLanguageSystem;
-    
+      obj.rto = this.rto
+      obj.rpo = this.rpo
       // 现在OBJ是究极整合
       //  this.loading = true
       for (var key in obj.database) {
@@ -3782,6 +3783,7 @@ export default {
     after(file) {
       //  var test = document.getElementById('fileUpload').files[0].name
       this.ziptext = this.$refs.file.files[0].name;
+      console.log("导入几个了",this.$refs.file.files)
       var fd = new FormData();
       fd.append("file", this.$refs.file.files[0]);
       fd.append("username", "qwe");
@@ -3789,7 +3791,7 @@ export default {
 
       this.$server.upExcel(fd).then(res => {
         console.log("导入Excel成功", res);
-
+       
         this.$message({
           message: "导入Excel成功",
           type: "success"

src/services/server.js

@@ -11,7 +11,7 @@ import axios from '@/services/axios';
  */
 import qs from 'qs';
 const assessma = 'http://120.55.57.35:8078'
-// const assessma = 'http://192.168.1.248:8079'
+// const assessma = 'http://192.168.1.85:8078'
 const server = {
     getloginOut(id) { // 用户退出
         return axios('/user/loginOut/' + id, {