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

src/components/e-charts/multiple_circle.vue

@@ -24,6 +24,10 @@ export default {
     bar_width: {
       type: Number,
       default: 5
+    },
+    color:{
+      type:Array,
+      default:null
     }
   },
   components: {},
@@ -76,7 +80,7 @@ export default {
       };
       var data = [];
       var total = 0;
-      var color = ["#274fee", "#25bdb1", "#ffc95c", "#e56600", "#e15260"];
+      var color = this.color?this.color:["#274fee", "#25bdb1", "#ffc95c", "#e56600", "#e15260"];
       var legendarr = [];
       var temp2_data = 0;
       data_val.forEach(e => {

src/components/e-charts/process-top-list.vue

+<template>
+  <div class="top_list apaas_scroll" @mouseenter="mouseenter" @mouseleave="mouseleave">
+    <ul>
+      <li class="item_list" v-for="(option, index) in options" :key="index">
+        <div class="item_detail">
+          <p class="item_info">
+            <span
+              class="text_clip is_link"
+              @click="getDetail(option.service_id, option.data_service_type1)"
+            >
+              {{ option.service_name }}
+            </span>
+            
+          </p>
+          <el-progress
+            class="item_progress"
+            :percentage="getPercent(option.request_count)"
+            :show-text="false"
+            color="#e56600"
+          ></el-progress>
+          <span
+            style="float:right;"
+              v-text="helper.numberFormat(option.request_count, 2) + (option.request_count > 10000 ? '万次' : '次')"
+            ></span>
+        </div>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script>
+import helper from "@/services/helper";
+export default {
+  props: {
+    options: {
+      type: Array,
+      default: () => []
+    },
+    targetValue: {
+      type: Number,
+      default: () => 0
+    }
+  },
+  data() {
+    return {
+      timer: null,
+      helper
+    };
+  },
+  watch: {
+    text() {
+      this.autoScroll();
+    }
+  },
+  methods: {
+    getPercent(value) {
+      if (value == 0) {
+        return 0;
+      } else {
+        return Math.min((value / this.targetValue) * 100, 100);
+      }
+    },
+    autoScroll() {
+      if (this.timer) {
+        clearInterval(this.timer);
+      }
+
+      this.$el.scrollTop = 0;
+
+      this.timer = setInterval(() => {
+        let itemHeight = 50;
+        let curScrollTop = this.$el.scrollTop + itemHeight;
+
+        if (curScrollTop >= this.$el.scrollHeight - this.$el.clientHeight + itemHeight) {
+          curScrollTop = 0;
+        }
+
+        this.$el.scrollTop = Math.min(curScrollTop, this.$el.scrollHeight - this.$el.clientHeight);
+      }, 1500);
+    },
+    mouseenter() {
+      if (this.timer) {
+        clearInterval(this.timer);
+      }
+    },
+    mouseleave() {
+      this.autoScroll();
+    },
+    getDetail(id, type) {
+      
+    }
+  },
+  mounted() {
+    this.autoScroll();
+    window.addEventListener("resize", () => {
+      this.autoScroll();
+    });
+  },
+  destroyed() {
+    if (this.timer) {
+      clearInterval(this.timer);
+    }
+  }
+};
+</script>
+
+<style scoped>
+.top_list {
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+.item_list {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  margin-bottom: 18px;
+}
+.item_index {
+  width: 35px;
+  flex-shrink: 0;
+  margin-right: 10px;
+  font-size: 12px;
+  color: #58617a;
+}
+.item_logo {
+  margin-right: 10px;
+  flex-shrink: 0;
+  font-size: 0;
+  border: 2px solid #e3e5ef;
+  border-radius: 6px;
+  overflow: hidden;
+}
+.item_info {
+  flex-grow: 1;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  font-size: 14px;
+  line-height: 20px;
+  color: #58617a;
+}
+.item_detail {
+  flex-grow: 1;
+}
+.item_info > span:first-child {
+  width: 100px;
+  flex-grow: 1;
+  margin-right: 10px;
+  color:#58617a;
+  font-size: 14px;
+}
+.item_info > span:first-child > i {
+  font-weight: bold;
+  font-size: 12px;
+  color: #8e96ab;
+}
+.item_info > span:nth-child(2) {
+  flex-shrink: 0;
+  white-space: nowrap;
+  color: #0d1847;
+}
+.item_progress {
+  margin-top: 6px;
+  width: calc(100% - 60px);
+  float: left;
+}
+.is_link {
+  cursor: pointer;
+}
+</style>

src/components/table/table-um.vue

@@ -200,7 +200,7 @@
               {{ scope.row[item.prop] }}
             </span>
             <!-- others -->
-            <span v-else-if="item.type === 'click'" style="cursor: pointer;" @click="gotopage(item.url,scope.row[item.prop][item.id])">{{ scope.row[item.prop] }}</span>
+            <span v-else-if="item.type === 'click'" style="cursor: pointer;color: #274fee;" @click="gotopage(item.url,scope.row[item.id])">{{ scope.row[item.prop] }}</span>
             <span v-else>{{ scope.row[item.prop] }}</span>
           </template>
         </el-table-column>

src/pages/workbench/yygl/app_detail.vue

@@ -161,6 +161,7 @@
               :auto-upload="false"
               :on-success="upload_success"
               :on-error="upload_error"
+              :on-change="change_file_state"
               :data="anotherData1"
               :multiple="false"
             >
@@ -493,10 +494,17 @@ export default {
         this.now_page = 1;
         this.image_arr = [];
         this.get_image_list();
+        this.get_file_name();
       } else {
         this.$message.error(response.errMsg);
       }
     },
+    change_file_state(file,fileList){
+      console.log(file,fileList);
+      if(fileList.length>=2){
+        this.fileList = [file]
+      }
+    },
     upload_error() {
       this.$message.error("上传失败");
     },