Pārlūkot izejas kodu

feat:完善功能

jinx 4 gadi atpakaļ
vecāks
revīzija
78666e9f60

+ 17 - 32
src/page/client/index.vue

@@ -52,7 +52,7 @@
             </el-table>
           </div>
           <div class="order-management-pagination">
-            <el-pagination  @current-change="handleCurrentChange" :current-page.sync="currentPage" :page-size="pagesize" layout="total, prev, pager, next, jumper" :total="total">
+            <el-pagination @current-change="handleCurrentChange" :current-page.sync="currentPage" :page-size="pagesize" layout="total, prev, pager, next, jumper" :total="total">
             </el-pagination>
           </div>
         </div>
@@ -61,7 +61,7 @@
             <el-form-item label="客户名称" prop="companyName">
               <el-input v-model="ruleForm.companyName"></el-input>
             </el-form-item>
-            <el-form-item  label="客户账号" >
+            <el-form-item label="客户账号">
               <el-select v-model="ruleForm.managerId" placeholder="请选择">
                 <el-option label="无" value="">无</el-option>
                 <el-option :label="item.userName" :value="item.id" v-for="(item,i) in clients" :key="i">{{item.userName}}</el-option>
@@ -74,13 +74,7 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item label="顶部logo" prop="topLogo">
-              <el-upload
-                class="avatar-uploader"
-                :headers="{token}"
-                :action="uploadUrl"
-                :show-file-list="false"
-                :on-success="handleAvatarSuccess"
-                :before-upload="beforeAvatarUpload">
+              <el-upload class="avatar-uploader" :headers="{token}" :action="uploadUrl" :show-file-list="false" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
                 <div @click="currentImgType='topLogo'">
                   <img v-if="ruleForm.topLogo" :src="ruleForm.topLogo" class="avatar">
                   <i v-else class="el-icon-plus avatar-uploader-icon"></i>
@@ -88,13 +82,7 @@
               </el-upload>
             </el-form-item>
             <el-form-item label="地面logo" prop="floorLogo">
-              <el-upload
-                class="avatar-uploader"
-                :headers="{token}"
-                :action="uploadUrl"
-                :show-file-list="false"
-                :on-success="handleAvatarSuccess"
-                :before-upload="beforeAvatarUpload">
+              <el-upload class="avatar-uploader" :headers="{token}" :action="uploadUrl" :show-file-list="false" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
                 <div @click="currentImgType='floorLogo'">
                   <img v-if="ruleForm.floorLogo" :src="ruleForm.floorLogo" class="avatar">
                   <i v-else class="el-icon-plus avatar-uploader-icon"></i>
@@ -102,13 +90,7 @@
               </el-upload>
             </el-form-item>
             <el-form-item label="二维码logo" prop="qrLogo">
-              <el-upload
-                class="avatar-uploader"
-                :headers="{token}"
-                :action="uploadUrl"
-                :show-file-list="false"
-                :on-success="handleAvatarSuccess"
-                :before-upload="beforeAvatarUpload">
+              <el-upload class="avatar-uploader" :headers="{token}" :action="uploadUrl" :show-file-list="false" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
                 <div @click="currentImgType='qrLogo'">
                   <img v-if="ruleForm.qrLogo" :src="ruleForm.qrLogo" class="avatar">
                   <i v-else class="el-icon-plus avatar-uploader-icon"></i>
@@ -256,8 +238,12 @@ export default {
       if (res.code === 0) {
         let temp = res.data.list
         for (var i = 0; i < temp.length; i++) {
-          temp[i]['userName'] = temp[i]['userName'] ? temp[i]['userName'] : '未绑定'
-          temp[i]['activatedTime'] = temp[i]['activatedTime'] ? new Date(temp[i]['activatedTime']).format('yyyy-MM-dd hh:mm:ss') : '/'
+          temp[i]['userName'] = temp[i]['userName']
+            ? temp[i]['userName']
+            : '未绑定'
+          temp[i]['activatedTime'] = temp[i]['activatedTime']
+            ? new Date(temp[i]['activatedTime']).format('yyyy-MM-dd hh:mm:ss')
+            : '/'
         }
         this.cameras = temp
         this.total = res.data.total ? res.data.total : this.total
@@ -278,7 +264,8 @@ export default {
       return isLt2M
     },
     showDialog (row) {
-      this.ruleForm = row
+      let data = JSON.stringify(row)
+      this.ruleForm = JSON.parse(data)
       this.companyVisible = true
     },
 
@@ -343,22 +330,20 @@ export default {
     this.getclientData()
   }
 }
-
 </script>
 <style lang="css" scoped>
-@import './style.css';
+@import "./style.css";
 </style>
 <style type="text/css">
-.el-table__expand-icon>i {
+.el-table__expand-icon > i {
   display: none !important;
 }
 
 .edit_btn span {
-  color: #09e1c0
+  color: #09e1c0;
 }
 
 .delete_btn span {
-  color: #f56c6c
+  color: #f56c6c;
 }
-
 </style>

+ 9 - 9
src/page/layout/slide.vue

@@ -74,15 +74,15 @@ export default {
         top: 154
       },
       // { text: '版本管理', link: {name: 'edition'}, top: 182 },
-      { text: '数据统计', link: {name: 'Statistics'}, top: 210 }
-      // {
-      //   text: 'SDK 发布管理',
-      //   link: {name: 'sdkManage'},
-      //   children: [
-      //     { text: 'Space target', link: {name: 'sdkManage'}, top: 182 }
-      //   ],
-      //   top: 154
-      // }
+      { text: '数据统计', link: {name: 'Statistics'}, top: 210 },
+      {
+        text: 'SDK 发布管理',
+        link: {name: 'sdkManage'},
+        children: [
+          { text: 'Space target', link: {name: 'spaceTarget'}, top: 182 }
+        ],
+        top: 154
+      }
     //   { text: '数据下载', link: {name: 'Down'}, top: 210 }
       // ,
       // {

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 481 - 0
src/page/spaceTarget/index.vue


+ 186 - 0
src/page/spaceTarget/style.css

@@ -0,0 +1,186 @@
+.spaceTarget-management-body {
+  width: 100%;
+  float: left;
+  /*  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  -webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);*/
+  /*border: 1px solid #ebeef5;*/
+}
+
+.order_check_row {
+  display: flex;
+  width: 100%;
+}
+
+.product_info {
+  width: 50%;
+  flex-direction: column;
+  display: flex;
+  padding: 20px;
+  background: #fff;
+}
+
+.order_info {
+  width: 50%;
+  padding: 20px;
+  margin-left: 20px;
+  background: #fff;
+}
+
+.product_info_title {
+  text-align: left;
+  font-weight: 700;
+  margin-bottom: 20px;
+}
+
+.product_info_body {
+  margin-left: 30px;
+  display: flex;
+}
+
+.product_info_body_img {
+  width: 110px;
+  height: 110px;
+  border: 1px solid #ddd;
+}
+
+.product_img {
+  margin: 5px auto;
+  width: 100px;
+  height: 100px;
+}
+
+.product_info_body_info {
+  margin-left: 50px;
+}
+
+.product_info_body_info_item {
+  line-height: 27px;
+  text-align: left;
+}
+
+.product_info_body_info_item_title {
+  width: 100px;
+  display: inline-block;
+  margin-right: 20px;
+  font-weight: 700;
+}
+
+.order_info_title {
+  text-align: left;
+  font-weight: 700;
+  margin-bottom: 20px;
+}
+
+.order_info_body {
+  margin-left: 30px;
+  text-align: left;
+}
+
+/* .order_info_body_info {} */
+
+.order_info_body_info_item {
+  line-height: 23px;
+  padding: 10px 0;
+  border-bottom: 1px solid #f5f5f5;
+  text-align: left;
+}
+
+.order_info_body_info_item_title {
+  width: 100px;
+  display: inline-block;
+  margin-right: 20px;
+  font-weight: 700;
+}
+
+.order-management-body {
+  width: 100%;
+  margin: 30px 0 20px 0;
+  float: left;
+}
+
+.order-management-inner {
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  -webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  /*border: 1px solid #ebeef5;*/
+  padding: 20px;
+  background: #fff;
+  border-radius: 5px;
+}
+
+
+
+
+.spaceTarget-management_bottom {
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  -webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  /*border: 1px solid #ebeef5;*/
+  margin-top: 30px;
+  background: #fff;
+  border-radius: 5px;
+  padding: 20px 0;
+}
+
+.order-check_tab {
+  margin: 0 0 20px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.order-check_tab ul {
+  display: inline-block;
+}
+
+.order-check_tab li {
+  display: inline-block;
+  cursor: pointer;
+  color: #999;
+  line-height: 1;
+}
+
+.order-check_tab_li_active {
+  color: #000 !important;
+  font-weight: bold;
+}
+
+.order-management-table {
+  margin: 0 20px;
+}
+
+.order-management-pagination {
+  padding: 20px 20px 0;
+  position: relative;
+  text-align: right;
+}
+
+.el-input {
+  width: 220px;
+}
+
+.upload-btn {
+  opacity: 0;
+  position: absolute;
+  top: 0;
+  width: 80px;
+  height: 30px;
+  left: 0;
+}
+.upload-file {
+  position: relative;
+  display: inline-block;
+  overflow: hidden;
+}
+
+.upload-file input {
+  position: absolute;
+  z-index: 1;
+  cursor: pointer;
+  opacity: 0;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+}

+ 8 - 0
src/router/index.js

@@ -133,6 +133,14 @@ export default new Router({
           meta: { text: '数据下载' }
         },
         {
+          path: '/spaceTarget',
+          name: 'spaceTarget',
+          component: require('@/page/spaceTarget').default,
+          meta: {
+            text: 'Space target'
+          }
+        },
+        {
           path: '*',
           redirect: '/home'
         }