likang

src/views/tag_history/detail.vue

@@ -8,6 +8,12 @@
           <el-table-column prop="time" label="标签上报时间" align="center"></el-table-column>
           <el-table-column prop="addTime" label="上报时间" align="center" min-width="160"></el-table-column>
           <el-table-column prop="rssi" label="心跳" align="center" min-width="160"></el-table-column>
+           <el-table-column prop="move" label="动静" align="center" min-width="160">
+            <template slot-scope="scope">
+                <p v-if="scope.row.move==0">静</p>
+                <p v-else>动</p>
+            </template>
+           </el-table-column>
 
         </el-table>
         <el-pagination background class="pagination-container" @size-change="handleSizeChange"

src/views/tag_history/index.vue

@@ -125,6 +125,18 @@
         sortable
         :show-overflow-tooltip="true"
       />
+        <el-table-column
+        prop="move"
+        label="动静"
+        align="center"
+        sortable
+        :show-overflow-tooltip="true"
+      >
+      <template slot-scope="scope">
+         <p v-if="scope.row.move==0">静</p>
+         <p v-else>动</p>
+      </template>
+      </el-table-column>
   
       <el-table-column
         label="操作"

src/views/tag_report/detail.vue

@@ -8,7 +8,7 @@
           <div style="margin-bottom: 30px; margin-left: 50px">
             <el-col :span="24" style="margin-top: 10px; font-size: 14px; color: #a0a0a0">
               <div class="detail-item">
-                <span>基站mac地址 ：    </span>
+                <span>基站mac地址 ： </span>
                 <span class="item">{{ data.mac }}</span>
               </div>
               <div class="detail-item">
@@ -17,25 +17,22 @@
               </div>
               <div class="detail-item">
                 <span>距离 :</span>
-                <span class="item">{{ data.meter }}米</span>
+                <span class="item">{{ data.meter }}米 {{data.data}}</span>
               </div>
             </el-col>
-            
+
           </div>
         </el-row>
         <el-row>
 
 
-        <baseLineChart>
-        
-        </baseLineChart>
-        
+          <baseLineChart :options="options">
+
+          </baseLineChart>
+
 
 
 
-        
-        
-        
         </el-row>
 
       </el-tab-pane>
@@ -142,9 +139,10 @@ export default {
   data() {
     return {
       drawer: false,
+      init:'',
       direction: "rtl",
       activeName: "first",
-       options: {},
+      options: {},
       xData: [],
       chartData: [], // 扭矩数据
       pressData: [], // 压力数据
@@ -157,13 +155,7 @@ export default {
 
   },
    created() {
-        // 初始查询日期
-        var start = new Date(new Date().toLocaleDateString());
-        var end = new Date(new Date().toLocaleDateString());
-        start.setTime(end.getTime() - 3600 * 1000 * 24 * 30);
-        this.timepart = [start, end]
-        // 获取配置
-        // this.getDeviceInfo()
+      
   },
   methods: {
      /**
@@ -210,6 +202,22 @@ export default {
         refresh(){
             this.getData(this.assetNo)
             this.getDeviceInfo()
+    },
+        /**
+         * @Descripttion: 转换json数据
+         */
+        changJsonToObj()
+        {
+          let list = null;
+          let x = [];
+          let y = [];
+          list = JSON.parse(this.data.data)
+          list.forEach((element,index,arr) => {
+             arr[index] =  element.time
+            
+          });
+          
+          
         },
         /**
          * 图表配置
@@ -283,12 +291,7 @@ export default {
       },
     handleClick(tab, event) {
       console.log(tab.name);
-      if(tab.name=='second')
-      {
-        this.initData();
       
-        
-      }
     },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex === 1) {
@@ -302,12 +305,15 @@ export default {
   computed: {
     drawerVisible: {
       set(val) {
+     
         this.$emit("sendVal", val); // 表示将子组件改变的值传递给父组件
       },
       get() {
-        //   if(this.detailVisible){
-        //    this.initData()
-        // }
+       
+        if (this.detailVisible) {
+         
+            this.changJsonToObj();
+          }
         return this.detailVisible; // 表示获取父组件的值
       },
     },