Ver código fonte

恢复虚拟机跳转

weihy 3 anos atrás
pai
commit
4d0b4b8818

+ 8 - 7
src/components/project/ProjectCreate.vue

@@ -62,12 +62,12 @@
             style="max-height: 200px;"
           >
             <el-tab-pane :label="resourceType[0]" name="0">
-              <el-select  v-model="value" filterable placeholder="请选择" @change="getValue">
+              <el-select v-model="value" filterable placeholder="请选择" @change="getValue">
                 <el-option
-                  v-for="(item) in institutionArray"
+                  v-for="item in institutionArray"
                   :key="item.id"
                   :label="item.name"
-                  :value="item">
+                  :value="[item.name,item.id]">
                 </el-option>
               </el-select>
             </el-tab-pane>
@@ -362,9 +362,11 @@
       return provinceName + ' / ' + cityName
     },
     getValue (svalue) {
-      this.value = svalue.name;
-      this.project.institution.id = svalue.id;
-      this.project.institution.name = svalue.name;
+      // console.log(svalue);
+      this.value = svalue[0];
+      // console.log(this.value);
+      this.project.institution.id = svalue[1];
+      this.project.institution.name = svalue[0];
     },
     locationChange (provinceId, cityId) {
       // console.log("测试省:" + provinceId);
@@ -598,7 +600,6 @@
     width: 400px;
   }
 </style>
-
 <!--<el-form-item label="联系方式" prop="contact">-->
 <!--<div>-->
 <!--<el-row :gutter="2">-->

+ 2 - 2
src/components/task/Task.vue

@@ -154,8 +154,8 @@
             </el-form-item>
 
             <el-form-item v-if="!isModifyMode">
-              <!--<el-button v-if="taskOperationControl.update" @click="manageVirtualMachine()" type="primary" size="mini">管理虚拟机</el-button>-->
-              <!--<el-button v-if="taskOperationControl.writeReport||taskOperationControl.uploadReport" @click="connectVirtualMachine()" type="primary" size="mini">连接虚拟机</el-button>-->
+              <el-button v-if="taskOperationControl.update" @click="manageVirtualMachine()" type="primary" size="mini">管理虚拟机</el-button>
+              <el-button v-if="taskOperationControl.writeReport||taskOperationControl.uploadReport" @click="connectVirtualMachine()" type="primary" size="mini">连接虚拟机</el-button>
               <el-button size="mini" @click="toProject()">项目详情</el-button>
               <el-popover
                 placement="top-start"

+ 2 - 2
src/config/index.js

@@ -136,5 +136,5 @@ export const setConfig = (conf) => {
 
 // export const login_url = 'http://user.cofortest.com:8081/page/login?redirect=http%3a%2f%2fwww.cofortest.com%2f%23%2fhome'
 // export const  register_url = 'http://user.cofortest.com:8081/page/register'
-export const login_url = 'http://user.cofortest.com:8081/page/login?redirect=http%3a%2f%2fwww.cofortest.com%2f%23%2fhome'
-export const  register_url = 'http://user.cofortest.com:8081/page/register'
+export const login_url = 'http://crowd.dev.mooctest.net/page/login?redirect=http%3a%2f%2fcrowd.dev.mooctest.net%2f%23%2fhome'
+export const  register_url = 'http://crowd.dev.mooctest.net/page/register'