Bladeren bron

adm:feat > 扫楼日志查看,扫楼报告接口字段替换

shaun-sheep 4 jaren geleden
bovenliggende
commit
661b5d60bb
3 gewijzigde bestanden met toevoegingen van 20 en 21 verwijderingen
  1. 1 2
      src/api/scan/request.js
  2. 7 7
      src/views/data_admin/buildAssets/report.vue
  3. 12 12
      src/views/data_admin/buildLog/index.vue

+ 1 - 2
src/api/scan/request.js

@@ -2052,10 +2052,9 @@ export function groupCreRelaZoneAndISp(param, success) {
   http.postJson(url, param.data, success)
 }
 
-// <<<<<<< HEAD
 //扫楼作业-扫楼日志查看
 export function queryUserLog(param, success) {
-  let url = `${baseUrl}/scanbuilding-2/user-log/query`;
+  let url = `${baseUrl}${scan}/user-log/query`;
   http.postJson(url, param, success)
 }
 

+ 7 - 7
src/views/data_admin/buildAssets/report.vue

@@ -1,17 +1,17 @@
 <template>
   <div class="saga-report">
     <section class="saga-report-section">
-      <el-row :gutter="20"  v-for="(item,index) in errorReport" :key="item.Id" style="margin-bottom: 10px">
+      <el-row :gutter="20"  v-for="(item,index) in errorReport" :key="item.id" style="margin-bottom: 10px">
           <el-col :span="12">
-            <h3>{{index +1}}.{{item.Name}}</h3>
-            <div class="problem-description">{{item.Note}}</div>
-            <h5>问题创建人:{{item.Author}}</h5>
+            <h3>{{index +1}}.{{item.name}}</h3>
+            <div class="problem-description">{{item.note}}</div>
+            <h5>问题创建人:{{item.author}}</h5>
           </el-col>
-          <el-col :span="12" v-show="item.Pic" v-for="pic in item.Pic" :key="pic.Key">
+          <el-col :span="12" v-show="item.pic" v-for="pic in item.pic" :key="pic.key">
             <h4 style="font-size: 14px">现场照片</h4>
             <el-image
-              :src="`/image-service/common/image_get?systemId=dataPlatform&key=${pic.Key}`"
-              style="width:100%;height: 300px" :alt="item.Name"
+              :src="`/image-service/common/image_get?systemId=dataPlatform&key=${pic.key}`"
+              style="width:100%;height: 300px" :alt="item.name"
               :fit="fill"></el-image>
           </el-col>
       </el-row>

+ 12 - 12
src/views/data_admin/buildLog/index.vue

@@ -175,16 +175,16 @@ export default {
       //     console.dirxml(err)
       //   })
       let param = {
-        Filters: `CreateTime>='${this.dateValue[0]} 00:00:00';CreateTime<='${this.dateValue[1]} 23:59:59'`,
-        PageNumber: pageNum,
-        PageSize: 1000
+        filters: `createTime>='${this.dateValue[0]} 00:00:00';createTime<='${this.dateValue[1]} 23:59:59'`,
+        pageNumber: pageNum,
+        pageSize: 1000
       }
       if (this.searchValue) {
-        param.Filters += `;Name contain '${this.searchValue}' or Phone contain '${this.searchValue}' or Action contain '${this.searchValue}' or Note contain '${this.searchValue}' or UserId contain '${this.searchValue}'`
+        param.filters += `;name contain '${this.searchValue}' or phone contain '${this.searchValue}' or action contain '${this.searchValue}' or note contain '${this.searchValue}' or userId contain '${this.searchValue}'`
       }
       queryUserLog(param, res => {
-        this.exportData = this.exportData.concat(res.Content);
-        if (res.Total / (res.PageSize * res.PageNumber) > 1) {
+        this.exportData = this.exportData.concat(res.content);
+        if (res.total / (res.pageSize * res.pageNumber) > 1) {
           this.downExcel(pageNum++)
         } else {
           let time = +new Date()
@@ -208,17 +208,17 @@ export default {
     },
     getLogData() {
       let param = {
-        Filters: `CreateTime>='${this.dateValue[0]} 00:00:00';CreateTime<='${this.dateValue[1]} 23:59:59'`,
-        PageNumber: this.page.pageNumber,
-        PageSize: this.page.pageSize
+        filters: `createTime>='${this.dateValue[0]} 00:00:00';createTime<='${this.dateValue[1]} 23:59:59'`,
+        pageNumber: this.page.pageNumber,
+        pageSize: this.page.pageSize
       }
       if (this.searchValue) {
-        param.Filters += `;Name contain '${this.searchValue}' or Phone contain '${this.searchValue}' or Action contain '${this.searchValue}' or Note contain '${this.searchValue}' or UserId contain '${this.searchValue}'`
+        param.filters += `;name contain '${this.searchValue}' or phone contain '${this.searchValue}' or action contain '${this.searchValue}' or note contain '${this.searchValue}' or userId contain '${this.searchValue}'`
       }
       queryUserLog(param, res => {
         this.loading = false
-        this.page.total = res.Total
-        this.tableData = res.Content
+        this.page.total = res.total
+        this.tableData = res.content
       })
     },
     init() {