Merge branch 'dev' of https://cloud.wodcloud.com/git/apaas/apaas-v3-ui into dev

src/components/comments-list.vue

@@ -6,7 +6,7 @@
       :key="'comment_' + index"
     >
       <div class="comment-left">
-        <el-avatar :size="60" fit="cover" :src="item.picture_path" />
+        <el-avatar :size="60" fit="cover" :src="item.picture_path || require('../assets/imgs/img_head.png')" />
       </div>
       <div class="comment-right">
         <p class="comment-user_name" v-text="item.user_name"></p>

src/components/e-charts/commentlist.vue

@@ -2,7 +2,7 @@
   <ul class="comments_list apaas_scroll">
     <li class="comment_card" v-for="(item, index) in data" :key="'comment_' + index">
       <div class="comment-left">
-        <el-avatar :size="45" fit="cover" :src="item.picture_path" />
+        <el-avatar :size="45" fit="cover" :src="item.picture_path || require('../../assets/imgs/img_head.png')" />
       </div>
       <div class="comment-right">
         <p class="comment-base">

src/pages/workbench/fwgl/apply_service_detail.vue

@@ -157,28 +157,33 @@ export default {
             ],
             header_arr:[
                 {
-                    prop:'wfwmc',
-                    label:'微服务名称',
-                    minWidth:'20%',
-                    align:'left',
+                    prop: "name",
+                    label: "字段编码",
+                    align: "left",
+                    width: 200
                 },
                 {
-                    prop:'jkzt',
-                    label:'健康状态',
-                    width:'120px',
-                    align:'center',
+                    prop: "label",
+                    label: "字段名称",
+                    align: "center",
+                    width: 200
                 },
                 {
-                    prop:'jklj',
-                    label:'接口链接',
-                    minWidth:'40%',
-                    align:'center',
+                    prop: "show_type",
+                    label: "字段类型",
+                    align: "center",
+                    width: 240
                 },
                 {
-                    prop:'wfwms',
-                    label:'微服务描述',
-                    minWidth:'40%',
-                    align:'left',
+                    prop: "descript",
+                    label: "字段说明",
+                    align: "left",
+                },
+                {
+                    prop: "example",
+                    label: "字段示例数值",
+                    align: "center",
+                    width: 240
                 },
             ],
             service_arr:['服务基本信息','接口详细信息','申请审批信息'],
@@ -372,14 +377,10 @@ export default {
                 this.$set(this.apply_arr[6], "info", '访问次数：'+data.service_apply_info.request_spcs.pv+'/日，'+'访问量：'+data.service_apply_info.request_spcs.count+'/日');
                 this.$set(this.apply_arr[7], "info", data.service_apply_info.duration + (data.service_apply_info.duration_unit==1?'月':'年'));
                 this.$set(this.apply_arr[8], "info", data.service_apply_info.apply_time.replace('T'," ").split('+')[0]);
-                this.zd_table_arr = [
-                    {
-                        wfwmc:data.name,
-                        jkzt:data.health_state,
-                        jklj:data.req_url,
-                        wfwms:data.descript
-                    }
-                ]
+                this.zd_table_arr = JSON.parse(data.service_apply_info.res_fields || "[]"); 
+                if (this.zd_table_arr.length===0) {
+                    this.$set(this.servicead_arr[4], "info", "无响应参数");
+                }
                 console.log(this.zd_table_arr);
                 if(data.service_apply_info.approval_process){
                     data.service_apply_info.approval_process.forEach(e => {

src/pages/workbench/fwgl/serviceDetail.vue

@@ -229,32 +229,31 @@ export default {
         {
           prop: "name",
           label: "字段编码",
-          minWidth: "20%",
           align: "left",
+          width: 200,
         },
         {
           prop: "label",
           label: "字段名称",
-          minWidth: "20%",
           align: "center",
+          width: 200,
         },
         {
           prop: "show_type",
           label: "字段类型",
-          width: "100px",
           align: "center",
+          width: 240,
         },
         {
           prop: "descript",
           label: "字段说明",
-          minWidth: "30%",
           align: "left",
         },
         {
           prop: "is_must",
           label: "是否必须",
-          width: "120px",
           align: "center",
+          width: 240,
         },
       ], // 请求参数-header
       req_data: [], // 请求参数
@@ -263,20 +262,22 @@ export default {
         {
           prop: "name",
           label: "字段编码",
-          minWidth: "20%",
           align: "left",
+          width: 200,
         },
         {
           prop: "label",
           label: "字段名称",
           minWidth: "20%",
           align: "center",
+          width: 200,
         },
         {
           prop: "show_type",
           label: "字段类型",
           width: "100px",
           align: "center",
+          width: 240,
         },
         {
           prop: "descript",
@@ -289,6 +290,7 @@ export default {
           label: "字段示例数值",
           width: "120px",
           align: "center",
+          width: 240,
         },
       ], // 响应参数-header
       res_data: [], // 响应参数
@@ -681,16 +683,18 @@ export default {
               "info",
               this.request_arr[data.req_type - 1]
             ); // 请求方式
-            this.req_data = JSON.parse(data.req_fields || data.req_query || "[]"); // 请求参数
+            this.req_data = JSON.parse(
+              data.req_fields || data.req_query || "[]"
+            ); // 请求参数
             if (this.req_data.length === 0) {
               this.$set(this.servicead_arr[1], "type", "");
               this.$set(this.servicead_arr[1], "info", "无请求参数");
             }
-            this.req_code_arr = data.req_fields_example || data.req_query_example || ""; // 请求示例
+            this.req_code_arr =
+              data.req_fields_example || data.req_query_example || ""; // 请求示例
             if (!this.req_code_arr) {
               this.$set(this.servicead_arr[2], "type", "");
               this.$set(this.servicead_arr[2], "info", "无请求示例");
-
             }
             this.$set(this.servicead_arr[3], "info", data.encode_method); // 编码格式
             this.res_data = JSON.parse(data.res_fields || "[]"); // 响应参数