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

src/assets/css/index.css

@@ -617,4 +617,25 @@ width: 620px!important;
 }
 .apass_checkbox .el-checkbox__input.is-checked + .el-checkbox__label {
   color: #58617a;
+}
+
+
+.apass_scroll::-webkit-scrollbar {
+  /*滚动条整体样式*/
+  width: 16px; /*高宽分别对应横竖滚动条的尺寸*/
+  height: 1px;
+}
+.apass_scroll::-webkit-scrollbar-thumb {
+  /*滚动条里面小方块*/
+  border-radius: 8px;
+  /* background: #dde4ff; */
+  box-shadow: 8px 0 0 #a5adb7 inset;
+  border: 4px solid rgba(0, 0, 0, 0);
+}
+.apass_scroll::-webkit-scrollbar-track {
+  /*滚动条里面轨道*/
+  border-radius: 8px;
+  /* background: #f4f4f4; */
+  box-shadow: 8px 0 0 #f4f4f4 inset;
+  border: 4px solid rgba(0, 0, 0, 0);
 }
\ No newline at end of file

src/components/e-charts/commentlist.vue

 <template>
-  <ul class="comments_list">
+  <ul class="comments_list apass_scroll">
     <li
       class="comment_card"
       v-for="(item, index) in data"
@@ -58,7 +58,6 @@ export default {
   overflow-y: auto;
 }
 .comment_card {
-  margin-right: 10px;
   display: flex;
   justify-content: flex-start;
   align-items: flex-start;

src/components/e-charts/starlist.vue

 <template>
-  <ul class="star_list">
+  <ul class="star_list apass_scroll">
     <li
       class="item_list"
       v-for="(option, index) in options"
@@ -53,7 +53,6 @@ export default {
   display: flex;
   justify-content: flex-start;
   align-items: center;
-  margin-right: 10px;
   margin-bottom: 12px;
 }
 .item-rate {

src/components/e-charts/toplist.vue

 <template>
-  <div class="top_list">
+  <div
+    class="top_list apass_scroll"
+    @mouseenter="mouseenter"
+    @mouseleave="mouseleave"
+  >
     <ul>
       <li class="item_list" v-for="(option, index) in options" :key="index">
         <div class="item_index">
@@ -40,10 +44,55 @@ export default {
       default: () => 1000,
     },
   },
+  data() {
+    return {
+      timer: null,
+    };
+  },
+  watch: {
+    text() {
+      this.autoScroll();
+    },
+  },
   methods: {
     getPercent(value) {
       return Math.min((value / this.targetValue) * 100, 100);
     },
+    autoScroll() {
+      if (this.timer) {
+        clearInterval(this.timer);
+      }
+
+      this.$el.scrollTop = 0;
+
+      this.timer = setInterval(() => {
+        let curScrollTop = this.$el.scrollTop + 1;
+        if (curScrollTop > this.$el.scrollHeight - this.$el.clientHeight) {
+          curScrollTop = 0;
+        }
+        this.$el.scrollTop = curScrollTop;
+      }, 50);
+    },
+    mouseenter() {
+      if (this.timer) {
+        clearInterval(this.timer);
+      }
+    },
+    mouseleave() {
+      this.autoScroll();
+    },
+  },
+  mounted() {
+    this.autoScroll();
+
+    window.addEventListener("resize", () => {
+      this.autoScroll();
+    });
+  },
+  destroyed() {
+    if (this.timer) {
+      clearInterval(this.timer);
+    }
   },
 };
 </script>
@@ -57,7 +106,6 @@ export default {
   display: flex;
   justify-content: flex-start;
   align-items: center;
-  margin-right: 10px;
   margin-bottom: 18px;
 }
 .item_index {

src/components/menu.vue

@@ -132,7 +132,6 @@ export default {
   },
   methods: {
     gotopage(n) {
-      console.log("function gotopage,menu test:" + n);
       if (n == "logout") {
         window.location.href = "/iam/api/logout";
       } else if (n == "login") {
@@ -157,17 +156,15 @@ export default {
       this.$router.push({ name: "shoppingCart" });
     },
     navAction(path) {
-      console.log("function navAction,menu test:" + path);
       this.now_menu = path;
       window.sessionStorage.setItem("menuVisitUrl", path);
       this.$router.push(path);
     },
     gotoChildPage(v, parent) {
-      console.log("function gotoChildPage,menu test:" + v + "|" + parent);
       if (v.visit_url) {
         if (v.visit_url == "/fwgl/" || v.visit_url == "/yygl/") {
           this.$router.push(v.visit_url + this.$store.getters.level);
-        } else if (parent == "/services_shop") {
+        } else if (parent == "/shop") {
           this.$store.commit("serviceShopMenuAct", v.visit_url);
           this.$router.push(v.visit_url);
         } else {

src/components/service-list/service_list.vue

@@ -247,13 +247,13 @@ export default {
               prop: "",
               childDomains: [
                 {
-                  id: 1,
+                  id: 2,
                   name: "平台应用",
                   prop: "",
                   childDomains: null
                 },
                 {
-                  id: 2,
+                  id: 1,
                   name: "开发者应用",
                   prop: "",
                   childDomains: null

src/pages/data-analysis/my-application.vue

@@ -109,7 +109,7 @@
                     </div>
                   </div>
                 </div>
-                <div class="right-content">
+                <div class="right-content apass_scroll">
                   <apass-table
                     class="hot-search-table"
                     :header="hotSearchHeader"

src/pages/data-analysis/my-service.vue

@@ -106,7 +106,7 @@
                     </div>
                   </div>
                 </div>
-                <div class="right-content">
+                <div class="right-content apass_scroll">
                   <apass-table
                     class="hot-search-table"
                     :header="hotSearchHeader"

src/pages/service_shop/shop_list.vue

@@ -37,13 +37,13 @@ export default {
           this.name = "数据服务";
           this.urlFilter = "5";
           this.url = "/shop/sjfwDetail";
-          this.filterNames = ["数据服务类型", "数据领域", "数据来源机构"];
+          this.filterNames = ["数据服务类型", "服务领域", "数据来源机构"];
           break;
         case "space_time_service_list":
           this.name = "时空服务";
           this.urlFilter = "6";
           this.url = "/shop/skfwDetail";
-          this.filterNames = ["时空服务类型", "应用领域", "服务来源组织"];
+          this.filterNames = ["时空服务类型", "服务领域", "服务来源组织"];
           break;
         case "video_service_list":
           this.name = "视频服务";
@@ -61,7 +61,7 @@ export default {
           this.name = "综合应用";
           this.urlFilter = "21";
           this.url = "/shop/zhfwDetail";
-          this.filterNames = ["服务类型", "应用领域", "服务来源组织"];
+          this.filterNames = ["服务类型", "服务领域", "服务来源组织"];
           break;
         case "app_store_list":
           this.name = "应用商店";

src/pages/user/order/order_detail.vue

@@ -323,8 +323,8 @@ export default {
       {
         prop: "name",
         label: "字段编码",
-        minWidth: "20%",
-        align: "left"
+        minWidth: "10%",
+        align: "center"
       },
       {
         prop: "show_type",
@@ -335,14 +335,20 @@ export default {
       {
         prop: "label",
         label: "字段名称",
-        minWidth: "40%",
+        minWidth: "20%",
         align: "center"
       },
       {
         prop: "descript",
         label: "字段说明",
         minWidth: "40%",
-        align: "left"
+        align: "center"
+      },
+      {
+        prop: "example",
+        label: "字段示例",
+        minWidth: "20%",
+        align: "center"
       }
     ],
     list_arr: [

src/pages/user/user.vue

 <template>
   <div class="fwgl_container">
-    <side-nav-bar title="个人中心" imgSrc="tool_fuwu" :nav-list="navList" :title-path="navList[0] && navList[0].path"></side-nav-bar>
+    <side-nav-bar
+      title="个人中心"
+      imgSrc="tool_fuwu"
+      :nav-list="navList"
+      :title-path="navList[0] && navList[0].path"
+    ></side-nav-bar>
     <div class="main_container">
       <router-view :key="'type_' + $route.params.type"></router-view>
     </div>
@@ -38,7 +43,15 @@ export default {
   },
   methods: {
     initNavList() {
-      this.navList = this.userNav;
+      this.$api.general.getNowMenu({ teamName: "APAAS3" }).then(response => {
+        if (response.data.success == 1) {
+          let arr = response.data.data[0].Child;
+          let user_index = arr.findIndex(item => item.visit_url == "/user");
+          if (user_index != -1) {
+            this.navList = arr[user_index].Child;
+          }
+        }
+      });
     }
   },
   mounted() {

src/pages/workbench/app_build.vue

@@ -310,75 +310,102 @@ export default {
     apassDialog,
     imageDetail,
   },
-  data: () => ({
-    dialogInfo: {
-      title: "",
-      msg: "",
-      submit: null,
-    },
-    step: 0,
-    ywlys: [],
-    types: [],
-    orgs: [],
-    logo: [],
-    app_info: {
-      name: "", // 应用名称
-      version: "", // 应用版本
-      ywly: "", // 业务领域id
-      type: "", // 应用类型id
-      logo: "", // 封面图片链接
-      org: "", //  所属组织机构id
-      yyjj: "", // 应用简介
-      gnjj: "", // 功能简介
-      cjsl: "", //  应用场景示例
-    },
-    app_rules: {
-      name: [
-        { required: true, message: "请输入应用名称", trigger: "blur" },
-        { max: 16, message: "长度小于16个字符", trigger: "blur" },
-      ],
-      version: [{ required: true, message: "请输入应用版本", trigger: "blur" }],
-      ywly: [{ required: true, message: "请选择业务领域", trigger: "change" }],
-      type: [{ required: true, message: "请选择应用类型", trigger: "change" }],
-      logo: [{ required: true, message: "请上传应用封面", trigger: "change" }],
-      org: [
-        { required: true, message: "请选择所属组织机构", trigger: "change" },
-      ],
-      yyjj: [{ required: true, message: "请选择应用简介", trigger: "change" }],
-      gnjj: [{ required: true, message: "请选择功能简介", trigger: "change" }],
-      cjsl: [
-        { required: true, message: "请选择应用场景示例", trigger: "change" },
-      ],
-    },
-    deploy_info: {
-      file: "",
-    },
-    deploy_rules: {
-      file: [{ required: true, message: "请选择部署文件", trigger: "change" }],
-    },
-    step2Loading: false,
-    app_id: "",
-    image_info: {
-      image_name: "",
-      tag: "",
-      file: "",
-    },
-    image_rules: {
-      image_name: [
-        { required: true, message: "请输入镜像名称", trigger: "blur" },
-      ],
-      tag: [{ required: true, message: "请输入版本号", trigger: "blur" }],
-      file: [{ required: true, message: "请选择镜像文件", trigger: "change" }],
-    },
-    addImageLoading: false,
-    image_headers: [],
-    image_datas: [],
-    image_total: 0,
-    image_loading: false,
-    image_noMore: false,
-    image_page: 0,
-    done: false,
-  }),
+  data() {
+    var image_name_pass = (rule, value, callback) => {
+      var reg = /^[a-z0-9|-]+$/;
+      setTimeout(() => {
+        if (reg.test(value)) {
+          callback();
+        } else {
+          callback(new Error("只支持小写字母 数字 -"));
+        }
+      }, 100);
+    };
+
+    return {
+      dialogInfo: {
+        title: "",
+        msg: "",
+        submit: null,
+      },
+      step: 0,
+      ywlys: [],
+      types: [],
+      orgs: [],
+      logo: [],
+      app_info: {
+        name: "", // 应用名称
+        version: "", // 应用版本
+        ywly: "", // 业务领域id
+        type: "", // 应用类型id
+        logo: "", // 封面图片链接
+        org: "", //  所属组织机构id
+        yyjj: "", // 应用简介
+        gnjj: "", // 功能简介
+        cjsl: "", //  应用场景示例
+      },
+      app_rules: {
+        name: [
+          { required: true, message: "请输入应用名称", trigger: "blur" },
+          { max: 16, message: "长度小于16个字符", trigger: "blur" },
+        ],
+        version: [
+          { required: true, message: "请输入应用版本", trigger: "blur" },
+        ],
+        ywly: [
+          { required: true, message: "请选择业务领域", trigger: "change" },
+        ],
+        type: [
+          { required: true, message: "请选择应用类型", trigger: "change" },
+        ],
+        logo: [
+          { required: true, message: "请上传应用封面", trigger: "change" },
+        ],
+        org: [
+          { required: true, message: "请选择所属组织机构", trigger: "change" },
+        ],
+        yyjj: [
+          { required: true, message: "请选择应用简介", trigger: "change" },
+        ],
+        gnjj: [
+          { required: true, message: "请选择功能简介", trigger: "change" },
+        ],
+        cjsl: [
+          { required: true, message: "请选择应用场景示例", trigger: "change" },
+        ],
+      },
+      deploy_info: {
+        file: "",
+      },
+      deploy_rules: {
+        file: [
+          { required: true, message: "请选择部署文件", trigger: "change" },
+        ],
+      },
+      step2Loading: false,
+      app_id: "",
+      image_info: {
+        image_name: "",
+        tag: "",
+        file: "",
+      },
+      image_rules: {
+        image_name: [{ validator: image_name_pass, trigger: "blur" }],
+        tag: [{ required: true, message: "请输入版本号", trigger: "blur" }],
+        file: [
+          { required: true, message: "请选择镜像文件", trigger: "change" },
+        ],
+      },
+      addImageLoading: false,
+      image_headers: [],
+      image_datas: [],
+      image_total: 0,
+      image_loading: false,
+      image_noMore: false,
+      image_page: 0,
+      done: false,
+    };
+  },
   methods: {
     getYwlys() {
       this.$http

src/pages/workbench/fwgl/approveWorkspace.vue

@@ -289,6 +289,7 @@ export default {
         label: "用户申请时间",
         prop: "apply_time",
         align: "center",
+        width: 180,
       },
       {
         label: "审批状态",

src/pages/workbench/fwgl/fwglList.vue

@@ -557,6 +557,8 @@ export default {
             label: "资源调整结果",
             align: "center",
             getText(item) {
+              if (item.apply_type === 0) return "-";
+
               return ["未通过", "待审批", "通过"][
                 (item.approve_update_state || 0) + 1
               ];
@@ -903,6 +905,8 @@ export default {
             label: "资源调整结果",
             align: "center",
             getText(item) {
+              if (item.apply_type === 0) return "-";
+
               return ["未通过", "待审批", "通过"][
                 (item.approve_update_state || 0) + 1
               ];
@@ -923,7 +927,7 @@ export default {
               {
                 getLabel(item) {
                   if (item.approve_state !== 1) {
-                    return "";
+                    return "-";
                   }
 
                   return (item.approve_state === 1 && item.use_uid === "") ? "分配" : "已分配";

src/pages/workbench/fwgl/organizationCloudResource.vue

@@ -506,6 +506,7 @@ export default {
         label: "用户申请时间",
         prop: "apply_time",
         align: "center",
+        width: 180,
       },
       {
         label: "操作",

src/store/index.js

@@ -6,7 +6,7 @@ const store = new Vuex.Store({
   state: {
     role: 0, // 0：普通用户，1：组织管理员，2：超级管理员
     userInfo: null, // 用户信息
-    serviceShopMenu: "/shop/data_service_list", // 服务超市侧边栏
+    serviceShopMenu: "/shop/data_service_list/5", // 服务超市侧边栏
     fwglNav: [
       ["注册发布的服务", "申请的服务", "云资源服务"], // 普通用户
       ["组织服务管理", "服务审批管理", "云资源管理"], // 组织管理员