Forráskód Böngészése

下载订单添加相机SN码

tangning 3 éve
szülő
commit
3ddc0e0918
2 módosított fájl, 10 hozzáadás és 12 törlés
  1. 8 12
      src/page/appupload/index.vue
  2. 2 0
      src/page/oderPage/index.vue

+ 8 - 12
src/page/appupload/index.vue

@@ -73,9 +73,9 @@
       <div v-else class="order-management-body">
         <div class="order-management-inner">
           <div class="base-info">
-            <span>关键词:</span>
-            <el-input style="width:220px;" @keyup.enter.native="currentPage=1&&_getCameraData()" v-model="searchKey" placeholder="关键词"></el-input>
-            <el-button type="primary" @click="currentPage=1&&_getCameraData()" color='red'>搜索</el-button>
+            <span>代理商标识:</span>
+            <el-input style="width:220px;"  v-model="searchKey" placeholder="代理商标识"></el-input>
+            <el-button type="primary" @click="()=>{currentPage=1;_getCameraData()}" color='red'>搜索</el-button>
             <el-button icon="el-icon-plus" type="primary" style="float: right;" @click="showadd" color='red'>新增</el-button>
           </div>
         </div>
@@ -89,6 +89,9 @@
                   </template>
               </el-table-column>
               <el-table-column prop="fileServerType" label="上传服务器">
+                <template slot-scope="scope">
+                  <span>{{scope.row.fileServerType=='s3'?'亚马逊':'阿里云'}}</span>
+                </template>
               </el-table-column>
               <el-table-column prop="agent" label="代理商标识">
               </el-table-column>
@@ -289,6 +292,7 @@ export default {
         })
     },
     async _getCameraData () {
+      
       this.fullscreenLoading = true
       if (!Number(this.currentPage)) this.currentPage = 1
       let res = await this.$http.post('/manager/app/list', {
@@ -299,16 +303,8 @@ export default {
       this.fullscreenLoading = false
       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')
-            : '/'
-        }
         this.cameras = temp
-        this.total = res.data.total ? res.data.total : this.total
+        this.total = res.data.total ? res.data.total : 0
       }
     },
     async chenkMd5 (value,callback) {

+ 2 - 0
src/page/oderPage/index.vue

@@ -42,6 +42,8 @@
               </el-table-column>
               <el-table-column prop="userName" label="手机号/用户名">
               </el-table-column>
+              <el-table-column v-if="routeName == '下载订单'" prop="snCode" label="相机SN">
+              </el-table-column>
               <el-table-column v-if="routeName == '下载订单'" prop="sceneName" label="场景下载">
                 <template slot-scope="scope">
                   <div>{{scope.row.sceneName}}({{scope.row.sceneNum}})</div>