Merge branch 'master' of http://192.168.0.115:3000/4dScene/webSite into master

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

@@ -22,88 +22,98 @@
         </div>
       </div>
     </div>
-    <div class="d-con" v-if="isImgType||tabActive===0">
-      <div class="edit-item item" @click="addDevice">
-        <div class="plus-con">
-          <div class="iconplus">
-            <span></span>
-            <span></span>
+
+    <template v-if="total">
+      <div class="d-con" v-if="isImgType||tabActive===0">
+        <div class="edit-item item" @click="addDevice">
+          <div class="plus-con">
+            <div class="iconplus">
+              <span></span>
+              <span></span>
+            </div>
+            <p>{{langDevices.add}}</p>
           </div>
-          <p>{{langDevices.add}}</p>
         </div>
-      </div>
 
-      <template v-if="!loading" >
-        <div class="d-item item" :style="{padding:language==='en'?'10px 16px':'10px 24px 10px 30px'}" v-for="(item,i) in mydevice.list" :key="i">
-          <template v-if="tabActive===4">
-            <div v-if="item.isExpire&&(item.usedSpace<=item.totalSpace)" class="tag expire">{{langDevices.jijiang}}</div>
-            <div v-if="item.usedSpace>item.totalSpace" class="tag full">{{langDevices.rongliang}}</div>
-          </template>
-          <div class="i-left" :style="{marginTop:tabActive===4?'15px':'25px'}">
+        <template v-if="!loading" >
+          <div class="d-item item" :style="{padding:language==='en'?'10px 16px':'10px 24px 10px 30px'}" v-for="(item,i) in mydevice.list" :key="i">
             <template v-if="tabActive===4">
-              <p class="d-id" :title="item.snCode||(item.childName&&item.childName.replace('4DKKPRO_',''))||'--'">S/N: {{item.snCode||(item.childName&&item.childName.replace('4DKKPRO_',''))||'--'}} </p>
-              <p class="p-sub" style="padding-left: 26px;" :title="`${item.usedSpaceStr} / ${item.totalSpaceStr}`">
-                <img :src="`${$cdn}images/icon-cloud.png`" alt="">
-                {{item.usedSpaceStr}} / {{item.totalSpaceStr}}
-              </p>
-              <div class="capacity">
-                <div class="c-line">
-                  <div class="active" :style="{width:getBar(item.usedSpace,item.totalSpace),background:getColor(item.usedSpace,item.totalSpace)}"></div>
+              <div v-if="item.isExpire&&(item.usedSpace<=item.totalSpace)" class="tag expire">{{langDevices.jijiang}}</div>
+              <div v-if="item.usedSpace>item.totalSpace" class="tag full">{{langDevices.rongliang}}</div>
+            </template>
+            <div class="i-left" :style="{marginTop:tabActive===4?'15px':'25px'}">
+              <template v-if="tabActive===4">
+                <p class="d-id" :title="item.snCode||(item.childName&&item.childName.replace('4DKKPRO_',''))||'--'">S/N: {{item.snCode||(item.childName&&item.childName.replace('4DKKPRO_',''))||'--'}} </p>
+                <p class="p-sub" style="padding-left: 26px;" :title="`${item.usedSpaceStr} / ${item.totalSpaceStr}`">
+                  <img :src="`${$cdn}images/icon-cloud.png`" alt="">
+                  {{item.usedSpaceStr}} / {{item.totalSpaceStr}}
+                </p>
+                <div class="capacity">
+                  <div class="c-line">
+                    <div class="active" :style="{width:getBar(item.usedSpace,item.totalSpace),background:getColor(item.usedSpace,item.totalSpace)}"></div>
+                  </div>
                 </div>
-              </div>
-              <p class="p-sub">{{langDevices.expand}}{{item.spaceStr||'--'}}</p>
-              <p class="p-sub">{{langDevices.expire}}{{item.spaceEndStr||'--'}}</p>
-              <p class="p-sub" :title="item.cooperationUserName" v-if="item.cooperationUserName">{{langDevices.xiezuo}}{{item.cooperationUserName||'--'}}</p>
+                <p class="p-sub">{{langDevices.expand}}{{item.spaceStr||'--'}}</p>
+                <p class="p-sub">{{langDevices.expire}}{{item.spaceEndStr||'--'}}</p>
+                <p class="p-sub" :title="item.cooperationUserName" v-if="item.cooperationUserName">{{langDevices.xiezuo}}{{item.cooperationUserName||'--'}}</p>
 
-              <div class="oper-con">
-                <div class="oper">
-                  <div>
-                    <span class="spot"></span>
+                <div class="oper-con">
+                  <div class="oper">
+                    <div>
+                      <span class="spot"></span>
+                    </div>
+                    <ul :style="{minWidth: language==='en'?'150px': '90px'}">
+                      <li @click="$router.push({name:'introduce',params:{id:item.childName}})">
+                        {{langDevices.capacity}}
+                      </li>
+                      <li @click="unbind(item)">{{langDevices.unbind}}</li>
+                      <li v-if="item.status !== 0" @click="handleCooperation(item)">{{langDevices.fenpei}}</li>
+                    </ul>
                   </div>
-                  <ul :style="{minWidth: language==='en'?'150px': '90px'}">
-                    <li @click="$router.push({name:'introduce',params:{id:item.childName}})">
-                      {{langDevices.capacity}}
-                    </li>
-                    <li @click="unbind(item)">{{langDevices.unbind}}</li>
-                    <li v-if="item.status !== 0" @click="handleCooperation(item)">{{langDevices.fenpei}}</li>
-                  </ul>
                 </div>
-              </div>
-            </template>
-            <template v-else>
-              <p class="d-id">ID: {{item.childName}}</p>
-              <p class="p-sub">剩余点数：{{item.balance}}</p>
-              <div class="d-edit" :class="{'dtow-edit':tabActive!==4}">
-              <router-link class="primary" :to="{name:'introtow',params:{id:item.childName}}"><span>{{langDevices.recharge}}</span></router-link>
-              <div>
-                  <span @click="unbind(item)">{{langDevices.unbind}}</span>
-              </div>
-              </div>
-            </template>
-          </div>
-          <div class="i-right">
-            <img @click="gotoScene(item)" :src="tabActive===4?`${$cdn}images/banner_pro.png`:`${$cdn}images/t_product.png`" alt="">
+              </template>
+              <template v-else>
+                <p class="d-id">ID: {{item.childName}}</p>
+                <p class="p-sub">剩余点数：{{item.balance}}</p>
+                <div class="d-edit" :class="{'dtow-edit':tabActive!==4}">
+                <router-link class="primary" :to="{name:'introtow',params:{id:item.childName}}"><span>{{langDevices.recharge}}</span></router-link>
+                <div>
+                    <span @click="unbind(item)">{{langDevices.unbind}}</span>
+                </div>
+                </div>
+              </template>
+            </div>
+            <div class="i-right">
+              <img @click="gotoScene(item)" :src="tabActive===4?`${$cdn}images/banner_pro.png`:`${$cdn}images/t_product.png`" alt="">
+            </div>
           </div>
+        </template>
+      </div>
+
+      <tableList v-else @selection-change="data=>{selectedArr=data}" :header='tabHeader' :showLine='true' :selection='true' :data='mydevice.list' class="table-list" >
+        <div slot-scope="{data}" slot="header">
+          {{language==='en'?data.en:data.name}}
         </div>
-      </template>
-    </div>
+        <div slot-scope="{data,type,canclick,item}" slot="item" style="width:100%">
+          <template v-if="canclick">
+            <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>
 
-    <tableList v-else @selection-change="data=>{selectedArr=data}" :header='tabHeader' :showLine='true' :selection='true' :data='mydevice.list' class="table-list" >
-      <div slot-scope="{data}" slot="header">
-        {{language==='en'?data.en:data.name}}
-      </div>
-      <div slot-scope="{data,type,canclick,item}" slot="item" style="width:100%">
-        <template v-if="canclick">
-          <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>
+          <span v-else>{{data||'-'}}</span>
+        </div>
+      </tableList>
+
+    </template>
+
+    <div class="scene-nothing" v-else>
+      <img :src="`${$cdn}images/nothing.png`" />
+      <div>{{langDevices.norecord}}</div>
+    </div>
 
-        </template>
-        <span v-else-if="type==='qingkuang'">{{item.usedSpaceStr}} / {{item.totalSpaceStr}}</span>
-        <span v-else>{{data||'-'}}</span>
-      </div>
-    </tableList>
     <div class="paging" v-if="total">
       <Paging @clickHandle="pageChange" :current="currentPage" :total="total" :equable="pageSize" />
     </div>