From 6065e9a7826aa70c55a3681454a7853447f76e50 Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Thu, 23 Jul 2020 12:15:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E4=BA=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workbench/search_act.vue      | 25 ++++++++---
 src/pages/workbench/yygl/deployment.vue | 60 ++++++++++++++++++++-----
 2 files changed, 66 insertions(+), 19 deletions(-)

diff --git a/src/pages/workbench/search_act.vue b/src/pages/workbench/search_act.vue
index 4bb1d1d..660cf88 100644
--- a/src/pages/workbench/search_act.vue
+++ b/src/pages/workbench/search_act.vue
@@ -108,13 +108,24 @@ export default {
                     this.listTotal = response.data.data.total
                     var temp = []
                     response.data.data.data.forEach((e,idx) => {
-                        var temp_str = ''
-                        let replaceReg = new RegExp(this.input3, 'g')
-                        let replaceString ='<span class="search-text">' + this.input3 + '</span>'
-                        temp_str = (JSON.stringify(e._source)).replace(
-                            replaceReg,
-                            replaceString
-                        )
+                        var temp_str = JSON.stringify(e._source)
+                        var temp_arr = this.input3.split('')
+                        temp_arr.forEach(el => {
+                            let replaceReg = new RegExp(el, 'g')
+                            let replaceString ='<span class="search-text">' + el + '</span>'
+                            temp_str = (temp_str).replace(
+                                replaceReg,
+                                replaceString
+                            )
+                        });
+                        // let replaceReg = new RegExp(this.input3, 'g')
+                        // let replaceString ='<span class="search-text">' + this.input3 + '</span>'
+                        // temp_str = (JSON.stringify(e._source)).replace(
+                        //     replaceReg,
+                        //     replaceString
+                        // )
+
+
                         temp.push({...e._source,_source:temp_str,index:idx+1+(this.currentPage-1)*10})
                     });
                     this.tableData = temp
diff --git a/src/pages/workbench/yygl/deployment.vue b/src/pages/workbench/yygl/deployment.vue
index 4948482..01c7d0b 100644
--- a/src/pages/workbench/yygl/deployment.vue
+++ b/src/pages/workbench/yygl/deployment.vue
@@ -149,12 +149,23 @@
                 <div class="storage_type" @click="change_appset(item, 'check_type', 1)" :style="item.check_type==1?{backgroundColor:'#515fe7',color:'#f8f9fd'}:''">云存储</div>
               </div>
 
-              <div class="cloud_save_box" v-if="item.check_type==1">
-                <el-radio-group v-model="item.value">
-                  <p v-for="(it,idx) in pvc_list" :key="idx+589000">
-                    <el-radio :label="it.disk_serial_number+';'+it.id">{{it.disk_serial_number}}&nbsp;({{'用量：'+it.disk_cap+'Gi'+' '+'  ' +'类型：'+it.store_type}})</el-radio>
-                  </p>
-                </el-radio-group>
+              <div v-if="item.check_type==1">
+                <div>
+                  <p style="color:#58617a;padding-left:15px;">存储类型：</p>
+                  <div style="overflow:hidden;margin-bottom:5px;">
+                    <div class="storage_type" @click="change_appset(item, 'storage_type', 0)" :style="item.storage_type==0?{backgroundColor:'#515fe7',color:'#f8f9fd'}:''">nfs-client</div>
+                    <div class="storage_type" @click="change_appset(item, 'storage_type', 1)" :style="item.storage_type==1?{backgroundColor:'#515fe7',color:'#f8f9fd'}:''">rook-ceph-block</div>
+                  </div>
+                </div>
+
+                <p style="color:#58617a;padding-left:15px;">数据盘：</p>
+                <div class="cloud_save_box">
+                  <el-checkbox-group v-model="item.value">
+                    <p v-for="(it,idx) in pvc_list" :key="idx">
+                      <el-checkbox :label="it.disk_serial_number+';'+it.id">{{it.disk_serial_number}}&nbsp;({{it.disk_cap+'Gi'}})</el-checkbox>
+                    </p>
+                  </el-checkbox-group>
+                </div>
               </div>
             </el-form-item>
             <el-form-item :label="item.text" v-if="item.type == 'volume'">
@@ -365,23 +376,24 @@ export default {
           step2_arr.forEach((e) => {
             if (e.type == "radio") {
               e["val"] = e.value[0];
-              // this.deal_key_value(this.app_set_info,e.name,e.type,e.value[0])
             } else if (e.type == "storage") {
-              e["dwtype"] = e.storage.indexOf("Gi") == -1 ? 1 : 0;
-              // this.deal_key_value(this.app_set_info,e.name,e.type,e.storage)
+              debugger
+              this.select_volumn=[]
+              e['check_type'] = 0
+              e['storage_type'] = 0
+              console.log(this.pvc_list);
+              e['value'] = [this.pvc_list[0].disk_serial_number+';'+this.pvc_list[0].id]
             } else if (e.type == "resource") {
               let memory = e.memory;
               let cpu = e.cpu;
               e["memory_type"] = memory.indexOf("Mi") == -1 ? "Gi" : "Mi";
               e["memory"] = parseInt(memory);
               e["cpu"] = parseInt(cpu);
-              // this.deal_key_value(this.app_set_info,e.name,'resource',[memory,cpu])
             } else if(e.type == "volume") {
               this.select_volumn=[]
               e['check_type'] = 0
               console.log(this.pvc_list);
               e['value'] = this.pvc_list[0].disk_serial_number+';'+this.pvc_list[0].id
-              // this.deal_key_value(this.app_set_info,e.name,e.type,e.value)
             }else{
 
             }
@@ -687,7 +699,28 @@ export default {
 };
 </script>
 
+
+
 <style scoped>
+.step_form ::-webkit-scrollbar {
+  /*滚动条整体样式*/
+  width: 7px; /*高宽分别对应横竖滚动条的尺寸*/
+  height: 1px;
+}
+.step_form ::-webkit-scrollbar-thumb {
+  /*滚动条里面小方块*/
+  border-radius: 8px;
+  /* background: #dde4ff; */
+  box-shadow: 8px 0 0 #a5adb7 inset;
+  border: 4px solid rgba(0, 0, 0, 0);
+}
+.step_form ::-webkit-scrollbar-track {
+  /*滚动条里面轨道*/
+  border-radius: 8px;
+  /* background: #f4f4f4; */
+  box-shadow: 8px 0 0 #f4f4f4 inset;
+  border: 4px solid rgba(0, 0, 0, 0);
+}
 .openbgc {
   width: 56px;
   height: 23px;
@@ -821,7 +854,6 @@ export default {
   background-color: #f8f9fd;
 }
 .storage_type{
-  width: 76px;
 	height: 35px;
   line-height: 35px;
   text-align: center;
@@ -832,13 +864,17 @@ export default {
   float: left;
   cursor: pointer;
   margin-right: 10px;
+  padding: 0 10px;
 }
 .cloud_save_box{
   width: 786px;
+  height: 172px;
 	background-color: #f7f8f9;
 	border-radius: 6px;
   padding: 20px;
   padding-bottom: 10px;
+  overflow-x: hidden;
+  overflow-y: scroll;
 }
 .cloud_save_box p{
   height: 30px;
-- 
2.26.0