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

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

@@ -20,7 +20,7 @@
           ></el-progress>
           <span
             style="float:right;"
-              v-text="helper.numberFormat(option.request_count, 2) + (option.request_count > 10000 ? '万次' : '次')"
+              v-text="helper.numberFormat(option.request_count, 2) + (option.request_count > 10000 ? '万'+unit : unit)"
             ></span>
         </div>
       </li>
@@ -39,7 +39,11 @@ export default {
     targetValue: {
       type: Number,
       default: () => 0
-    }
+    },
+    unit: {
+      type: String,
+      default: () => '次'
+    },
   },
   data() {
     return {

src/components/shop-car-apply/apply_service_state.vue

@@ -137,6 +137,11 @@ export default {
 };
 </script>
 
+<style>
+.outborder .system .el-input__prefix,.outborder .system .el-input__suffix{
+  left: auto;
+}
+</style>
 <style scoped>
 .outborder {
   border-bottom: 2px solid rgba(244, 247, 252, 1);

src/components/table/table-um.vue

@@ -460,7 +460,11 @@ export default {
       });
     },
     gotopage(url,id){
-      this.$router.push(`/fwgl/0/0/servicedetail/${id}`)
+      if(url=='/'){
+        this.$router.push(`/fwgl/0/0/servicedetail/${id}`)
+      }else{
+        this.$router.push(`${url}${id}`)
+      }
     },
     //本地删除
     deleteLocal(val) {

src/pages/workbench/component-center/process-management/monitoring/index.vue

@@ -204,7 +204,7 @@ export default {
               align: "left",
               minWidtn:'40%',
               type:'click',
-              url:'/',
+              url:'/progress/designer/detail/',
               id:'id',
             },
             {