修改显示问题

src/pages/workbench/yygl/app_detail.vue

@@ -450,7 +450,11 @@ export default {
         if(response.data.success==1){
           console.log(response);
           this.asynLoad=true
-          this.image_arr.push(...response.data.data)
+          if(response.data.data&&response.data.data.length){
+            this.image_arr.push(...response.data.data)
+          }else{
+            this.image_arr = []
+          }
           this.total = response.data.total
           this.image_loading = false;
           this.image_noMore = false;

src/pages/workbench/yygl/apply_app_detail.vue

@@ -29,6 +29,7 @@
           <mavon-editor v-model="appcode" slot="app_code" :boxShadow="false" :toolbarsFlag="false" :subfield="false" defaultOpen="preview" :editable="false"/>
             <process-card :data="approval_arr3" slot="approval"></process-card>
           </info-list>
+          
         </div>
       </div>
     </div>
@@ -245,6 +246,10 @@ export default {
           title: "申请规格：",
           info: "",
         },
+        {
+          title: "申请时间：",
+          info: "",
+        },
         {
           title: "审批信息",
           prop:"title",
@@ -271,7 +276,7 @@ export default {
   methods: {
     get_app_code(){
       this.$http
-        .get("/apaas/hubApi/market/values/"+this.$route.params.id)
+        .get("/apaas/hubApi/market/values/"+this.$route.params.app_id)
         .then((response) => {
           let data = response.data.data;
           this.appcode = data
@@ -280,7 +285,7 @@ export default {
     },
     getreadme(){
       this.$http
-        .get("/apaas/hubApi/market/app/detail/"+this.$route.params.id)
+        .get("/apaas/hubApi/market/app/detail/"+this.$route.params.app_id)
         .then((response) => {
           let data = response.data.data;
           this.$set(this.list_arr[0], "info", data.yyjj);
@@ -337,6 +342,7 @@ export default {
           this.$set(this.servicead_arr[2], "info", data.apply_file);
           this.$set(this.servicead_arr[2], "url", data.apply_file);
           this.$set(this.servicead_arr[3], "info", data.apply_type_name);
+          this.$set(this.servicead_arr[4], "info", data.apply_time);
         })
         .catch(function(response) {});
     },

src/pages/workbench/yygl/deploy_app_detail.vue

@@ -30,7 +30,11 @@
               :editable="false"
               v-if="now_service == 0"
             />
+            
           </info-list>
+          <div class="apass_button" v-if="now_service == 0&&public_flag">
+            <el-button type="primary" @click="public_service">服务发布</el-button>
+          </div>
           <div v-if="now_service==2" class="info_contain2">
             <info-list :list_arr="fwfw_arr">
               <div class="appcode" v-html="appcode" slot="app_code"></div>
@@ -219,8 +223,55 @@
           </div>
         </div>
       </div>
+      <apass-dialog
+        ref="actiondialog"
+        title="综合应用服务发布"
+        width="520px"
+      >
+        <template slot="content">
+          <div class="dialog-content">
+            <el-form :model="publicForm" :rules="public_rules" ref="publicForm" class="demo-ruleForm">
+              <p class="formname">服务领域：</p>
+              <el-form-item prop="area">
+                <el-select v-model="publicForm.area" placeholder="请选择服务领域">
+                  <el-option
+                      v-for="item in area_arr"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <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-group>
+              </el-form-item>
+            </el-form>
+          </div>
+        </template>
+        <template slot="action">
+            <el-button
+              size="mini"
+              v-text="'取消'"
+              @click="dialogCancel"
+            >
+            </el-button>
+            <el-button
+              type="primary"
+              size="mini"
+              v-text="'发布'"
+              @click="save_file"
+            >
+            </el-button>
+        </template>
+      </apass-dialog>
     </div>
     <dialog-action ref="myConfirm" :confirmOptions="tipsOptions"></dialog-action>
+    
   </div>
 </template>
 
@@ -232,6 +283,7 @@ import uploadFile from "@/components/general/upload_file";
 import norCard from "@/components/card";
 import waveIcon from "@/components/general/wave_icon";
 import Topology from "@/components/topology.vue";
+import apassDialog from '@/components/apass-dialog'
 import { getRole } from "@/utils/common";
 import { mapGetters, mapState } from "vuex";
 export default {
@@ -242,7 +294,8 @@ export default {
     uploadFile,
     norCard,
     Topology,
-    waveIcon
+    waveIcon,
+    apassDialog
   },
   data() {
     return {
@@ -254,6 +307,14 @@ export default {
       imgList1: [],
       header_data:"",
       service_list_arr:[],
+      publicForm:{
+        area:'',
+        open:''
+      },
+      public_rules:{
+        area:[{ required: true, message: '请选择服务领域', trigger: 'change' }],
+        open:[{ required: true, message: '请选择开放程度', trigger: 'change' }],
+      },
       yx_state: {
         state: "",
         averageTime: "",
@@ -270,6 +331,7 @@ export default {
         maxTraffic: "",
         memory: ""
       },
+      public_flag:false,
       now_micor_service:0,
       image_arr: [],
       area_arr: [
@@ -425,8 +487,8 @@ export default {
             text: ""
           }
         ],
-        yydebugger: true,
-        yydev:true,
+        yydebugger: false,
+        yydev:false,
         url: ""
       },
       now_service: 0,
@@ -521,7 +583,25 @@ export default {
     
   },
   methods: {
+    public_service(){
+      this.$refs.actiondialog.show();
+    },
+    dialogCancel(){
+      this.$refs.actiondialog.hide();
+    },
+    save_file(){
+      this.$refs['publicForm'].validate((valid) => {
+          if (valid) {
+            this.$refs.actiondialog.hide();
+            this.$router.push('/fwzc/fwcs')
+          } else {
+            console.log('error submit!!');
+            return false;
+          }
+        });
+    },
     event_source(){
+      //更新版本时请求版本状态
       var _this = this
       const se = new EventSource(`/apaas/istio/service/${this.header_data.namespace}/versions/events/${this.service_list_arr[this.now_micor_service].service}/${this.now_tag}/subscribe`, { withCredentials: true }) // 后端接口，要配置允许跨域属性
       se.onopen=function(e){}
@@ -553,6 +633,7 @@ export default {
     detail(val) {
       console.log(val);
     },
+    //更新
     update(val) {
       this.up_flag = true
       this.$message.success('开始更新版本')
@@ -566,6 +647,7 @@ export default {
           }
         })
     },
+    //蓝绿发布
     together(val){
       this.up_flag = true
       this.$http
@@ -576,6 +658,7 @@ export default {
           this.get_micro_service()
         })
     },
+    //删除
     delete_ver(val){
       this.up_flag = true
       this.$http
@@ -795,6 +878,10 @@ export default {
         .then(response => {
           let data = response.data.data;
           this.header_data = data
+          this.public_flag = false
+          if(data.is_apply==0&&(data.type==2||data.type==3)){
+            this.public_flag = true
+          }
           this.$set(
             this.service_header_arr,
             "name",
@@ -822,6 +909,18 @@ export default {
             data.namespace+'('+data.workplace+')'
           );
           this.$set(this.service_header_arr["second"][2], "text", data.created);
+
+          //应用开发调试按钮显示
+          if(this.now_user==0||this.now_user==3||this.now_user==4){
+            this.service_header_arr.yydebugger = true
+          }else{
+            this.service_header_arr.yydebugger = false
+          }
+          if(this.now_user==0||this.now_user==4){
+            this.service_header_arr.yydev = true
+          }else{
+            this.service_header_arr.yydev = false
+          }
         })
         .catch(function(response) {});
     },
@@ -884,6 +983,15 @@ export default {
   background-color: #f7f8f9;
   width: 1022px;
 } 
+.dialog-content .el-input__inner{
+  background-color: #f7f8f9;
+  width: 460px;
+}
+.dialog-content .el-form-item{
+  margin-top: 15px;
+  margin-bottom: 0;
+}
+
 .service_list ::-webkit-scrollbar {
 width: 0px; /*对垂直流动条有效*/
 height: 0px; /*对水平流动条有效*/
@@ -914,6 +1022,9 @@ background:khaki;
 
 </style>
 <style scoped>
+.info_contain >>> .apass_dialog .el-dialog__footer{
+  padding-top: 0;
+}
 .detail_contain {
   width: 100%;
   padding: 0 20px;
@@ -1155,4 +1266,15 @@ background:khaki;
 .card_contain .service_card_box:nth-last-of-type(1){
   border-right:0;
 }
+.dialog-content{
+  text-align: left;
+}
+.dialog-content .formname{
+  font-size: 14px;
+  color: #8890a7;
+  margin-top: 25px;
+}
+.dialog-content .formname:nth-of-type(1){
+  margin-top: 0px;
+}
 </style>