Merge branch 'ldx' into dev

src/assets/css/index.css

@@ -229,7 +229,7 @@ div{
   background-color: #edf0ff;
 }
 /* 设置tree的样式 */
-.usrrole .el-tree-node:focus>.el-tree-node__content{
+/* .usrrole .el-tree-node:focus>.el-tree-node__content{
   background: rgb(248, 249, 253) !important;
 }
 .usrrole  .el-tree-node__content:hover{
@@ -269,7 +269,7 @@ border-radius:8px;
   border-top-right-radius:8px;
   border-bottom-left-radius:0;
   border-bottom-right-radius:0;
-}
+} */
 /* 左右布局 */
 .flex {
 height: 100%;

src/components/commodity-card.vue

@@ -6,24 +6,24 @@
         class="com_card_img"
       />
       <div class="com_card_name_v">
-        <div class="com_card_msg_name">ApaasApaasApaasApaas</div>
-        <div class="com_card_msg_version">v1.876</div>
+        <div class="com_card_msg_name">{{ cellData.title }}</div>
+        <div class="com_card_msg_version">V{{ cellData.version }}</div>
       </div>
     </div>
     <div class="com_card_msg">
       <div class="com_card_msg_tit">
         <img :src="require('@/assets/imgs/icon_shijian.png')" />&nbsp;上线时间
       </div>
-      <div class="com_card_msg_num">2019-12-04</div>
+      <div class="com_card_msg_num">{{ cellData.onlineTime }}</div>
     </div>
     <div class="com_card_msg">
       <div class="com_card_msg_tit">
         <img :src="require('@/assets/imgs/icon_huoqu1.png')" />&nbsp;部署次数
       </div>
-      <div class="com_card_msg_num1">888888</div>
+      <div class="com_card_msg_num1">{{ cellData.num }}</div>
     </div>
     <div class="com_card_btn">
-      <el-button size="medium" class="btn_1">加入购物车</el-button>
+      <el-button size="medium" class="btn_1" @click="addShop(cellData.id)">加入购物车</el-button>
       <el-button size="medium" class="btn_2" @click="goUrl(cellData.id)">查看详情</el-button>
     </div>
   </div>
@@ -44,6 +44,9 @@ export default {
       if (this.url != "") {
         this.$router.push(this.url + "/" + parame);
       }
+    },
+    addShop(id) {
+      
     }
   },
   mounted() {}
@@ -70,7 +73,7 @@ export default {
   margin-bottom: 35px;
 }
 .com_card_name_v {
-  width: calc(100% - 70px);
+  width: calc(100% - 80px);
 }
 .com_card_img {
   width: 60px;
@@ -86,7 +89,7 @@ export default {
   font-size: 18px;
   font-weight: 700;
   margin-top: 4px;
-  margin-bottom: 8px;
+  margin-bottom: 12px;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -127,7 +130,7 @@ export default {
   color: #f8f9fd;
 }
 .btn_2:hover {
-  background-color: #142b88;
+  background-color: #1d3694;
   color: #f8f9fd;
 }
 </style>
\ No newline at end of file

src/components/commodity-list.vue

@@ -2,10 +2,7 @@
   <div>
     <div v-if="name=='应用商店'" ref="commodityList" class="commodity_card">
       <div ref="commodityCardIn" class="commodity_card_list">
-        <div v-for="item in datas" :key="item.id" class="commodity_card_item">
-          <commodity-card class="commodity_card_item_in" :cellData="item" :url="url"></commodity-card>
-        </div>
-        <div v-for="item in datas" :key="'s' + item.id" class="commodity_card_item">
+        <div v-for="item in datas"  :cellData="item" :url="url" :key="item.id" class="commodity_card_item">
           <commodity-card class="commodity_card_item_in" :cellData="item" :url="url"></commodity-card>
         </div>
       </div>
@@ -122,11 +119,11 @@ export default {
       let listWidth = this.$refs.commodityCardIn.clientWidth;
       let rowCardNum = Math.floor(listWidth / 310);
       let cardArr = this.$refs.commodityCardIn.children;
-      console.log(rowCardNum, listWidth / rowCardNum);
+      // console.log(rowCardNum, listWidth / rowCardNum);
       for (let i = 0; i < cardArr.length; i++) {
         cardArr[i].style.width = (listWidth / rowCardNum) - 1 + "px";
       }
-      console.log(this.$refs.commodityCardIn);
+      // console.log(this.$refs.commodityCardIn);
     }
   },
   mounted() {

src/components/service_list.vue

@@ -162,7 +162,7 @@ export default {
     lists: [
       {
         id: 0,
-        title: "水路货物周转量情况",
+        title: "水路货物周转量情况水路货物周转量情况",
         state: 0,
         resourceSummary:
           "提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务",
@@ -172,7 +172,10 @@ export default {
         updateTime: "2020-03-12 18:31:12",
         numberOfMonth: "2698755",
         rate: 3,
-        mapService: 1
+        mapService: 1,
+        version: 2.888,
+        onlineTime: "2019-04-11 12:50:30",
+        num: 66666
       },
       {
         id: 1,
@@ -185,7 +188,10 @@ export default {
         serviceType: "数据服务 专题数据服务 企业专题数据服务",
         updateTime: "2020-03-12 18:31:12",
         numberOfMonth: "2698745",
-        rate: 3.4
+        rate: 3.4,
+        version: 2.888,
+        onlineTime: "2019-04-11 12:50:30",
+        num: 66666
       },
       {
         id: 2,
@@ -198,7 +204,10 @@ export default {
         serviceType: "数据服务 专题数据服务 企业专题数据服务",
         updateTime: "2020-03-12 18:31:12",
         numberOfMonth: "2698455",
-        rate: 2.5
+        rate: 2.5,
+        version: 2.888,
+        onlineTime: "2019-04-11 12:50:30",
+        num: 66666
       },
       {
         id: 3,
@@ -211,7 +220,10 @@ export default {
         serviceType: "数据服务 专题数据服务 企业专题数据服务",
         updateTime: "2020-03-12 18:31:12",
         numberOfMonth: "267455",
-        rate: 3.7
+        rate: 3.7,
+        version: 2.888,
+        onlineTime: "2019-04-11 12:50:30",
+        num: 66666
       }
     ],
     filterLists: [

src/components/shop-cloud/shop-cloud.vue

+ <template>
+  <div>
+    <el-breadcrumb separator="/" class="bread_crumb1 bread_left">
+      <el-breadcrumb-item :to="{ path: '/shop' }">服务超市</el-breadcrumb-item>
+      <el-breadcrumb-item>{{ name }}</el-breadcrumb-item>
+    </el-breadcrumb>
+    <block-radius>
+      <el-form ref="form" :inline="true" :model="form" label-width="100px">
+        <el-form-item label="申请部门">
+          <el-input v-model="form.department"></el-input>
+        </el-form-item>
+        <el-form-item label="部门联系人">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话">
+          <el-input v-model="form.tel"></el-input>
+        </el-form-item>
+      </el-form>
+    </block-radius>
+    <block-radius>
+      <el-tabs v-model="activeName" @tab-click="tabClick">
+        <el-tab-pane label="申请新的工作区域" name="0">
+          <el-form ref="formNew" :model="formNew" label-width="100px">
+            <div>基本信息</div>
+            <el-form-item label="工作区域名称">
+              <el-input v-model="formNew.workAreaName"></el-input>
+            </el-form-item>
+            <el-form-item label="中文名称">
+              <el-input v-model="formNew.cnName"></el-input>
+            </el-form-item>
+            <el-form-item label="描述信息">
+              <el-input type="textarea" v-model="formNew.description"></el-input>
+            </el-form-item>
+            <div>工作区域申请规格</div>
+            <el-form-item label="CPU">
+              <el-input v-model="formNew.CPUs"></el-input>
+            </el-form-item>
+            <el-form-item label="内存">
+              <el-input v-model="formNew.RAMs"></el-input>
+            </el-form-item>
+            <el-form-item label="容器组">
+              <el-input type="textarea" v-model="formNew.containerGroup"></el-input>
+            </el-form-item>
+            <el-form-item label="数据盘（可选）">
+              <el-input-number v-model="formNew.dataDisk" @change="handleChange" :min="1" :max="10"></el-input-number>块，每块
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane label="升级现有工作区域" name="1">升级现有工作区域</el-tab-pane>
+      </el-tabs>
+    </block-radius>
+  </div>
+</template>
+
+<script>
+import BlockRadius from "@/components/block-radius";
+export default {
+  components: {
+    BlockRadius
+  },
+  props: {
+    name: { type: String, default: "" }
+  },
+  data: () => ({
+    form: {
+      department: "",
+      name: "",
+      tel: ""
+    },
+    activeName: "0",
+    formNew: {
+      workAreaName: "",
+      cnName: "",
+      description: "",
+      CPUs: "",
+      RAMs: "",
+      containerGroup: "",
+      dataDisk: ""
+    }
+  }),
+  methods: {
+    tabClick() {}
+  }
+};
+</script>
+
+<style scoped>
+</style>

src/pages/example_table.vue

@@ -55,10 +55,10 @@
       :headers="headers2"
       url="tableData1"
       :searchShow="false"
-      :addRowBtn="false"
+      :addRowBtn="true"
       :autoAdd="false"
       :isDialog="false"
-      :isSelection="false"
+      :isSelection="true"
       :isIndex="true"
       :confirmOptions="confirmOptions"
       :detailsUrl="detailsUrl"
@@ -68,6 +68,7 @@
       :paginationShow="false"
       :pageSizeShow="false"
       headerCellClassName="th_pink"
+      :getSelectBtn="true"
     ></ces-table>
   </div>
 </template>
@@ -77,9 +78,27 @@ import cesTable from "@/components/table-um";
 export default {
   data: () => ({
     headers: [
-      { label: "服务url", prop: "date", type: "href", align: "left", minWidth: "50%" },
-      { label: "服务名称", prop: "name", type: "href", align: "center", minWidth: "60%" },
-      { label: "中文名", prop: "address", type: "href", align: "right",width: "100" },
+      {
+        label: "服务url",
+        prop: "date",
+        type: "href",
+        align: "left",
+        minWidth: "50%"
+      },
+      {
+        label: "服务名称",
+        prop: "name",
+        type: "href",
+        align: "center",
+        minWidth: "60%"
+      },
+      {
+        label: "中文名",
+        prop: "address",
+        type: "href",
+        align: "right",
+        width: "100"
+      },
       {
         label: "操作",
         type: "Button",
@@ -100,7 +119,13 @@ export default {
     headers1: [
       { label: "服务url", prop: "date", type: "input", align: "left" },
       { label: "服务名称", prop: "name", type: "input", align: "center" },
-      { label: "是否必要", prop: "address", type: "select", align: "center", width: 100 }
+      {
+        label: "是否必要",
+        prop: "address",
+        type: "select",
+        align: "center",
+        width: 100
+      }
     ],
     headers2: [
       { label: "服务url", prop: "date", type: "", align: "left" },
@@ -139,7 +164,7 @@ export default {
         name: "服务状态",
         prop: "fwzt",
         data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合服务"]
-      },
+      }
     ]
   }),
   components: {

src/pages/fwzc_fwcs.vue

@@ -356,7 +356,6 @@ export default {
     optionsOrganization: [],
     datasQqcs: [
       {
-        id: 123134445,
         name: "name",
         field_type: "string",
         label: "",
@@ -365,7 +364,6 @@ export default {
         children: null
       },
       {
-        id: 1213445,
         name: "age",
         field_type: "float",
         label: "",
@@ -374,7 +372,6 @@ export default {
         children: null
       },
       {
-        id: 12313444,
         name: "childs",
         field_type: "array",
         label: "",
@@ -382,7 +379,6 @@ export default {
         example: "",
         children: [
           {
-            id: 1231345,
             name: "",
             field_type: "object",
             label: "",
@@ -390,7 +386,6 @@ export default {
             example: "",
             children: [
               {
-                id: 123344445,
                 name: "name",
                 field_type: "string",
                 label: "",
@@ -399,7 +394,6 @@ export default {
                 children: null
               },
               {
-                id: 11344445,
                 name: "age",
                 field_type: "float",
                 label: "",
@@ -414,7 +408,6 @@ export default {
     ],
     datasFhcs: [
       {
-        id: 123134445,
         name: "name",
         field_type: "string",
         label: "",
@@ -423,7 +416,6 @@ export default {
         children: null
       },
       {
-        id: 1213445,
         name: "age",
         field_type: "float",
         label: "",
@@ -432,7 +424,6 @@ export default {
         children: null
       },
       {
-        id: 12313444,
         name: "childs",
         field_type: "array",
         label: "",
@@ -440,7 +431,6 @@ export default {
         example: "",
         children: [
           {
-            id: 1231345,
             name: "",
             field_type: "object",
             label: "",
@@ -448,7 +438,6 @@ export default {
             example: "",
             children: [
               {
-                id: 123344445,
                 name: "name",
                 field_type: "string",
                 label: "",
@@ -457,7 +446,6 @@ export default {
                 children: null
               },
               {
-                id: 11344445,
                 name: "age",
                 field_type: "float",
                 label: "",

src/pages/shop_cloud.vue

@@ -5,7 +5,7 @@
         <service-shop-menu></service-shop-menu>
       </el-aside>
       <el-main>
-        <service-list name="云资源"></service-list>
+        <shop-cloud name="云资源服务"></shop-cloud>
       </el-main>
     </el-container>
   </div>
@@ -13,11 +13,11 @@
 
 <script>
 import ServiceShopMenu from "@/components/service_shop_menu";
-import ServiceList from "@/components/service_list";
+import ShopCloud from "@/components/shop-cloud/shop-cloud";
 export default {
   components: {
     ServiceShopMenu,
-    ServiceList
+    ShopCloud
   },
   data: () => ({}),
   mounted() {},

static/data.json

@@ -32,31 +32,26 @@
     ],
     "tableData1": [
       {
-        "id": 1,
         "date": "2016-05-02",
         "name": "王小虎",
         "address": "上海市普陀区金沙江路 1518 弄"
       },
       {
-        "id": 2,
         "date": "2016-05-04",
         "name": "王小虎",
         "address": "上海市普陀区金沙江路 1517 弄"
       },
       {
-        "id": 3,
         "date": "2016-05-01",
         "name": "王小虎",
         "address": "上海市普陀区金沙江路 1519 弄",
         "children": [
           {
-            "id": 31,
             "date": "2016-05-01",
             "name": "王小虎",
             "address": "上海市普陀区金沙江路 1519 弄"
           },
           {
-            "id": 32,
             "date": "2016-05-01",
             "name": "王小虎",
             "address": "上海市普陀区金沙江路 1519 弄"
@@ -64,7 +59,6 @@
         ]
       },
       {
-        "id": 4,
         "date": "2016-05-03",
         "name": "王小虎",
         "address": "上海市普陀区金沙江路 1516 弄"
@@ -616,7 +610,7 @@
             "name": "",
             "field_type": "object",
             "label": "",
-            "descript": "",
+            "de script": "",
             "example": "",
             "children": [
               {
@@ -634,6 +628,7 @@
                 "descript": "",
                 "example": "2.00",
                 "children": null
+
               }
             ]
           }