首页接口对接

src/components/allot-info-confirm.vue

@@ -146,6 +146,7 @@ export default {
           params: {
             id: this.detail.id,
             user_id: this.detail.user_id,
+            namespace:this.detail.namespace
           },
         })
         .then(({ data }) => {

src/components/shop-car-apply/apply_form.vue

@@ -14,7 +14,7 @@
       </el-form-item>
       <el-form-item prop="preson">
         <p class="formname">部门联系人：</p>
-        <el-input v-model="formInline.preson" placeholder="审批人"></el-input>
+        <el-input v-model="formInline.preson" placeholder="申请人"></el-input>
       </el-form-item>
       <el-form-item prop="phone">
         <p class="formname">联系电话：</p>

src/components/table/table-um.vue

@@ -89,12 +89,12 @@
               <b v-for="(btn, key) in item.btnList" :key="key" :style="{marginRight:item.btngap}">
                 <em v-if="btn.label == '分配'">
                   <em
-                    v-if="btn.label == '分配' && !scope.row.use_uid"
+                    v-if="btn.label == '分配' && !scope.row.State"
                     class="cur_pointer"
                     style="color: #0f2683"
                     @click="handleClick(btn.type, scope.row)"
                   >分配</em>
-                  <em v-if="btn.label == '分配' && scope.row.use_uid">已分配</em>
+                  <em v-if="btn.label == '分配' && scope.row.State">已分配</em>
                 </em>
 
                 <em v-else-if="btn.label == '当前版本'">

src/pages/workbench/fwgl/serviceDetail.vue

@@ -23,7 +23,7 @@
             :list_arr="now_service == 0 ? list_arr : servicead_arr"
             v-if="now_service == 0 || now_service == 1"
           >
-            <table-um :headers="header_arr" :datas="res_data" slot="zd_table"></table-um>
+            <table-um :headers="header_arr" :datas="res_data" :stripe="true" slot="zd_table"></table-um>
             <v-apaas-code :datas="code_arr" slot="zd_code"></v-apaas-code>
           </info-list>
           <div v-show="now_service == 2">

src/pages/workbench/workPlace.vue

@@ -560,17 +560,17 @@ export default {
         [
           "/apaas/service/v3/service/manager/list",
           "/apaas/service/v3/service/apply/service/list",
-          "/apaas/service/v3/resource/user/apply/list"
+          "/apaas/service/v3/workplace/normal/list"
         ],
         [
           "/apaas/service/v3/service/manager/list",
           "/apaas/service/v3/service/approval/applied/list",
-          "/apaas/service/v3/resource/user/apply/list"
+          "/apaas/service/v3/workplace/org/list"
         ],
         [
           "/apaas/service/v3/service/manager/list",
           "/apaas/service/v3/service/approval/applied/list",
-          "/apaas/service/v3/resource/user/apply/list"
+          "/apaas/service/v3/workplace/super/list"
         ]
       ],
       service_head: [
@@ -633,37 +633,37 @@ export default {
           ],
           [
             {
-              prop: "name_space",
+              prop: "Workplace",
               label: "工作区域",
               width: "150px",
               align: "left"
             },
             {
-              prop: "wlhj",
+              prop: "network",
               label: "网络环境",
               width: "120px",
               align: "center"
             },
             {
-              prop: "cpu",
+              prop: "Cpu",
               label: "CPU(核)",
               width: "90px",
               align: "center"
             },
             {
-              prop: "memory",
+              prop: "Memory",
               label: "内存(GB)",
               width: "90px",
               align: "center"
             },
             {
-              prop: "zyzlgb",
-              label: "资源总量(GB)",
+              prop: "pan",
+              label: "数据盘(块/GB)",
               width: "120px",
               align: "center"
             },
             {
-              prop: "approve_state_name",
+              prop: "statename",
               label: "申请状态",
               width: "110px",
               align: "center"
@@ -729,33 +729,33 @@ export default {
           ],
           [
             {
-              prop: "name_space",
+              prop: "Workplace",
               label: "工作区域",
               width: "100px",
               align: "left"
             },
             {
-              prop: "wlhj",
+              prop: "network",
               label: "网络环境",
               width: "90px",
               align: "center"
             },
             {
-              prop: "cpu",
+              prop: "Cpu",
               label: "CPU(核)",
               width: "80px",
               align: "center"
             },
             {
-              prop: "memory",
+              prop: "Memory",
               label: "内存(GB)",
               width: "80px",
               align: "center"
             },
             {
-              prop: "zyzlgb",
-              label: "资源总量(GB)",
-              width: "110px",
+              prop: "pan",
+              label: "数据盘(块/GB)",
+              width: "120px",
               align: "center"
             },
             {
@@ -835,7 +835,7 @@ export default {
           ],
           [
             {
-              prop: "department_name ",
+              prop: "department_name",
               label: "所属组织",
               width: "170px",
               align: "left"
@@ -853,7 +853,7 @@ export default {
               align: "center"
             },
             {
-              prop: "gzqysl",
+              prop: "container",
               label: "工作区域数量(个)",
               width: "130px",
               align: "center"
@@ -1162,8 +1162,21 @@ export default {
           }
           let data = response.data.data;
           if(this.now_type==2){
-            this.service_data = data.cloud_apply_list
-            this.listTotal = response.data.total;
+            this.listTotal = data.total;
+            data.data.forEach(e => {
+              if(e.DiskList&&e.DiskList.length){
+                e['pan'] = e.DiskList.join(';')
+              }
+              if(e.State||e.State==0){
+                e['statename'] = e.State==1?'审核通过':e.State==0?'待审核':'拒绝'
+              }
+              if(e.NetworkEnv||e.NetworkEnv==0){
+                e['network'] = e.NetworkEnv==0?'外网':'政府内网'
+              }
+
+              
+            });
+            this.service_data = data.data
           }else{
             this.service_data = data.data;
             this.service_data.forEach(e => {
@@ -1410,7 +1423,7 @@ export default {
     //分配接口调用
     distribut(val) {
       console.log(val);
-      this.$refs.allotConfirm.getDetail(val.apply_id);
+      this.$refs.allotConfirm.getDetail(val.ApplyId);
     },
     manage_func(n) {
       console.log(n);

src/pages/workbench/yygl/app_detail.vue

@@ -530,7 +530,7 @@ export default {
     },
     delete_data(name) {
       this.$http
-        .delete(`/apaas/hubApi/image/del/${name}`)
+        .delete(`/apaas/hubApi/image/del/${name}?app_id=${this.$route.params.id}`)
         .then((response) => {
           if (response.data.success == 1) {
             this.$message.success("删除成功");

src/pages/workbench/yygl/deploy_app_detail.vue

@@ -48,7 +48,7 @@
               ></table-um>
             </info-list>
 
-            <div
+            <!-- <div
               @click="public_form = true"
               v-if="public && now_service == 0"
               class="addimage"
@@ -86,7 +86,7 @@
                   <div class="btnsty" @click="saveInfo('ruleForm')">保存</div>
                 </div>
               </el-form-item>
-            </el-form>
+            </el-form> -->
           </div>
 
           <!-- <div v-if="now_service == 1&&image_arr.length"> -->
@@ -245,9 +245,9 @@
               <p class="formname">开放程度：</p>
               <el-form-item prop="open">
                 <el-radio-group v-model="publicForm.open">
-                  <el-radio label="共享"></el-radio>
-                  <el-radio label="受限"></el-radio>
-                  <el-radio label="敏感"></el-radio>
+                  <el-radio :label="1">共享</el-radio>
+                  <el-radio :label="2">受限</el-radio>
+                  <el-radio :label="3">敏感</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-form>
@@ -590,11 +590,26 @@ export default {
     dialogCancel(){
       this.$refs.actiondialog.hide();
     },
+    service_public(){
+      this.$http
+        .post(`/apaas/service/v3/service/manager/apptoserv`,{
+          sectors:this.publicForm.area,
+          deply_id:parseInt(this.$route.params.deploy_id),
+          openness:this.publicForm.open
+        })
+        .then(response => {
+          if(response.data.success){
+            this.$message.success(response.data.errMsg)
+          }else{
+            this.$message.error(response.data.errMsg)
+          }
+        })
+    },
     save_file(){
       this.$refs['publicForm'].validate((valid) => {
           if (valid) {
             this.$refs.actiondialog.hide();
-            this.$router.push('/fwzc/fwcs')
+            this.service_public()
           } else {
             console.log('error submit!!');
             return false;

src/pages/workbench/yygl/deployment.vue

@@ -169,6 +169,9 @@
                 </el-radio-group>
               </div>
             </el-form-item>
+            <el-form-item :label="item.text" v-if="item.type == 'view'">
+              <p style="color:#515fe7;padding-left:10px;">{{item.value}}</p>
+            </el-form-item>
           </div>
         </el-form>
         <div class="senior_box" @click="senior_flag = true" v-if="!senior_flag">
@@ -272,6 +275,8 @@ export default {
   data: () => ({
     step: 0,
     senior_flag: false,
+    host:'',
+    path:'',
     begin_code: "",
     baseInfoForm: {
       namespace: "",
@@ -485,7 +490,9 @@ export default {
           uu: this.evtUuid,                                         
           values: this.app_set_info,
           source: this.$route.query.source == "apply" ? "apply" : "",
-          pvc_id: this.parseInt_arr(this.select_volumn)
+          pvc_id: this.parseInt_arr(this.select_volumn),
+          host:this.host,
+          path:this.path,
         };
       } else {
         //编辑提交
@@ -567,6 +574,12 @@ export default {
         } else if(e.type == "volume") {
           this.deal_key_value(e.name, e.type, [e.value,e.check_type]);
         }else{
+          if(e.type == "text"&&e.name=='host'){
+              this.host = e.value
+            }
+            if(e.type == "view"&&e.name=='path'){
+              this.path = e.value
+            }
           this.deal_key_value(e.name, e.type, e.value);
         }
       });