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

.beagle-arm.yml

@@ -32,7 +32,7 @@ pipeline:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock    
     base: registry.cn-qingdao.aliyuncs.com/wod-k8s/node-arm64:14.5.0-buster-slim
-    repo: wod/apaas/apaas-v3-ui-arm64
+    repo: wod/apaas/apaas-ui-arm64
     version: "v3.0.0"
     channel: alpha
     registry: registry.cn-qingdao.aliyuncs.com
@@ -48,7 +48,7 @@ pipeline:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock    
     base: registry.cn-qingdao.aliyuncs.com/wod-k8s/node-arm64:14.5.0-buster-slim
-    repo: wod/apaas/apaas-v3-ui-arm64
+    repo: wod/apaas/apaas-ui-arm64
     version: "v3.0.0"
     registry: registry.cn-qingdao.aliyuncs.com
     secrets:

.beagle.yml

@@ -35,8 +35,8 @@ pipeline:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock    
     base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0.0
-    repo: apaas/apaas-v3-ui
-    version: 1.0.0
+    repo: apaas/apaas-ui
+    version: "v3.0.0"
     channel: alpha
     registry: hub.wodcloud.com
     when:
@@ -46,16 +46,16 @@ pipeline:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock    
     base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0.0
-    repo: apaas/apaas-v3-ui
-    version: 1.0.0
+    repo: apaas/apaas-ui
+    version: "v3.0.0"
     registry: hub.wodcloud.com
     when:
       branch: master  
   deploy:
     image: registry.cn-qingdao.aliyuncs.com/wod-devops/kubernetes:1.0
     namespace: apaas-v3
-    deployment: apaas-v3-ui
-    container: apaas-v3-ui
+    deployment: apaas-ui
+    container: apaas-ui
     registry: hub.wodcloud.com
 
 branches: [master,dev]

src/components/order-list/order-list-cell.vue

@@ -93,12 +93,12 @@
             <div class="approval_status_btn" slot="reference">服务评价</div>
           </el-popover>
           <div
-            v-else-if="cellItem.approval_second_level == 1 && cellItem.pay_status != -1 && cellItem.is_estimated == 1 && !showMsgBox"
+            v-else-if="cellItem.order_type != 3 && cellItem.approval_second_level == 1 && cellItem.pay_status != -1 && cellItem.is_estimated == 1 && !showMsgBox"
             class="approval_status_btn"
             @click="getMessage"
           >查看评价</div>
           <div
-            v-else-if="cellItem.approval_second_level == 1 && cellItem.pay_status != -1 && cellItem.is_estimated == 1 && showMsgBox"
+            v-else-if="cellItem.order_type != 3 && cellItem.approval_second_level == 1 && cellItem.pay_status != -1 && cellItem.is_estimated == 1 && showMsgBox"
             class="approval_status_btn"
             @click="showMsgBox = false"
           >收起评价</div>

src/components/recommen/screen-type.vue

@@ -75,12 +75,10 @@ export default {
 
     },
     mounted() {
-        window.onresize = ()=>{
-            this.pageResize();
-        }
+        window.addEventListener("resize", this.pageResize);
     },
     destroyed(){
-      window.onresize = null;
+        window.removeEventListener("resize", this.pageResize);
     },
     methods: {
         openflag_func(){

src/components/show-more-filter.vue

+<template>
+  <div ref="container" class="show_more_filter">
+    <slot></slot>
+
+    <a
+      v-if="showBtn"
+      class="show_more_btn"
+      :style="{
+        left: btnLeft,
+      }"
+      @click="toggle"
+    >
+      更多检索
+      <i
+        data-v-3b31b76f=""
+        :class="showMore ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
+      ></i>
+    </a>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      showBtn: false,
+      showMore: false,
+      btnLeft: 0,
+    };
+  },
+  mounted() {
+    this.resize();
+    window.addEventListener("resize", this.resize);
+  },
+  destroyed() {
+    window.removeEventListener("resize", this.resize);
+  },
+  methods: {
+    resize() {
+      this.$nextTick(() => {
+        let container = this.$refs.container;
+        let containerWidth = container.getBoundingClientRect().width - 80;
+        let filters = container.querySelectorAll(".filter_item");
+        let totalWidth = 0;
+        let wrapFlag = false;
+
+        this.showBtn = false;
+
+        filters.forEach((filter, index) => {
+          filter.style.display = "inline-block";
+
+          let filterWidth =
+            Math.ceil(filter.getBoundingClientRect().width) + 15;
+
+          totalWidth += filterWidth;
+
+          if (totalWidth > containerWidth) {
+            this.showBtn = true;
+
+            if (!wrapFlag) {
+              this.btnLeft = totalWidth - filterWidth + 5 + "px";
+              wrapFlag = true;
+            }
+            console.log(totalWidth, containerWidth, this.btnLeft);
+
+            filter.style.display = this.showMore ? "inline-block" : "none";
+          } else {
+            filter.style.display = "inline-block";
+          }
+        });
+      });
+    },
+    toggle() {
+      this.showMore = !this.showMore;
+      this.resize();
+    },
+  },
+};
+</script>
+
+<style scoped>
+.show_more_filter {
+  position: relative;
+  padding-right: 80px;
+}
+.show_more_btn {
+  position: absolute;
+  top: 25px;
+  font-size: 14px;
+  line-height: 20px;
+  color: #8890a7;
+  cursor: pointer;
+  user-select: none;
+}
+</style>

src/pages/index.vue

 <template>
   <div class="index_container">
-    <div class="decor" v-if="$route.fullPath == '/workplace' || $route.fullPath == '/services_shop' || $route.fullPath == '/fwzc/fwcs' || $route.fullPath == '/app_build'"></div>
+    <div class="decor" v-if="$route.fullPath == '/workplace' || $route.fullPath == '/services_shop' || $route.fullPath == '/fwzc/fwcs' || $route.fullPath == '/app_build' || $route.fullPath == '/intelligent_drawing'"></div>
     <router-view/>
   </div>
 </template>

src/pages/message-management/banner/banner-list.vue

@@ -20,7 +20,7 @@
 
       <template slot="top">
         <div class="top_fliter">
-          <div class="filter_list">
+          <show-more-filter class="filter_list">
             <div class="filter_item">
               <span class="filter_title">banner搜索：</span>
               <el-input
@@ -61,7 +61,7 @@
               >
               </el-date-picker>
             </div>
-          </div>
+          </show-more-filter>
           <div class="filter_action apass_button">
             <el-button type="primary" @click="topFilterAction">
               查询
@@ -90,11 +90,13 @@
 import helper from "@/services/helper.js";
 import apassList from "@/components/apass-list";
 import apassDialog from "@/components/apass-dialog";
+import showMoreFilter from "@/components/show-more-filter";
 
 export default {
   components: {
     apassList,
     apassDialog,
+    showMoreFilter,
   },
   data: () => ({
     listHeader: [],

src/pages/message-management/message-alert/message-alert-list.vue

@@ -20,7 +20,7 @@
 
       <template slot="top">
         <div class="top_fliter">
-          <div class="filter_list">
+          <show-more-filter class="filter_list">
             <div class="filter_item">
               <span class="filter_title">消息模板名称：</span>
               <el-input
@@ -48,7 +48,7 @@
               >
               </el-date-picker>
             </div>
-          </div>
+          </show-more-filter>
           <div class="filter_action apass_button">
             <el-button type="primary" @click="topFilterAction">
               查询
@@ -77,11 +77,13 @@
 import helper from "@/services/helper.js";
 import apassList from "@/components/apass-list";
 import apassDialog from "@/components/apass-dialog";
+import showMoreFilter from "@/components/show-more-filter";
 
 export default {
   components: {
     apassList,
     apassDialog,
+    showMoreFilter,
   },
   data: () => ({
     listHeader: [],

src/pages/message-management/message-template/message-template-list.vue

@@ -20,7 +20,7 @@
 
       <template slot="top">
         <div class="top_fliter">
-          <div class="filter_list">
+          <show-more-filter class="filter_list">
             <div class="filter_item">
               <span class="filter_title">消息模板搜索：</span>
               <el-input
@@ -49,7 +49,7 @@
               >
               </el-date-picker>
             </div>
-          </div>
+          </show-more-filter>
           <div class="filter_action apass_button">
             <el-button type="primary" @click="topFilterAction">
               查询
@@ -78,11 +78,13 @@
 import helper from "@/services/helper.js";
 import apassList from "@/components/apass-list";
 import apassDialog from "@/components/apass-dialog";
+import showMoreFilter from "@/components/show-more-filter";
 
 export default {
   components: {
     apassList,
     apassDialog,
+    showMoreFilter,
   },
   data: () => ({
     listHeader: [],

src/pages/message-management/recommended/recommended-list.vue

@@ -20,7 +20,7 @@
 
       <template slot="top">
         <div class="top_fliter">
-          <div class="filter_list">
+          <show-more-filter class="filter_list">
             <div class="filter_item">
               <span class="filter_title">推荐位名称：</span>
               <el-input
@@ -48,7 +48,7 @@
               >
               </el-date-picker>
             </div>
-          </div>
+          </show-more-filter>
           <div class="filter_action apass_button">
             <el-button type="primary" @click="topFilterAction">
               查询
@@ -66,10 +66,12 @@
 <script>
 import helper from "@/services/helper.js";
 import apassList from "@/components/apass-list";
+import showMoreFilter from "@/components/show-more-filter";
 
 export default {
   components: {
     apassList,
+    showMoreFilter,
   },
   data: () => ({
     listHeader: [],

src/pages/user/order/order_detail.vue

@@ -37,7 +37,7 @@
         </div>
         <div class="btn_group">
           <el-popover
-            v-if="orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1 && orderDetail.is_estimated == 0"
+            v-if="orderDetail.order_type != 3 && orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1 && orderDetail.is_estimated == 0"
             placement="right-start"
             width="300"
             v-model="visible"
@@ -65,12 +65,12 @@
             <el-button class="evaluation" slot="reference">服务评价</el-button>
           </el-popover>
           <el-button
-            v-else-if="orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1 && orderDetail.is_estimated == 1 && !showMsgBox"
+            v-else-if="orderDetail.order_type != 3 && orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1 && orderDetail.is_estimated == 1 && !showMsgBox"
             class="approval_status_btn"
             @click="getMessage"
           >查看评价</el-button>
           <el-button
-            v-else-if="orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1 && orderDetail.is_estimated == 1 && showMsgBox"
+            v-else-if="orderDetail.order_type != 3 && orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1 && orderDetail.is_estimated == 1 && showMsgBox"
             class="approval_status_btn"
             @click="showMsgBox = false"
           >收起评价</el-button>
@@ -86,6 +86,22 @@
           >取消申请</el-button>
         </div>
       </div>
+      <el-collapse-transition>
+        <div v-if="showMsgBox" class="evaluation_msg">
+          <div class="msg_title">服务评分：</div>
+          <div class="msg_rate">
+            <el-rate
+              v-model="message.score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"
+            ></el-rate>
+          </div>
+          <div class="msg_title">评价详情：</div>
+          <div class="msg_text">{{ message.content }}</div>
+        </div>
+      </el-collapse-transition>
       <div class="detail_title">{{ orderDetail.order_type == 1 ? "服务" : "应用"}}信息</div>
       <div class="detail_service">
         <el-row class="detail_service_row">
@@ -456,6 +472,7 @@ export default {
           duration_unit: this.cellItem.duration_unit
         };
       }
+      window.sessionStorage.setItem("shoppingCart", JSON.stringify(query));
       this.$router.push({
         path: "/shop/shop_car_apply",
         query: query
@@ -478,6 +495,37 @@ export default {
             });
           }
         });
+    },
+    getMessage() {
+      if (this.cellItem.order_type == 1) {
+        this.$api.user
+          .getServiceEvaluation({ apply_id: this.cellItem.apply_id })
+          .then(response => {
+            if (response.data.success == 1) {
+              this.message = response.data.data;
+              this.showMsgBox = true;
+            } else {
+              this.$message({
+                message: "获取评价失败",
+                type: "error"
+              });
+            }
+          });
+      } else if (this.cellItem.order_type == 2) {
+        this.$api.user
+          .getAppEvaluation({ apply_id: this.cellItem.apply_id })
+          .then(response => {
+            if (response.data.success == 1) {
+              this.message = response.data.data;
+              this.showMsgBox = true;
+            } else {
+              this.$message({
+                message: "获取评价失败",
+                type: "error"
+              });
+            }
+          });
+      }
     }
   }
 };
@@ -759,6 +807,22 @@ export default {
   display: block;
   margin-top: 20px;
 }
+.evaluation_msg {
+  height: 100%;
+  border-top: 1px #ededed solid;
+  padding: 20px;
+}
+.msg_title {
+  color: #8890a7;
+  margin: 0 0 10px;
+}
+.msg_rate {
+  margin: 0 0 10px 20px;
+}
+.msg_text {
+  margin-left: 20px;
+  color: #242c43;
+}
 </style>
 <style>
 .pop_rate .el-rate__icon {

src/pages/user/user_info.vue

@@ -9,9 +9,9 @@
         <el-tab-pane label="个人信息详情" name="0"></el-tab-pane>
         <el-tab-pane label="业务系统详情" name="1"></el-tab-pane>
       </el-tabs>
-      <div v-if="activeName == '0'">
-        <el-form ref="form" :model="user_data">
-          <el-form-item class="info_item">
+      <div v-show="activeName == '0'">
+        <el-form ref="form" :model="user_data" :rules="rules_user">
+          <el-form-item class="info_item" prop="accountNo">
             <p>账号：</p>
             <el-input v-model="user_data.accountNo"></el-input>
           </el-form-item>
@@ -20,7 +20,7 @@
             <el-input type="password" v-model="user_data.password" :disabled="true"></el-input>
             <el-button class="option_btn" @click="changePassword">修改密码</el-button>
           </el-form-item>
-          <el-form-item class="info_item">
+          <el-form-item class="info_item" prop="nickname">
             <p>昵称：</p>
             <el-input v-model="user_data.nickname"></el-input>
           </el-form-item>
@@ -35,15 +35,15 @@
               @getNewList="getNewList"
             ></upload-file>
           </el-form-item>
-          <el-form-item class="info_item">
+          <el-form-item class="info_item" prop="contactPerson">
             <p>联系人：</p>
             <el-input v-model="user_data.contactPerson"></el-input>
           </el-form-item>
-          <el-form-item class="info_item">
+          <el-form-item class="info_item" prop="phone">
             <p>手机号：</p>
             <el-input v-model="user_data.phone"></el-input>
           </el-form-item>
-          <el-form-item class="info_item">
+          <el-form-item class="info_item" prop="email">
             <p>邮箱：</p>
             <el-input v-model="user_data.email"></el-input>
           </el-form-item>
@@ -70,9 +70,9 @@
           </el-form-item>
         </el-form>
       </div>
-      <div v-if="activeName == '1'">
-        <el-form ref="formBusiness" :model="formBusiness">
-          <el-form-item class="info_item">
+      <div v-show="activeName == '1'">
+        <el-form ref="formBusiness" :model="formBusiness" :rules="rules_bussiness">
+          <el-form-item class="info_item" prop="businessSystemName">
             <p>业务系统名：</p>
             <el-input v-model="formBusiness.businessSystemName"></el-input>
           </el-form-item>
@@ -118,7 +118,7 @@
             <el-button class="option_btn" @click="copyKey">复制</el-button>
             <el-button class="option_btn_gray" @click="resetKey">重置</el-button>
           </el-form-item>
-          <el-form-item class="info_item">
+          <el-form-item class="info_item" prop="description">
             <p>描述：</p>
             <el-input type="textarea" :rows="2" v-model="formBusiness.description"></el-input>
           </el-form-item>
@@ -263,7 +263,37 @@ export default {
       newIpWhite: "",
       newIpBlack: "",
       diaPassWord: false,
-      upLevelDia: false
+      upLevelDia: false,
+      rules_user: {
+        accountNo: [
+          { required: true, message: "请输入账号", trigger: "blur" },
+          { max: 8, message: "长度请小于8个字符", trigger: "blur" }
+        ],
+        nickname: [
+          { required: true, message: "请输入昵称", trigger: "blur" },
+          { max: 8, message: "长度请小于8个字符", trigger: "blur" }
+        ],
+        contactPerson: [
+          { max: 6, message: "长度请小于6个字符", trigger: "blur" }
+        ],
+        phone: [
+          { pattern: /^1[34578]\d{9}$/, message: "请输入正确的手机号码" }
+        ],
+        email: [
+          {
+            pattern: /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[-|_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/,
+            message: "请输入正确的邮箱"
+          }
+        ]
+      },
+      rules_bussiness: {
+        businessSystemName: [
+          { max: 16, message: "长度请小于16个字符", trigger: "blur" }
+        ],
+        description: [
+          { max: 500, message: "长度请小于500个字符", trigger: "blur" }
+        ]
+      }
     };
   },
   mounted() {
@@ -320,7 +350,8 @@ export default {
     registe() {
       let query = {};
       if (this.activeName == 0) {
-        console.log(this.user_data, this.imgList);
+        this.$refs["form"].validate(valid => {
+          if (valid) {
             query = {
               pageType: "personalFile", // this page is user info
               user_id: this.user_data.accountNo,
@@ -331,7 +362,28 @@ export default {
               link_man: this.user_data.contactPerson,
               picture_path: this.imgList[0]
             };
+            this.$api.authority.setUserInfo(query).then(response => {
+              if (response.data.success == 1) {
+                this.$message({
+                  message: "修改个人信息成功",
+                  type: "success"
+                });
+                this.getUserInfo();
+              } else {
+                this.$message({
+                  message: "修改个人信息失败",
+                  type: "error"
+                });
+              }
+            });
+          } else {
+            return false;
+          }
+        });
       } else if (this.activeName == 1) {
+        this.$refs["formBusiness"].validate(valid => {
+          console.log(valid);
+          if (valid) {
             query = {
               pageType: "systemFile", // this page is system info
               user_id: this.user_data.accountNo,
@@ -341,7 +393,6 @@ export default {
               ip_blacklist: this.formBusiness.ip_black,
               description: this.formBusiness.description
             };
-      }
             this.$api.authority.setUserInfo(query).then(response => {
               if (response.data.success == 1) {
                 this.$message({
@@ -356,6 +407,11 @@ export default {
                 });
               }
             });
+          } else {
+            return false;
+          }
+        });
+      }
     },
     changePassword() {
       this.diaPassWord = true;

src/pages/workbench/intelligent_drawing.vue

+<template>
+  <div class="intelligent_drawing-container">
+    <div class="apass_breadcrumb">
+      <el-breadcrumb separator="/">
+        <el-breadcrumb-item>在线组件工具</el-breadcrumb-item>
+        <el-breadcrumb-item>智能制图</el-breadcrumb-item>
+      </el-breadcrumb>
+    </div>
+
+    <div class="main-container"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style scoped>
+.intelligent_drawing-container {
+  margin: -157px 40px 20px;
+}
+.main-container {
+  min-height: calc(100vh - 150px - 43px);
+  border-radius: 12px;
+  background-color: #fff;
+  padding: 30px;
+}
+</style>
+
+<style>
+.intelligent_drawing-container .apass_breadcrumb {
+  padding: 0 20px;
+}
+.intelligent_drawing-container .apass_breadcrumb > .el-breadcrumb .el-breadcrumb__inner {
+  color: #626de9;
+}
+.intelligent_drawing-container
+  .apass_breadcrumb
+  > .el-breadcrumb
+  .el-breadcrumb__item:last-child
+  .el-breadcrumb__inner {
+  color: #b4c0f5;
+}
+</style>

src/pages/workbench/workPlace.vue

@@ -965,7 +965,7 @@ export default {
           pic: require("@/assets/imgs/home_tool_ic_znht.png"),
           bg: "#e5f4fe",
           color: "#38aef9",
-          url: "https://apaasgis.wodcloud.com/portal/geoplat/viewer/mapViewer.html",
+          url: "https://apaasgis.wodcloud.com/portal/nologoplat/viewer/mapViewer.html",
           target: 1
         },
         {
@@ -985,7 +985,7 @@ export default {
           pic: require("@/assets/imgs/home_tool_ic_lcsj.png"),
           bg: "#e6ebfe",
           color: "#515fe7",
-          url: "https://apaas.wodcloud.com/lcgl/index.html#/",
+          url: "https://apaas-nologo.wodcloud.com/lcgl/index.html#/",
           target: 1
         },
         {

src/request/api/user.js

@@ -11,7 +11,7 @@ const user = {
         return axios.get(`/apaas/serviceapp/v3/order/domains`);
     },
     delOrder(params) {
-        return axios.delete(`/order/del?order_id=${params.id}`);
+        return axios.delete(`/apaas/serviceapp/v3/order/del?order_id=${params.id}`);
     },
     addServiceEvaluation(params) {
         return axios.post(`/apaas/serviceapp/v3/order/estimate`, params);
@@ -35,7 +35,7 @@ const user = {
         return axios.get(`/apaas/serviceapp/v3/order/approval?apply_id=${params.apply_id}&kind=${params.kind}`);
     },
     cancelOrder(params) {
-        return axios.delete(`/order/cancel?order_id=${params.order_id}`);
+        return axios.delete(`/apaas/serviceapp/v3/order/cancel?order_id=${params.order_id}`);
     },
 
     // user info

src/router/index.js

@@ -237,6 +237,11 @@ export default new Router({
           name: "app_build",
           component: () => import("@/pages/workbench/app_build"),
         }, // 应用构建（镜像形式）
+        {
+          path: "/intelligent_drawing",
+          name: "intelligent_drawing",
+          component: () => import("@/pages/workbench/intelligent_drawing"),
+        }, // 智能制图
         {
           path: "/user", // 个人中心
           name: "user",