feat:发布版本 20201214

pc/src/components/table/index.vue

@@ -2,14 +2,14 @@
   <div class="table-layout">
     <ul class="t-header" :class="{line:showLine}">
       <li v-if="selection" class="check-cls"><span @click="lock=false,selectAll=!selectAll" class="fdcheck" :class="{check_active:selectAll}">{{$t('common.selectAll')}}</span></li>
-      <li v-for="(item,i) in header" :key="i" :style="{width:item.width&&innerW>1500?item.width+'px':(100/header.length)+'%'}">
+      <li v-for="(item,i) in header" :key="i" :style="{width:item.width ?item.width+'px':(100/header.length)+'%'}">
         <slot :data='item' name='header'></slot>
       </li>
     </ul>
     <div class="t-con">
       <ul class="t-item" :class="{line:showLine}" v-for="(item,i) in fixdata" :key="i">
         <li v-if="selection" class="check-cls"><span @click="selectItem(item,i)" class="fdcheck" :class="{check_active:item.hasAuth}"></span></li>
-        <li v-for="(sub,j) in header" :key='j' :style="{width:sub.width&&innerW>1500?sub.width+'px':(100/header.length)+'%'}">
+        <li v-for="(sub,j) in header" :key='j' :style="{width:sub.width ? sub.width+'px':(100/header.length)+'%'}">
           <slot :data='item[sub.key]' :type="sub.type" :item='item' :canclick='sub.canclick' name='item'></slot>
         </li>
       </ul>
@@ -69,7 +69,7 @@ export default {
     selectItem (item, i) {
       if (item.status || item.status === 0) {
         if (!(item.status === 1 || item.status === -2)) {
-          return this.$toast.show('warn', this.language === 'en' ? '该场景计算中或计算错误，无法进行勾选' : '该场景计算中或计算错误，无法进行勾选')
+          return this.$toast.show('warn', this.$t('manage.sceneAdmin.canNotSelectTip'))
         }
       }
       item.hasAuth = !item.hasAuth

pc/src/components/table/style.scss

@@ -3,7 +3,7 @@
   color: #777;
   font-size: 12px;
   .check-cls{
-    width:60px;
+    width:80px;
     text-align:left!important; 
     margin-left:20px;
   }
@@ -30,6 +30,7 @@
         display: inline-block;
         span{
           word-break: break-all;
+          // display: inline-block;
         }
       }
     }

pc/src/components/toast/cooperation.vue

@@ -34,13 +34,13 @@
 
       <div class="bind-btn coo-btn" >
         <template v-if="!cooName">
-          <span class="default" @click="handleClick">{{lang==='en'?'Cancel':'取消'}}</span>
-          <span @click="addCooperation">{{lang==='en'?'Save':'保存'}}</span>
+          <span class="default" @click="handleClick">{{i18n.t('common.cancle')}}</span>
+          <span @click="addCooperation">{{i18n.t('common.save')}}</span>
         </template>
 
         <template v-else>
-          <span class="default" @click="unbind">{{lang==='en'?'Cancel collaborator':'取消协作'}}</span>
-          <span @click="addCooperation">{{lang==='en'?'Save':'保存'}}</span>
+          <span class="default" @click="unbind">{{ i18n.t('manage.cancleCollaborator') }}</span>
+          <span @click="addCooperation">{{ i18n.t('common.save') }}</span>
         </template>
       </div>
 
@@ -53,12 +53,13 @@
 import toastZH from '@/store/language/cn/toast'
 import toastEN from '@/store/language/en/toast'
 import temp from '../../page/navs/temp.vue'
-
+import { i18n } from '@/lang'
 export default {
   components: { temp },
   props: ['sceneNum', 'ids', 'cooName', 'visible', 'cooType'],
   data () {
     return {
+      i18n,
       lock: true,
       userName: '',
       auth: [],

pc/src/lang/en/modules/common.js

@@ -8,5 +8,7 @@ module.exports = {
     "save": "Save",
     "saveAndUse": "Save and Use",
     "search": "Search",
-    delete: "Delete"
+    "selectAll": "Select All",
+    "handle": "Actions",
+    "delete": "Delete"
 }

pc/src/lang/en/modules/conduct.js

@@ -2,7 +2,7 @@ module.exports = {
     "__name": "核心产品",
     "coreProduct": {
         "bannerTitle": "4DKanKan Pro",
-        bannerSubTitle: 'The first consumer 3D camera in the world',
+        "bannerSubTitle": "The first consumer 3D camera in the world",
         "itemTitle1": "Autonomous & Accurate Modeling，Automatic Distance Measurement",
         "itemTitle2": "720° Immersive Roaming with 8K Picture Quality",
         "itemTitle3": "HDR Mode Balances Light and Dark Area Exposure",
@@ -13,7 +13,7 @@ module.exports = {
     },
     "coreTech": {
         "bannerTitle": "Technology",
-        bannerSubTitle: "Bringing Digital Technologies to the Everyday Life of Common People",
+        "bannerSubTitle": "Bringing Digital Technologies to the Everyday Life of Common People",
         "itemTitle1": "Space Reconstruction",
         "itemText1": "[Automatically] & [Precisely] record and calculate camera locations, [Effectively] extract the 3D point cloud data of the real scene to obtain corresponding 3D point clouds and acquire information of the real-life environment.",
         "itemTitle2": "Space Interaction",
@@ -48,9 +48,9 @@ module.exports = {
         "itemTitle3": "Simultaneous Operation by Multi-user, Listening to Historical Stories",
         "itemTitle4": "Promote Social Science Education and Help Cultural Communication",
         "itemTitle5": "Showcases",
-        item5SubItem1Title: 'Hetjens- German Museum of Ceramics',
-        item5SubItem2Title: 'Liangjiahe Digital Museum',
-        item5SubItem3Title: 'The Archaeological Excavations at the Royal Cemetery of Haihunhou Kingdom in Han Dynasty'
+        "item5SubItem1Title": "Hetjens- German Museum of Ceramics",
+        "item5SubItem2Title": "Liangjiahe Digital Museum",
+        "item5SubItem3Title": "The Archaeological Excavations at the Royal Cemetery of Haihunhou Kingdom in Han Dynasty"
     },
     "conductShop": {
         "bannerTitle": "E-commerce<br/>Free Shopping<br/>without Any Limitations",

pc/src/lang/en/modules/home.js

@@ -35,7 +35,7 @@ module.exports = {
     "plate1Item4Desc3": "High Quality Stores Live Broadcast, Real-time Online Share Quality Products.",
     "plate1Item4Desc4": "Personal AI Assistant, Real-time Online Reply.",
     "plate1Item4Desc5": "Gather Customers Together Online, Boost Offline Economy Effectively.",
-    "plate1Item5SubTitle": `100% Reconstruct Post-disaster Site, Make "Paperless Evidence" Come True`,
+    "plate1Item5SubTitle": "100% Reconstruct Post-disaster Site, Make \"Paperless Evidence\" Come True",
     "plate1Item5Desc1": "Efficient Reconstruct Disaster Scenes，Create Comprehensive 3D Files",
     "plate1Item5Desc2": "Pre-collection is Available，Reduce the Claims Disputes",
     "plate2Item1": "Yongzheng Palace",

pc/src/lang/en/modules/manage.js

@@ -1,6 +1,28 @@
 module.exports = {
-  sceneAdmin: {
-    myScene: 'My Scene',
-    collaborativeScene: 'My Collaborative Scene'
-  }
+    "cancleCollaborator": "Delete Collaborator",
+    "sceneAdmin": {
+        "myScene": "My Scene",
+        "collaborativeScene": "My Collaborative Scene",
+        "thumb": "Cover",
+        "sceneName": "Title",
+        "snCode": "S/N",
+        "cooperationUserName": "Collaborator",
+        "viewCount": "viewer",
+        "sceneType": "Sort",
+        "createTime": "Time",
+        "collaborative": "Collaborate",
+        "canNotSelectTip": "This scene is being calculated or calculated incorrectly and cannot be checked."
+    },
+    "deviceAdmin": {
+        "addDevice": "Add",
+        "collaborative": "Collaborate",
+        "unbind": "Unbind",
+        "snCode": "S/N",
+        "useage": "Capacity Usage",
+        "type": "Capacity Package",
+        "expiredTime": "Expired Time",
+        "cooperationUserName": "Collaborator",
+        "sceneCount": "Scene Count",
+        "lastTime": "Last Shooting Time"
+    }
 }

pc/src/lang/zh/modules/manage.js

@@ -1,4 +1,5 @@
 module.exports = {
+  cancleCollaborator: '取消协作',
   sceneAdmin: {
     myScene: '我的场景',
     collaborativeScene: '协作场景',
@@ -9,7 +10,8 @@ module.exports = {
     viewCount: '浏览数量',
     sceneType: '分类',
     createTime: '拍摄时间',
-    collaborative: '协作'
+    collaborative: '协作',
+    canNotSelectTip: '该场景计算中或计算错误，无法进行勾选。'
   },
   deviceAdmin: {
     addDevice: '新增相机',

pc/src/page/manage/style.scss

@@ -136,7 +136,7 @@
   }
   .manage-body{
     min-height: 676px;
-    padding-top: 80px;
+    padding: 80px 0;
     background-color: #f4f4f6;
     .container {
       display: flex;

pc/src/page/manage/temp/device.vue

@@ -94,8 +94,10 @@
       </div>
       <div slot-scope="{data,type,canclick,item}" slot="item" style="width:100%">
         <template v-if="canclick">
-          <router-link class="edit" target="_blank" :to="{name:'introduce',params:{id:item.childName}}">{{langDevices.capacity}}</router-link>
-          <span class="edit" @click="handleCooperation(item)" v-if="item.status !== 0" >{{langDevices.fenpei}}</span>
+          <span class="table-btn">
+            <router-link class="edit" target="_blank" :to="{name:'introduce',params:{id:item.childName}}">{{langDevices.capacity}}</router-link>
+          </span>
+          <span class="edit table-btn" @click="handleCooperation(item)" v-if="item.status !== 0" >{{$t('manage.deviceAdmin.collaborative')}}</span>
 
         </template>
         <span v-else-if="type==='qingkuang'">{{item.usedSpaceStr}} / {{item.totalSpaceStr}}</span>
@@ -684,6 +686,12 @@ $font-color: #2d2d2d;
     width: calc(100% - 80px);
     margin: 30px auto;
     font-size: 14px;
+    .table-btn {
+      display: inline-block;
+      &:hover {
+        text-decoration: underline;
+      }
+    }
   }
   .scene-nothing{
     padding: 42px 0 150px 0;

pc/src/page/manage/temp/idevice.js

@@ -39,7 +39,8 @@ let device = [
     key: 'detail',
     name: i18n.t('common.handle'),
     en: i18n.t('common.handle'),
-    canclick: true
+    canclick: true,
+    width: 120,
   }
 ]
 

pc/src/page/manage/temp/iscene.js

@@ -37,7 +37,8 @@ let scene = [
     key: 'detail',
     name: i18n.t('common.handle'),
     en: i18n.t('common.handle'),
-    canclick: true
+    canclick: true,
+    width: 120,
   }
 ]
 

pc/src/page/manage/temp/scene.vue

@@ -96,8 +96,9 @@
       </div>
       <div slot-scope="{data,canclick,type,item}" slot="item" style="width:100%">
         <template v-if="canclick">
-          <span class="edit" v-if="item.status === 1||item.status===-2" @click="gotoEdit(item)">{{langScenes.edit}}</span>
-          <span class="edit" @click="handleCooperation(item)" v-if="(item.status === 1||item.status===-2)&&!deviceLogin&&tabActive===1" >{{ $t('manage.sceneAdmin.collaborative') }}</span>
+          <span class="edit table-btn" v-if="item.status === 1||item.status===-2" @click="gotoEdit(item)">{{langScenes.edit}}</span>
+          <span class="edit table-btn" @click="handleCooperation(item)" v-if="(item.status === 1||item.status===-2)&&!deviceLogin&&tabActive===1" >{{ $t('manage.sceneAdmin.collaborative') }}</span>
+          <span class="edit table-btn delete-btn" v-if="item.status !== 1&&item.status !== -2" @click="deleteOneScene(item)">{{ $t('common.delete') }}</span>
         </template>
         <div style="position:relative;" v-else-if="type === 'image'" >
           <div :title="item.name" @click="((item.status === 1||item.status===-2)&&item.payStatus !== -2) && goto(item.webSite)" style="height:40px;" class="card-img" :style="{backgroundImage: `url(${getSceneImg(item)})`}"></div>
@@ -328,10 +329,12 @@ export default {
         let nums = this.selectedArr.map(item => {
           return item.num
         })
-
         this.del(nums.join(','), true)
       }
     },
+    deleteOneScene (row) {
+      this.del(row.num, true)
+    },
     async handleCooperation (item) {
       this.$toast.showCooperation({
         num: item.num,
@@ -802,6 +805,15 @@ $font-color: #2d2d2d;
         background-size: auto 100%;
         background-repeat: no-repeat;
     }
+    .table-btn {
+      display: inline-block;
+      &:hover {
+        text-decoration: underline;
+      }
+    }
+    .delete-btn {
+      color: #f56c6c;
+    }
   }
 
   .scene-nothing {

pc/src/store/language/en/toast.js

@@ -42,7 +42,7 @@ export default{
   '41': 'Log in',
   '42': 'Downgrading process is currently not supported. You can renew or upgrade the package.',
   '43': 'Please bind this camera to a user account before expanding the storage.',
-  '44': 'Collaborator added!',
+  '44': 'Collaborator added',
   '45': 'Collaborator canceled.',
 
   '4007': 'User name doesn\'t exist.',