Bladeren bron

feat:增加封存场景的分配协作限制

xzh 4 jaren geleden
bovenliggende
commit
d954030bac

+ 1 - 1
pc/package.json

@@ -12,7 +12,7 @@
     "e2e": "node test/e2e/runner.js",
     "test": "npm run unit && npm run e2e",
     "lint": "eslint --ext .js,.vue src test/unit test/e2e/specs",
-    "build": "node build/build.js",
+    "build:zh": "node build/build.js",
     "build:en": "node build/build.en.js",
     "preview": "http-server ../ -p 3030"
   },

+ 3 - 0
pc/src/components/table/index.vue

@@ -72,6 +72,9 @@ export default {
           return this.$toast.show('warn', this.$t('manage.sceneAdmin.canNotSelectTip'))
         }
       }
+      if (item.payStatus === -2) {
+        return this.$toast.show('warn', this.$t('manage.sceneAdmin.canNotSelectTip'))
+      }
       item.hasAuth = !item.hasAuth
       this.$set(this.fixdata, i, item)
       this.lock = true

+ 2 - 1
pc/src/lang/en/modules/manage.js

@@ -11,7 +11,8 @@ module.exports = {
         "sceneType": "Sort",
         "createTime": "Time",
         "collaborative": "Collaborate",
-        "canNotSelectTip": "This scene is being calculated or calculated incorrectly and cannot be checked."
+        "canNotSelectTip": "This scene is being calculated or calculated incorrectly and cannot be checked.",
+        archived: "Archived"
     },
     "deviceAdmin": {
         "addDevice": "Add",

+ 2 - 1
pc/src/lang/zh/modules/manage.js

@@ -11,7 +11,8 @@ module.exports = {
     sceneType: '分类',
     createTime: '拍摄时间',
     collaborative: '协作',
-    canNotSelectTip: '该场景计算中或计算错误,无法进行勾选。'
+    canNotSelectTip: '该场景计算中或计算错误,无法进行勾选。',
+    archived: '已封存'
   },
   deviceAdmin: {
     addDevice: '新增相机',

+ 12 - 10
pc/src/page/manage/temp/scene.vue

@@ -51,7 +51,7 @@
               <div class="loading-icon" style="width:100%">
                 <p style="font-weight:bold;" v-html="langScenes.limit.insufficient"></p>
               </div>
-              <p class="huifu" @click.stop="rechargeTip(item)">{{langScenes.limit.recharge}}</p>
+              <p class="huifu" @click.stop="rechargeTip(item)">{{langScenes.limit.recharge}}>></p>
             </div>
           </div>
           <div class="name" >
@@ -62,8 +62,8 @@
                   <span class="spot"></span>
                 </div>
                 <ul :style="{minWidth: language==='en'?'150px': '90px'}">
-                  <li v-if="item.status === 1||item.status===-2" @click="gotoEdit(item)">{{langScenes.edit}}</li>
-                  <li @click="handleCooperation(item)" v-if="(item.status === 1||item.status===-2)&&!deviceLogin">{{langScenes.fenpei}}</li>
+                  <li v-if="item.status === 1||item.status===-2 && item.payStatus !== -2" @click="gotoEdit(item)">{{langScenes.edit}}</li>
+                  <li @click="handleCooperation(item)" v-if="(item.status === 1||item.status===-2)&&!deviceLogin && item.payStatus !== -2">{{langScenes.fenpei}}</li>
                   <li v-if="item.status !== 0" @click="del(item)">{{langScenes.delete}}</li>
                 </ul>
               </template>
@@ -96,17 +96,19 @@
       </div>
       <div slot-scope="{data,canclick,type,item}" slot="item" style="width:100%">
         <template v-if="canclick">
-          <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>
+          <span class="edit table-btn" v-if="item.status === 1||item.status===-2 && item.payStatus !== -2" @click="gotoEdit(item)">{{langScenes.edit}}</span>
+          <span class="edit table-btn" @click="handleCooperation(item)" v-if="(item.status === 1||item.status===-2 && item.payStatus !== -2)&&!deviceLogin&&tabActive===1" >{{ $t('manage.sceneAdmin.collaborative') }}</span>
+          <span class="edit table-btn" v-if="item.payStatus === -2" @click="rechargeTip(item)">{{langScenes.limit.recharge}}</span>
+          <span class="edit table-btn delete-btn" v-if="item.status !== 1&&item.status !== -2 || item.payStatus === -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>
-          <div class="loading-hover" v-if="item.status === 0">
-              <div class="loading-icon" style="width:100%">
-                <p style="margin-top:0">{{langScenes.share.calcule}}</p>
-              </div>
+          <div class="loading-hover" v-if="item.status === 0 || item.payStatus === -2">
+            <div class="loading-icon" style="width:100%">
+              <p style="margin-top:0">{{item.payStatus === -2 ? $t('manage.sceneAdmin.archived') : langScenes.share.calcule}}</p>
             </div>
+          </div>
+
         </div>
 
         <span v-else-if="type === 'typefix'">{{langScenes.typeObj[data]}}</span>

+ 1 - 1
pc/src/store/language/cn/manage.js

@@ -158,7 +158,7 @@ export default{
     },
     limit: {
       insufficient: '云端容量不足<br/>场景已封存',
-      recharge: '恢复>>',
+      recharge: '恢复',
       expand: '扩容'
     }
   },

+ 1 - 1
pc/src/store/language/en/manage.js

@@ -159,7 +159,7 @@ export default{
     },
     limit: {
       insufficient: 'Insufficient cloud storage<br/>The scene is archived.',
-      recharge: 'Recover>>',
+      recharge: 'Recover',
       expand: 'To expand'
     }
   },