From 84e12efc5aa09594d43e5692ff34e323f839e82b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AE=BF=E6=98=95?= <liudianxin@bd-apaas.com>
Date: Sat, 9 Jan 2021 19:26:28 +0800
Subject: [PATCH] fixed

---
 src/assets/css/index.css                        |  4 ++++
 src/components/apass-table.vue                  | 12 ++++++++++++
 .../technical-support/sdk-manage/type/index.vue |  5 ++++-
 src/pages/user/questions-answers/community.vue  |  5 +++++
 src/pages/workbench/fwgl/serviceDetail.vue      | 17 ++++++++---------
 src/pages/workbench/fwzc_fwcs.vue               |  4 +++-
 src/pages/workbench/workPlace.vue               |  8 +++++---
 src/pages/workbench/yygl/app_debugger.vue       |  2 +-
 8 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/src/assets/css/index.css b/src/assets/css/index.css
index f2acfba..cc33698 100644
--- a/src/assets/css/index.css
+++ b/src/assets/css/index.css
@@ -1084,6 +1084,10 @@ border-radius:8px;
   background-color: #242c43 !important;
 }
 
+.el-picker-panel__icon-btn {
+  color: #0c3ff7;
+}
+
 .el-date-table th {
   border-bottom: 1px solid #3f4864 !important;
   color: #e3e5ef !important;
diff --git a/src/components/apass-table.vue b/src/components/apass-table.vue
index 7e289fa..1c61fe1 100644
--- a/src/components/apass-table.vue
+++ b/src/components/apass-table.vue
@@ -75,6 +75,13 @@
               @click.stop="item.callback && item.callback(scope.row)"
             ></a>
           </div>
+          <div v-else-if="item.type === 'button-oo'" class="row_action">
+            <a
+              class="btn-oo"
+              v-text="scope.row[item.prop]"
+              @click.stop="item.callback && item.callback(scope.row)"
+            ></a>
+          </div>
           <div v-else-if="item.type === 'icon'">
             <img
               src="../assets/imgs/ic_true.png"
@@ -447,6 +454,11 @@ export default {
 .btn_up {
   background-image: url("../assets/imgs/btn_fold.png");
 }
+.btn-oo {
+  font-size: 14px;
+  font-weight: bold;
+  color: #0f2683;
+}
 .charts {
   position: relative;
 }
diff --git a/src/pages/technical-support/sdk-manage/type/index.vue b/src/pages/technical-support/sdk-manage/type/index.vue
index 4304ed8..d2d1295 100644
--- a/src/pages/technical-support/sdk-manage/type/index.vue
+++ b/src/pages/technical-support/sdk-manage/type/index.vue
@@ -151,8 +151,11 @@ export default {
         {
           label: "SDK类型",
           prop: "style_name",
-          type: "button",
+          type: "button-oo",
           width: 240,
+          callback: function(value) {
+            console.log(value);
+          }
         },
         {
           label: "版本号",
diff --git a/src/pages/user/questions-answers/community.vue b/src/pages/user/questions-answers/community.vue
index b8cba52..cb26d5f 100644
--- a/src/pages/user/questions-answers/community.vue
+++ b/src/pages/user/questions-answers/community.vue
@@ -165,6 +165,7 @@ export default {
     },
     deleteData() {
       if (this.selected_date.length) {
+        this.reason_form.reason = "";
         this.diaDel = true;
       } else {
         this.$message.error("请先选择要删除的数据");
@@ -219,10 +220,12 @@ export default {
     },
     del_q(val) {
       this.selected_date = [{ id: val.id }];
+      this.reason_form.reason = "";
       this.diaDel = true;
     },
     del_a(val) {
       this.selected_date = [{ id: val.id }];
+      this.reason_form.reason = "";
       this.diaDel = true;
     },
     getQList() {
@@ -281,6 +284,7 @@ export default {
       });
       this.$api.user.delQuestions(items).then((response) => {
         if (response.data.success == 1) {
+          this.getQList();
           this.$message({
             message: "删除成功",
             type: "success",
@@ -295,6 +299,7 @@ export default {
       });
       this.$api.user.delAnswers(items).then((response) => {
         if (response.data.success == 1) {
+          this.getAList();
           this.$message({
             message: "删除成功",
             type: "success",
diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index a3a36bf..b21b707 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -786,7 +786,7 @@ export default {
             text: "",
           },
         ],
-        fixed: true,
+        fixed: false,
         fixedurl: this.$route.path.replace("servicedetail", "serviceedit"),
       },
       now_service: 0,
@@ -1336,15 +1336,15 @@ export default {
           if (response.data.success) {
             this.listTotal = response.data.data.total;
             let data = response.data.data.data || [];
-
+            console.log(data)
             data.forEach((e) => {
               this.service_use_arr.push({
                 dydw: e.apply_org_name,
-                dyr: e.apply_user_info.user_name,
+                dyr: e.apply_user_info ? e.apply_user_info.user_name : "",
                 dyyw: e.business_name,
                 ywxt: e.business_url,
                 cjms: e.scene,
-                sqsj: e.apply_time.split("+")[0].replace("T", " "),
+                sqsj: e.apply_time || "-",
                 sqgg: e.request_spcs
                   ? `访问次数：${e.request_spcs.count}/日 访问量：${e.request_spcs.pv}/日`
                   : "",
@@ -1357,12 +1357,11 @@ export default {
                       ? "失败"
                       : "成功"
                     : "",
-                time: e.last_request_time
-                  ? e.last_request_time.split("+")[0].replace("T", " ")
-                  : "-",
+                time: e.last_request_time || "-",
                 count: e.req_num || "-",
               });
             });
+            console.log(this.service_use_arr)
           }
         })
         .catch(function (response) {});
@@ -1482,8 +1481,8 @@ export default {
               data.urls[0].req_url
             );
             this.$set(this.service_header_arr, "url", data.cover);
-            if (this.now_user == 1) {
-              this.$set(this.service_header_arr, "fixed", false);
+            if (this.now_user != 1) {
+              this.$set(this.service_header_arr, "fixed", true);
             }
             this.$set(
               this.service_header_arr,
diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue
index d0d0a14..2c5d8b4 100644
--- a/src/pages/workbench/fwzc_fwcs.vue
+++ b/src/pages/workbench/fwzc_fwcs.vue
@@ -757,7 +757,7 @@
                 >新增服务地址</el-button
               >
               <el-button
-                v-if="!(indexOne + 1 == liucheng_list.length)"
+                v-if="!(indexOne == liucheng_list.length)"
                 class="del_one"
                 @click="delOne(indexOne)"
                 >移除</el-button
@@ -2126,6 +2126,8 @@ export default {
                 body_fields: [],
                 param_fields: [],
               });
+            } else {
+              this.$message.error(`请完善服务${indexOne + 1}中的信息`);
             }
           } else {
             this.$message.error("请完善该服务测试");
diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue
index a40bb9a..0ca57e4 100644
--- a/src/pages/workbench/workPlace.vue
+++ b/src/pages/workbench/workPlace.vue
@@ -1169,7 +1169,8 @@ export default {
           let data = response.data.data;
           if(this.now_type==2){
             this.listTotal = data.total;
-            data.data.forEach(e => {
+            let arr = data.data || []; 
+            arr.forEach(e => {
               if(e.DiskList&&e.DiskList.length){
                 e['pan'] = e.DiskList.join(';')
               }
@@ -1182,9 +1183,10 @@ export default {
 
               
             });
-            this.service_data = data.data
+            this.service_data = arr
           }else{
-            this.service_data = data.data;
+            let arr = data.data || []; 
+            this.service_data = arr;
             this.service_data.forEach(e => {
               if (e.create_time&&e.create_time!=='0001-01-01T00:00:00Z') {
                 e.create_time = helper.dateStringTransform(e.create_time)
diff --git a/src/pages/workbench/yygl/app_debugger.vue b/src/pages/workbench/yygl/app_debugger.vue
index fc04e8a..1536489 100644
--- a/src/pages/workbench/yygl/app_debugger.vue
+++ b/src/pages/workbench/yygl/app_debugger.vue
@@ -24,7 +24,7 @@
     <div class="search_list">
         <div class="list_header">
             <span></span>容器组
-            <el-input placeholder="请输入容器组名称" style="float:right;" @change="get_list_pod" v-model="pod_name" prefix-icon="el-icon-search"></el-input>
+            <el-input placeholder="请输入容器组名称" style="float:right;" @input="get_list_pod" v-model="pod_name" prefix-icon="el-icon-search"></el-input>
         </div>
         <div style="padding:20px;padding-top:0px;display: flex;flex-direction: column;height: calc(100% - 80px);align-items:stretch;">
             <apass-table :header="header_arr" :data="tableData" :icon="false" style="flex-grow:1;" :paddingLeft="5"></apass-table>
-- 
2.26.0