Merge branch 'ldx' into dev

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

@@ -42,10 +42,11 @@
       <el-col :span="6" class="cell_specification">
         <div v-if="cellItem.order_type == 1">
           <el-tooltip class="item" effect="dark" placement="right">
-            <div
-              slot="content"
-              class="gg"
-            >规格：日访问次数：{{cellItem.spec_svc_count}}次，日访问量：{{cellItem.spec_svc_pv }}</div>
+            <div slot="content" class="gg">
+              规格：
+              <br />
+              日访问次数：{{cellItem.spec_svc_count}}次，日访问量：{{cellItem.spec_svc_pv }}
+            </div>
             <div>规格：日访问次数：{{ cellItem.spec_svc_count }}次，日访问量：{{ cellItem.spec_svc_pv }}</div>
           </el-tooltip>
           <div
@@ -54,31 +55,41 @@
         </div>
         <div v-else-if="cellItem.order_type == 2">
           <el-tooltip class="item" effect="dark" placement="right">
-            <div
-              slot="content"
-              class="gg"
-            >{{ cellItem.spec_app == 0 ? '规格：申请获取应用镜像部署权限' : '规格：申请获取应用镜像开发权限' }}</div>
+            <div slot="content" class="gg">
+              规格：
+              <br />
+              {{ cellItem.spec_app == 0 ? '申请获取应用镜像部署权限' : '申请获取应用镜像开发权限' }}
+            </div>
             <div>规格：{{ cellItem.spec_app == 0 ? "申请获取应用镜像部署权限" : "申请获取应用镜像开发权限" }}</div>
           </el-tooltip>
         </div>
         <div v-else-if="cellItem.order_type == 3">
           <el-tooltip v-if="cellItem.apply_type == 0" class="item" effect="dark" placement="right">
-            <div
-              slot="content"
-              class="gg"
-            >规格：CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；数据盘 {{ cellItem.disk_num }}块，每块数据盘容量 {{ cellItem.disk_cap }}GB</div>
+            <div slot="content" class="gg">
+              规格：
+              <br />
+              CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
+              <br />
+              数据盘 {{ cellItem.disk_num }}块，每块数据盘容量 {{ cellItem.disk_cap }}GB；
+            </div>
             <div class="specification_item">
               规格：CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
               <span
                 v-if="cellItem.disk_num != 0"
-              >数据盘 {{ cellItem.disk_num }}块，每块数据盘容量 {{ cellItem.disk_cap }}GB</span>
+              >数据盘 {{ cellItem.disk_num }}块，每块数据盘容量 {{ cellItem.disk_cap }}GB；</span>
             </div>
           </el-tooltip>
           <el-tooltip v-else class="item" effect="dark" placement="right">
-            <div
-              slot="content"
-              class="gg"
-            >规格：CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；{{ thisDisks }}</div>
+            <div slot="content" class="gg">
+              规格：
+              <br />
+              CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
+              <span
+                class="gg_span"
+                v-for="(item, index) in cellItem.adjust_disk"
+                :key="'sjj' + index"
+              >数据盘 {{item.disk_num}}块，每块数据盘容量 {{item.disk_cap}}GB；</span>
+            </div>
             <div class="specification_item">
               规格：CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
               <span>{{ thisDisks }}</span>
@@ -86,7 +97,7 @@
           </el-tooltip>
           <div
             class="cell_specification_type"
-          >单个容器组：CPU最高 {{ cellItem.one_cpu_max }}核，默认 {{ cellItem.one_cpu_min }}核；内存最高 {{ cellItem.one_memory_max }}GB，默认 {{ cellItem.one_memory_min }}GB</div>
+          >单个容器组：CPU最高 {{ cellItem.one_cpu_max }}核，默认 {{ cellItem.one_cpu_min }}核；内存最高 {{ cellItem.one_memory_max }}GB，默认 {{ cellItem.one_memory_min }}GB；</div>
         </div>
       </el-col>
       <el-col :span="4" class="approval_status">
@@ -562,13 +573,16 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
   display: -webkit-box;
-  -webkit-line-clamp: 3;
+  -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
 }
 .gg {
-  max-width: 200px;
+  /* max-width: 200px; */
   word-wrap: break-word;
 }
+.gg_span {
+  display: block;
+}
 </style>
 <style>
 .pop_rate .el-rate__icon {

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

@@ -26,7 +26,14 @@
 
 <script>
 export default {
-  props: {},
+  props: {
+    formInline: {
+      type: Object,
+      default: function () {
+        return {};
+      },
+    },
+  },
   components: {},
   data() {
     var check_phone = (rule, value, callback) => {
@@ -41,21 +48,16 @@ export default {
     };
 
     return {
-      formInline: {
-        depart: "",
-        preson: "",
-        phone: ""
-      },
       rules: {
         preson: [
           { required: true, message: "请输入部门联系人", trigger: "blur" },
-           {max:16, message: "不能超过16个字符", trigger: "blur" }
+          { max: 16, message: "不能超过16个字符", trigger: "blur" },
         ],
         phone: [
           { required: true, message: "请输入联系电话", trigger: "blur" },
-          { validator: check_phone, trigger: "blur" }
-        ]
-      }
+          { validator: check_phone, trigger: "blur" },
+        ],
+      },
     };
   },
   watch: {},
@@ -66,16 +68,18 @@ export default {
   },
   methods: {
     submitForm() {
-      this.$refs["ruleForm"].validate(valid => {
+      var flag = null;
+      this.$refs.ruleForm.validate((valid) => {
+        console.log(valid);
         if (valid) {
-          alert("submit!");
+          flag = true;
         } else {
-          console.log("error submit!!");
-          return false;
+          flag = false;
         }
       });
-    }
-  }
+      return flag;
+    },
+  },
 };
 </script>
 

src/pages/workbench/workPlace.vue

@@ -974,18 +974,6 @@ export default {
           url: "/intelligent_drawing",
           target: 0
         },
-        {
-          text: "数据开发",
-          pic: require("@/assets/imgs/home_tool_ic_sjkf.png"),
-          bg: "#e6ebfe",
-          color: "#515fe7"
-        },
-        {
-          text: "模型工场",
-          pic: require("@/assets/imgs/home_tool_ic_mxgc.png"),
-          bg: "#e6ebfe",
-          color: "#515fe7"
-        },
         {
           text: "流程设计",
           pic: require("@/assets/imgs/home_tool_ic_lcsj.png"),
@@ -1001,38 +989,12 @@ export default {
           url: "/iam/api/bi/token",
           target: 1
         },
-        {
-          text: "模板应用",
-          pic: require("@/assets/imgs/home_tool_ic_mbyy.png"),
-          bg: "#fff2e2",
-          color: "#ea7d19"
-        },
         {
           text: "应用创新",
           pic: require("@/assets/imgs/home_tool_ic_yycx.png"),
-          move_pic:'',
           bg: "#e7fdfc",
-          move_bg:'#b2e4e1',
           color: "#25bdb1",
-          move_color:'#009488',
-          children:[
-            {
-              text: "镜像形式",
-              pic: require("@/assets/imgs/home_tool_ic_jxxs.png"),
-              bg: "#e7fdfc",
-              color: "#25bdb1",
-              url:'/app_build',
-              h_bg:'#d3f6f4'
-            },
-            {
-              text: "代码形式",
-              pic: require("@/assets/imgs/home_tool_ic_dmxs.png"),
-              bg: "#e7fdfc",
-              color: "#25bdb1",
-              url:'',
-              h_bg:'#d3f6f4'
-            },
-          ]
+          url: "/app_build",
         },
         {
           text: "搜索引擎",