likang

config/index.js

@@ -1,3 +1,4 @@
+
 'use strict'
 // Template version: 1.3.1
 // see http://vuejs-templates.github.io/webpack for documentation.
@@ -12,7 +13,7 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/?s=kq_wx_api': {
-        target:'http://wxt.rltest.cn', // 你请求的第三方接口
+        target:'http://192.168.1.105', // 你请求的第三方接口
         changeOrigin:true, // 在本地会创建一个虚拟服务端，然后发送请求的数据，并同时接收请求的数据，这样服务端和服务端进行数据的交互就不会有跨域问题
         pathRewrite:{  // 路径重写，
           '^/?s=kq_wx_api': ''  // 替换target中的请求地址，也就是说以后你在请求http://api.douban.com/v2/XXXXX这个地址的时候直接写成/api即可。
@@ -21,7 +22,7 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: '192.168.1.201', // can be overwritten by process.env.HOST
+    host: '192.168.1.105', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     https:false,

src/global.js

@@ -1,6 +1,7 @@
+
 // const BASE_URL = 'https://wxt.rltest.cn/?s=smart_wx_api';
 // const BASE_URL = '//api.card.jskedejiaoyu.com/?s=smart_wx_api';
-const BASE_URL = 'http://127.0.0.1:8000/WxApi';
+const BASE_URL = 'http://127.0.0.1:80/wx';
 
  export default{
     BASE_URL

src/pages/kede/yys/alarms/add.vue

@@ -5,54 +5,98 @@
         
 
         <van-form @submit="onSubmit">
-            <van-field
-                v-model="formData.device_name"
-                name="device_name"
+            <van-field 
+                v-model="formData.plan_number"
+                name="plan_number"
                 label="计划编号"
                 placeholder="请输入计划编号"
                 clearable
-            />
-
-            <van-field
-                v-model="formData.device_name"
-                name="device_name"
-                label="计划名称"
-                placeholder="请输入计划名称"
-                clearable
                 required
+                disabled
             />
-            <van-field
-                v-model="formData.device_name"
-                name="device_name"
+              <van-field
+                v-model="formData.wind_name"
+                name="wind_name"
                 label="风场名称"
                 placeholder="请输入风场名称"
                 clearable
                 required
+                disabled
             />
+
             <van-field
-                v-model="formData.device_name"
-                name="device_name"
-                label="风场编号"
-                placeholder="请输入风场编号"
+                v-model="formData.plan_name"
+                name="plan_name"
+                label="计划名称"
+                placeholder="请输入计划名称"
                 clearable
                 required
             />
+             <van-field
+                v-model="formData.fan_model"
+                name="fan_model"
+                label="风机型号"
+                placeholder="请输入部件类型"
+                clearable
+                required
+                @click="showFanModel = true"
+            />
+            <van-popup v-model="showFanModel" position="bottom">
+                <van-picker
+                   
+                    value-key="name"
+                    show-toolbar
+                    :columns="fanModel"
+                    @confirm="onFanModelConfirm"
+                    @cancel="showFanModel = false"
+                />
+            </van-popup>
+           
+           
+     
             <van-field
-                v-model="formData.device_name"
-                name="device_name"
+                v-model="formData.parts_sign"
+                name="parts_sign"
                 label="部件类型"
                 placeholder="请输入部件类型"
                 clearable
                 required
+                @click="showPart = true"
             />
+             <van-popup v-model="showPart" position="bottom">
+                <van-picker
+                    value-key="name"
+                    name="parts_sign"
+                    show-toolbar
+                    :columns="Part"
+                    @confirm="onPartConfirm"
+                    @cancel="showPart = false"
+                />
+            </van-popup>
+
+
+
+
+
              <van-field
-                v-model="formData.device_name"
-                name="device_name"
+                v-model="formData.work_sign"
+                name="work_sign"
                 label="工作位置"
                 placeholder="请输入工作位置"
                 clearable
                 required
+                @click="showWorkPage"
             />
+             <van-popup v-model="showWork" position="bottom">
+                <van-picker
+                    value-key="name"
+                    name="work_sign"
+                    show-toolbar
+                    :columns="Work"
+                    @confirm="onWorkConfirm"
+                    @cancel="showWork = false"
+                />
+            </van-popup>
             <van-field
                 v-model="formData.device_name"
                 name="device_name"
@@ -118,14 +162,16 @@
 <script>
 import Vue from 'vue';
 import wx from 'weixin-js-sdk'
-import { Form,Field,Icon,NavBar,Dialog,Button } from 'vant';
+import { Form, Field, Icon, NavBar, Dialog, Button, Popup,Picker } from 'vant';
 
 Vue.use(Form);
 Vue.use(Field);
 Vue.use(Icon);
 Vue.use(NavBar);
 Vue.use(Dialog);
-Vue.use(Button);
+Vue.use(Button); 
+Vue.use(Popup);
+Vue.use(Picker);
 
 export default {
     data() {
@@ -134,13 +180,41 @@ export default {
             openid: '',
             
             formData:{
-                device_name: '',
+                plan_number: '',
+                plan_name: '',
+                wind_name: '',
+                fan_model: '',
+                parts_sign: '',
+                work_sign: '',
+                boit_type_sign: '',
+                bolt_num: '',
+                bias: '',
+                tighten_mode: '',
+                torque: '',
+                status: '',
+                info:'',
             },
             imei: '',
             username: '',
             user_no: '',
             userType: '',
             deviceType: '',
+
+            fanModel: [],
+            showFanModel: false,
+            fanModelObj: '',
+            //部件
+            Part:[],
+            showPart: false,
+            PartObj:'',
+            //工作位置
+            Work: [],
+            showWork: false,
+            WorkObj: '',
+          
+        
+
+            wind_id:'',
             rules: {
                 imei: [
                     { required: true, message: '请输入设备号' },
@@ -153,6 +227,8 @@ export default {
         this.deviceType = localStorage.getItem('deviceType');
         this.userid = localStorage.getItem('userid');
         this.openid = localStorage.getItem('openid');
+        this.initdata();
+       
     },
     methods: {
         /**
@@ -172,7 +248,7 @@ export default {
             if (values.user_no) {
                 postData.user_no = values.user_no;
             }
-            // console.log('onsubmit', values);
+           
             this.$http.post('userBindDevice&userid=' + this.userid + '&openid=' + this.openid, JSON.stringify(postData))
                 .then(resp => {
                     if (!resp.data.success) {
@@ -187,6 +263,114 @@ export default {
                     this.$router.replace('devices');
                 })
         },
+    
+        getSingleNumber() {
+          
+            this.$http.get("createPlanId?userid=" + this.userid + '&openid=' + this.openid).then((resp) => {
+
+                if (resp.data.code != 10000) {
+                    this.$notify(resp.data.message)
+                    return;
+                }
+                this.formData.plan_number = resp.data.data;  
+            });
+
+        },
+        //获取风机型号
+        getWindModel()
+        {
+            this.$http.get("getFanModelbyWindId?wind_id=" + this.wind_id + '&openid=' + this.openid).then((resp) => {
+
+                if (resp.data.code != 10000) {
+                    this.$notify(resp.data.message)
+                    return;
+                }
+                this.fanModel = resp.data.data;
+               
+            });
+
+
+        },
+
+        //提交风场型号
+        onPartConfirm(value)
+        {   
+            console.log(value);
+            this.PartObj = value;
+            this.formData.parts_sign = value.name;
+            this.getWork();
+            this.showPart = false;
+           
+        },
+
+
+        //提交上传部件
+        getPart() {
+            let query =
+                { type: 1 };
+    
+            this.$http.post("getParts?openid=" + this.openid, JSON.stringify(query)).then((resp) => {
+                if (resp.data.code != 10000) {
+                    this.$notify(resp.data.message)
+                    return;
+                }
+                this.Part = resp.data.data;
+              
+            });
+
+        },
+        //获取工作
+        getWork() {
+           
+            let query =
+                { type: 2,fan_model:this.fanModelObj.id,part:this.PartObj.id };
+
+            this.$http.post("getParts?openid=" + this.openid, JSON.stringify(query)).then((resp) => {
+                if (resp.data.code != 10000) {
+                    this.$notify(resp.data.message)
+                    return;
+                }
+                this.Work = resp.data.data;
+                
+            });
+
+        },
+        //确认工作位置
+        onWorkConfirm(value)
+        {
+            this.WorkObj = value;
+            this.formData.work_sign = value.name;
+            this.showWork = false;
+           
+
+        },
+        showWorkPage()
+        {
+            this.showWork = true
+        },
+
+
+        //提交风场型号
+        onFanModelConfirm(value) {
+            this.formData.fan_model = value.name;
+            this.fanModelObj = value;
+            this.showFanModel = false;
+            this.getWork();
+        },
+
+
+
+        //初始化数据
+        initdata()
+        {
+            this.getSingleNumber();
+            this.formData.wind_name = this.$route.query.wind_name;
+            this.wind_id = this.$route.query.wind_id; 
+            this.getWindModel();
+            this.getPart()
+
+        },
+
         /**
          * 扫码
          */

src/pages/kede/yys/alarms/detail.vue

@@ -65,9 +65,6 @@
     
     <van-form @submit="onSubmit">
      
-
-   
-
       <div style="margin: 16px">
         <van-button
           round

src/pages/kede/yys/devices/level1.vue

@@ -1,23 +1,18 @@
 <template>
   <div>
-    <!-- <van-nav-bar title="我的设备" left-text="返回" left-arrow @click-left="$router.replace('yys_more')" /> -->
-    <van-sticky>
-      <van-search v-model="keywords" show-action placeholder="请输入设备编号关键词搜索" @search="onSearch">
-        <template #action>
-          <div @click="onSearch">搜索</div>
-        </template>
-      </van-search>
-    </van-sticky>
+    <van-nav-bar title="设备一级类别"  />
+
 
     <van-pull-refresh v-model="refreshing" @refresh="onRefresh" style="padding-bottom: 1rem;">
       <template v-if="list.length">
         <van-list ref="deviceList" v-model="loading" :finished="finished" :error.sync="error" finished-text="没有更多了"
           error-text="请求失败，点击重新加载" @load="onLoad">
+       
           <van-cell v-for="item in list" :key="item.id" :title="item.imei" :value="'更多'"
             @click="showDetail(item.id)" size="large" is-link>
             <template #title>
               <span class="custom-title">{{item.depart_name}}</span>
-              <!-- <van-tag type="danger" v-if="item.alarm_state > 0">告警</van-tag> -->
+        
             </template>
           </van-cell>
         </van-list>
@@ -31,7 +26,7 @@
 
 <script type="text/babel">
 import Vue from 'vue';
-import { ActionSheet, Notify, NavBar, PullRefresh, Tag, Icon, Dialog, Empty, List, CellGroup, Cell, Search, Sticky } from 'vant';
+import { ActionSheet, Notify, NavBar, PullRefresh, Tag, Icon, Dialog, Empty, List, CellGroup, Cell, Search, Sticky, Collapse, CollapseItem } from 'vant';
 
 Vue.use(ActionSheet);
 Vue.use(NavBar);
@@ -46,6 +41,9 @@ Vue.use(Cell);
 Vue.use(Search);
 Vue.use(PullRefresh);
 Vue.use(Sticky);
+Vue.use(Collapse);
+Vue.use(CollapseItem);
+
 
 export default {
   data() {
@@ -65,6 +63,8 @@ export default {
       device_name: '', // 设备名称
       userid: null,
       openid: null,
+      //展开下拉框的名字
+      activeName:1,
       actions: [{
         name: '解除绑定',
         action: 'unbind',
@@ -93,33 +93,14 @@ export default {
         limit: this.limit,
         imei: this.keywords
       }
-      // this.$http.post('login&openid=' + openid, JSON.stringify(postData))
-      //   .then(resp => {
-
-      //   })
-      let resp = {
-        status: 200,
-        data: {
-          success: true, message: "获取成功", data: {
-            total: "311",
-            limit: 10,
-            page: 3,
-            list: [
-              { id: "371", "depart_name": "智能仓储" },
-              { id: "372", "depart_name": "液压工具" },
-              { id: "373", "depart_name": "特种吊具" },
-              { id: "374", "depart_name": "其他工具" },
-            ]
-          }
-        }
-      }
-
+     
 
-      // this.$http.post("/getDevices&userid=" + this.userid + '&openid=' + this.openid, JSON.stringify(params)).then(resp => {
+      this.$http.post("getCategory?userid=" + this.userid + '&openid=' + this.openid + '&pid=0', JSON.stringify(params)).then(resp => {
+       
       this.loading = false;
       this.refreshing = false;
 
-      if (resp.status !== 200 || !resp.data || !resp.data.success) {
+      if (resp.data.code != 10000 || !resp.data) {
         this.$notify(resp.data.message)
         return;
       }
@@ -130,21 +111,23 @@ export default {
       }
       this.page += 1;
 
-      // })
-      // .catch(resp => {
-      //   this.loading = false;
-      //   this.refreshing = false;
-      //   this.error = true;
-      // });
+      })
+      .catch(resp => {
+        this.loading = false;
+        this.refreshing = false;
+        this.error = true;
+      });
 
     },
     /**
      * 显示详情
      */
     showDetail(id) {
+      console.log(id);
       let query = {
         id: id
       }
+      
       this.$router.push({ path: "/yys_dev_level2", query: query });
     },
     /**

src/pages/kede/yys/devices/level2.vue

@@ -1,13 +1,13 @@
 <template>
   <div>
-    <!-- <van-nav-bar title="我的设备" left-text="返回" left-arrow @click-left="$router.replace('yys_more')" /> -->
-    <van-sticky>
+    <van-nav-bar title="设备二级类别" left-text="返回" left-arrow @click-left="$router.replace('yys_dev_level1')" />
+    <!-- <van-sticky>
       <van-search v-model="keywords" show-action placeholder="请输入设备编号关键词搜索" @search="onSearch">
         <template #action>
           <div @click="onSearch">搜索</div>
         </template>
       </van-search>
-    </van-sticky>
+    </van-sticky> -->
 
     <van-pull-refresh v-model="refreshing" @refresh="onRefresh" style="padding-bottom: 1rem;">
       <template v-if="list.length">
@@ -65,6 +65,7 @@ export default {
       device_name: '', // 设备名称
       userid: null,
       openid: null,
+      equ_type:'',
       actions: [{
         name: '解除绑定',
         action: 'unbind',
@@ -79,7 +80,6 @@ export default {
   created() {
     this.userid = localStorage.getItem("yysUserid");
     this.openid = localStorage.getItem("openid");
-
     this.onRefresh();
   },
   methods: {
@@ -87,63 +87,47 @@ export default {
      * 获取设备列表
      */
     onLoad() {
-
+      this.equ_type = this.$route.query.id;
+    
       let params = {
         page: this.page,
         limit: this.limit,
         imei: this.keywords
       }
-      // this.$http.post('login&openid=' + openid, JSON.stringify(postData))
-      //   .then(resp => {
-
-      //   })
-      let resp = {
-        status: 200,
-        data: {
-          success: true, message: "获取成功", data: {
-            total: "311",
-            limit: 10,
-            page: 3,
-            list: [
-              { id: "1", "depart_name": "液压泵" },
-              { id: "2", "depart_name": "中控液压扳手" },
-              { id: "3", "depart_name": "液压扳手" },
-              { id: "4", "depart_name": "机舱吊具" },
-            ]
-          }
-        }
-      }
-
+   
+      this.$http.post("getCategory?userid=" + this.userid + '&openid=' + this.openid + '&pid=' + this.equ_type, JSON.stringify(params)).then(resp => {
 
-      // this.$http.post("/getDevices&userid=" + this.userid + '&openid=' + this.openid, JSON.stringify(params)).then(resp => {
-      this.loading = false;
-      this.refreshing = false;
+        this.loading = false;
+        this.refreshing = false;
 
-      if (resp.status !== 200 || !resp.data || !resp.data.success) {
-        this.$notify(resp.data.message)
-        return;
-      }
+        if (resp.data.code != 10000 || !resp.data) {
+          this.$notify(resp.data.message)
+          return;
+        }
 
-      this.list = resp.data.data.list;
-      if (this.list.length >= resp.data.data.total) {
-        this.finished = true;
-      }
-      this.page += 1;
+        this.list = resp.data.data.list;
+        if (this.list.length >= resp.data.data.total) {
+          this.finished = true;
+        }
+        this.page += 1;
 
-      // })
-      // .catch(resp => {
-      //   this.loading = false;
-      //   this.refreshing = false;
-      //   this.error = true;
-      // });
+      })
+        .catch(resp => {
+          this.loading = false;
+          this.refreshing = false;
+          this.error = true;
+        });
 
     },
+
     /**
      * 显示详情
      */
     showDetail(id) {
+
       let query = {
-        id: id
+        id: id,
+        eq_type: this.$route.query.id
       }
       this.$router.push({ path: "/yys_devices", query: query });
     },

src/pages/kede/yys/location.vue

@@ -36,11 +36,11 @@
             <div class="panel-second-row">
                 <div class="second-row-left">
                     <div class="row-left-layout">
-                        <span style="font-size: 20px;font-weight: 600;">{{selectDevice.loc_mode}}</span>
+                        <span style="font-size: 10px;font-weight: 600;">{{selectDevice.loc_mode}}</span>
                         <span style="color:darkgray">设备型号</span>
                     </div>
                     <div class="row-left-layout">
-                        <span style="font-size:20px;font-weight:600">{{selectDevice.state}}   </span>
+                        <span style="font-size:10px;font-weight:600">{{selectDevice.state}}   </span>
                         <span style="color:darkgray">设备状态</span>
                     </div>
                 </div>
@@ -54,7 +54,7 @@
                     /> -->
                     <div class="right-number" >
                         <p>名称：{{selectDevice.device_name}}</p>
-                        <p>IMEI：{{selectDevice.imei}}</p>
+                        <p>出厂编号：{{selectDevice.factory_number}}</p>
                     </div>
                     
                 </div>
@@ -64,7 +64,7 @@
                 {{selectDevice.address}}
             </div>
             <div class="route-search-button" style="position:relative">
-                <router-link :to="'yys_route_search/'+ selectDevice.imei" class="voice-device-item">
+                <router-link :to="'yys_route_search/'+ selectDevice.factory_number" class="voice-device-item">
                     <van-button type="info" icon="search" size="small" round  style="width:3rem" >历史定位</van-button>
                 </router-link>
                 <van-button @click.native="refreshSingle"  plain type="info" icon="replay" size="mini" style="font-size:12px;position:absolute;right:0.5rem;top:0.1rem"></van-button>
@@ -106,13 +106,13 @@ export default {
                 this.$toast('地图初始化失败，请刷新重试');
                 return;
             }
-
             that.getLastPositon();
         }).catch((err) => {
             this.$toast('地图数据初始化出错，请刷新重试');
             console.log(err);
             return;
         });
+        // that.getPositioning();
     },
     data(){
         return {
@@ -210,8 +210,8 @@ export default {
             let markerData = this.selectDevice;
             let that =this;
             
-            this.$http.get("/getLastPositionSingle&imei=" + markerData.imei).then(res => {
-                    if(!res.data.success){
+            this.$http.get("getLastPositionSingle?id=" + markerData.id +'&openid=' + this.openid).then(res => {
+                    if(res.data.code!=10000){
                         that.$dialog.toast({
                             mes: res.data.message,
                             timeout: 3000
@@ -282,6 +282,7 @@ export default {
 
             return new Promise((resolve, reject) => {
                 try {
+                   
                     var map = new AMap.Map('route-map', {
                         zoom:15,//级别
                         center: [119.5,32.9],//中心点坐标
@@ -289,13 +290,54 @@ export default {
                         // mapStyle: 'amap://styles/light',
                         showBuildingBlock: true
                     });
+                    
                     AMap.plugin([
                         'AMap.ToolBar',
                         'AMap.Scale',
                         'AMap.MapType',
                         'AMap.Geocoder',
+                        'AMap.Geolocation'
                         // 'AMap.MarkerCluster',
-                    ], function(){
+                    ], function () {
+                       let geolocation = new AMap.Geolocation({
+                            enableHighAccuracy: true,
+                            // 设置定位超时时间，默认：无穷大
+                            timeout: 10000,
+                            // 定位按钮的停靠位置的偏移量，默认：Pixel(10, 20)
+                            buttonOffset: new AMap.Pixel(10, 20),
+                            //  定位成功后调整地图视野范围使定位位置及精度范围视野内可见，默认：false
+                            zoomToAccuracy: true,
+                           panToLocation: true,
+                            noIpLocate:0,
+                            //  定位按钮的排放位置,  RB表示右下
+                            buttonPosition: 'RB'
+                       });
+                        map.addControl(geolocation);
+                        geolocation.getCurrentPosition()
+                        console.log(AMap.Event);
+                        AMap.Event.addListener(geolocation, 'complete', onComplete);
+                        AMap.Event.addListener(geolocation, 'error', onError);
+                        function onComplete(data) {
+                            // data是具体的定位信息
+                            console.log(data)
+                            if (data.position) {
+                                that.saveLocationInfo(data.position);
+                            } else {
+                                that.$notify({
+                                    type: 'warning',
+                                    message: '获取定位失败',
+                                });
+                            }
+                        }
+                        function onError(data) {
+                            // 定位出错
+                            that.$notify({
+                                type: 'warning',
+                                message: '获取定位失败',
+                            });
+                        }
+                   
+                        
                         // 在图面添加工具条控件，工具条控件集成了缩放、平移、定位等功能按钮在内的组合控件
                         map.addControl(new AMap.ToolBar({position: 'RT', offset: [15, 50]}));
                         // 在图面添加比例尺控件，展示地图在当前层级和纬度下的比例尺
@@ -306,6 +348,7 @@ export default {
 
                     });
 
+
                     that.infoWindow = new AMap.InfoWindow({
                         isCustom: true,  //使用自定义窗体
                         content: '',
@@ -325,6 +368,12 @@ export default {
                 }
             });
         },
+        //保存个人定位信息
+        saveLocationInfo(data)
+        {
+            localStorage.setItem('position',data);
+
+        },
         /**
          * 获取围栏数据
          */
@@ -464,20 +513,10 @@ export default {
          */
         getLastPositon(){
             let that = this;
-             let res={
-                status:200,
-                data:{
-                    success:true,
-                    message:"获取成功",
-                    data:[
-                        {"imei":"869678041008494","device_name":"测试液压泵1","device_type":"0","state":"使用中","loc_mode":"M1","loc_ploy":"1","online_time":"1655943942","longitude":"119.201478","latitude":"30.191538","wifi_online_time":"1662004623","wifi_longitude":"119.200662","wifi_latitude":"30.191734","alarm_state":"1","isAlarm":"1","time":"1662004623","lat":30.186001,"lng":120.194101,"awayTime":"4小时","date_time":"2022-09-01 11:57:03"},
-                        {"imei":"869678041006811","device_name":"测试液压泵3","device_type":"0","state":"待检","loc_mode":"M1","loc_ploy":"1","online_time":"1655943941","longitude":"120.21201","latitude":"30.2084","wifi_online_time":"1655950726","wifi_longitude":"120.200644","wifi_latitude":"30.191814","alarm_state":"0","isAlarm":"0","time":"1655950726","lat":30.185682,"lng":120.194083,"awayTime":"2月","date_time":"2022-06-23 10:18:46"}
-                    ]
-                }
-            }
             
-            // this.$http.get("/getDevicePositionList&userid="+this.userid+'&openid='+this.openid ).then(res => {
-                    if(!res.data.success){
+            
+            this.$http.get("getHydList?userid="+this.userid+'&openid='+this.openid ).then(res => {
+                    if(res.data.code!=10000){
                         that.$toast(res.data.message || '获取设备数据失败');
                         return;
                     }
@@ -558,10 +597,10 @@ export default {
 
 
 
-                // })
-                // .catch(res => {
-                //     console.log(res);
-                // });
+                })
+                .catch(res => {
+                    console.log(res);
+                });
 
         }
 
@@ -613,7 +652,9 @@ export default {
     align-items: flex-end;
 }
 .second-row-left{
+
     display: flex;
+ 
 }
 .right-number{
     box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);

src/pages/kede/yys/login.vue

@@ -68,33 +68,59 @@ export default {
          */
         onSubmit(values) {
             let yysUserid = localStorage.getItem('yysUserid');
-            let openid ='2222222';
-            // let openid = this.getOpenid();
+           
+            let openid = this.getOpenid();
             
-            // if (!openid) {
-            //     Dialog.confirm({
-            //         title: '提醒',
-            //         message: '未授权，请关闭当前页面，重新进入并授权。',
-            //         showCancelButton: false,
-            //     })
-            //     return;
-            // }
+            if (!openid) {
+                Dialog.confirm({
+                    title: '提醒',
+                    message: '未授权，请关闭当前页面，重新进入并授权。',
+                    showCancelButton: false,
+                })
+                return;
+            }
 
             let postData = {
                 username: values.username,
                 password: values.password,
             }
            
-            let resp={
-                data:{
-                    data:{id:232,realname:"yycs",avator:"",phone:'15706857065'},
-                    message:'登录成功',
-                    success:true
-                }
-            }
-             let data = resp.data.data || {};
-            //临时处理的
+            // let resp={
+            //     data:{
+            //         data:{id:232,realname:"yycs",avator:"",phone:'15706857065'},
+            //         message:'登录成功',
+            //         success:true
+            //     }
+            // }
+            //  let data = resp.data.data || {};
+            // //临时处理的
+                    
+
+            //         localStorage.setItem('yysUserid', data.id);
+            //         localStorage.setItem('yysUserinfo', JSON.stringify(data));
+                    
+            //         this.$notify({ 
+            //             type: 'success',
+            //             message: resp.data.message || '登录成功',
+            //         });
+            //         // 跳转首页
+            //         this.$nextTick(() => {
+            //           this.$router.push('/yys');
+            //         })
+            
+            this.$http.post('login?openid=' + openid, JSON.stringify(postData)).then(resp => {
+               
+                    if (!(resp.data.code==10000)) {
+                        this.$notify(resp.data.message || '登录失败');
+                        return;
+                    }
+
+                    let data = resp.data.data || {};
                     
+                    if (!data.id) {
+                        this.$notify('获取用户信息失败');
+                        return;
+                    }
 
                     localStorage.setItem('yysUserid', data.id);
                     localStorage.setItem('yysUserinfo', JSON.stringify(data));
@@ -107,43 +133,22 @@ export default {
                     this.$nextTick(() => {
                       this.$router.push('/yys');
                     })
-        //     this.$http.post('yysLogin&openid='+openid, JSON.stringify(postData)) .then(resp => {
-        //             if (!resp.data.success) {
-        //                 this.$notify(resp.data.message || '登录失败');
-        //                 return;
-        //             }
-
-        //             let data = resp.data.data || {};
-                    
-        //             if (!data.id) {
-        //                 this.$notify('获取用户信息失败');
-        //                 return;
-        //             }
-
-        //             localStorage.setItem('yysUserid', data.id);
-        //             localStorage.setItem('yysUserinfo', JSON.stringify(data));
-                    
-        //             this.$notify({ 
-        //                 type: 'success',
-        //                 message: resp.data.message || '登录成功',
-        //             });
-        //             // 跳转首页
-        //             this.$nextTick(() => {
-        //               this.$router.push('/yys');
-        //             })
-        //         }).catch(err =>{
-        //             console.error(err);
-        //         })
+                }).catch(err =>{
+                    console.error(err);
+                })
         },
         /**
          * 获取openid
          */
         getOpenid() {
-            let openid = localStorage.getItem('openid') ;
+           let openid = localStorage.getItem('openid');
+            
             if (openid) {
                 return openid;
             }
-            openid = this.$route.query.openid || '';
+            
+           // openid = this.$route.query.openid || '';
+            openid = '2222222';
             if (openid) {
                 localStorage.setItem('openid', openid); 
             }

src/pages/kede/yys/more.vue

@@ -19,7 +19,7 @@
                     </van-col>
                     <van-col span="14">
                         <div class="user-info">
-                            <p>昵称：{{userinfo.realname || '用户'+ userinfo.phone}}</p>
+                            <p>昵称：{{userinfo.username}}</p>
                             <p>手机：{{userinfo.phone}}</p>
                         </div>
                     </van-col>
@@ -36,12 +36,12 @@
                             <span class="custom-title">设备管理</span>
                         </template>
                     </van-cell>
-                    <!-- <van-cell is-link icon="live" to="courses">
+                     <!-- <van-cell is-link icon="live" to="courses">
                         <template #title>
-                            <span class="custom-title">研学课程</span>
+                            <span class="custom-title">风场管理</span>
                         </template>
-                    </van-cell>
-                    <van-cell is-link icon="friends" to="activities">
+                    </van-cell> -->
+                    <!--<van-cell is-link icon="friends" to="activities">
                         <template #title>
                             <span class="custom-title">研学活动</span>
                         </template>
@@ -59,14 +59,6 @@
                 </van-cell-group>
                 
                 <div class="padding-top-20"></div>
-                <!-- <van-cell-group >
-                    <van-cell is-link icon="info">
-                        <template #title>
-                            <span class="custom-title">关于</span>
-                        </template>
-                    </van-cell>
-                </van-cell-group> -->
-
                 
                 <div style="margin: 26px;">
                     <van-button  block round type="danger" size="small" @click="logout">退出登录</van-button>

src/pages/kede/yys/routes/play.vue

@@ -1,8 +1,8 @@
 <template>
-  
+
   <div>
     <van-nav-bar :title="imei" left-text="返回" left-arrow @click-left="$router.back()" />
- 
+
     <div id="route-map">  </div>
 
     <div class="type-bar">
@@ -64,7 +64,7 @@ Vue.use(Loading);
 
 
 
-export default { 
+export default {
     components: {
       VueSlider
     },
@@ -85,13 +85,15 @@ export default {
         loadinTimer: null,
         pathList: [],
         routeList: [],
-        currentPt: null
+        currentPt: null,
+        openid:"",
       }
     },
 
     mounted(){
       let that = this;
       this.imei = this.$route.params.imei;
+      this.openid = localStorage.getItem('openid');
       let PathClass =  new Promise((resolve, reject) => {
           AMapUI.load(['ui/misc/PathSimplifier'], function(PathSimplifier) {
 
@@ -106,7 +108,7 @@ export default {
 
             //启动页面
             // initPage(PathSimplifier);
-            
+
           });
       });
 
@@ -117,8 +119,8 @@ export default {
         console.log('init err', err)
       });
 
-      
-      
+
+
     },
 
 
@@ -151,7 +153,8 @@ export default {
         requestRoute(studentId){
             let that = this;
             let startTime = this.$route.params.startTime;
-            let endTime =this.$route.params.endTime;
+            let endTime = this.$route.params.endTime;
+          let factoryNumber = this.$route.params.factoryNumber;
             if(!startTime ||  !endTime){
                 this.$dialog.toast({
                     mes: '请返回选择起止时间',
@@ -160,14 +163,16 @@ export default {
                 return;
             }
 
-            this.$http.get("/getSationRoutes&startTime=" + startTime + "&endTime=" + endTime + "&studentId=" + studentId).then(res => {
-                    
-                    if(!res.data.success || res.data.data.length == 0){
+          this.$http.get("getDeviceHistory?startTime=" + startTime + "&endTime=" + endTime + "&factoryNumber=" + factoryNumber + "&openid=" + this.openid).then(res => {
+
+                    if(res.data.code!=10000 || res.data.data.length == 0){
                         that.routeList = [];
-                        that.pathList = [];
+                      that.pathList = [];
+                     
                         return;
                     }
-                    
+            
+                  
                     let resList=  res.data.data;
                     let pathList = [];
                     resList.forEach( (item, index) => {
@@ -184,18 +189,18 @@ export default {
 
 
 
-                    
+
                 })
                 .catch(res => {
                     console.log(res);
-                });     
+                });
         },
 
         requestGpsRoute(){
             let that = this;
             let startTime = this.$route.params.startTime;
             let endTime =this.$route.params.endTime;
-
+          let factoryNumber = this.$route.params.factoryNumber;
             if(!startTime ||  !endTime){
                 this.$dialog.toast({
                     mes: '请返回选择起止时间',
@@ -204,14 +209,14 @@ export default {
                 return;
             }
 
-            this.$http.get("/getGpsRoutes&startTime=" + startTime + "&endTime=" + endTime + "&imei=" + this.imei).then(res => {
-                    
-                    if(!res.data.success || res.data.data.length == 0){
+          this.$http.get("getDeviceHistory?startTime=" + startTime + "&endTime=" + endTime + "&factoryNumber=" + factoryNumber + "&openid=" +this.openid).then(res => {
+
+                    if(res.data.code!=10000 || res.data.data.length == 0){
                         that.routeList = [];
                         that.pathList = [];
                         return;
                     }
-                    
+           
                     let resList=  res.data.data;
                     let pathList = [];
                     resList.forEach( (item, index) => {
@@ -228,11 +233,11 @@ export default {
                     that.currentPt = resList[0];
 
                     this.initRoute();
-                    
+
                 })
                 .catch(res => {
                     console.log(res);
-                });     
+                });
         },
 
 
@@ -284,7 +289,7 @@ export default {
 
               // 在图面添加比例尺控件，展示地图在当前层级和纬度下的比例尺
               map.addControl(new AMap.Scale({position: 'LB'}));
-          
+
               // // 在图面添加类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
               // map.addControl(new AMap.MapType());
 
@@ -311,12 +316,12 @@ export default {
           })
 
 
-          
 
-          
 
-          
-          
+
+
+
+
       },
 
       initRoute(){
@@ -342,7 +347,7 @@ export default {
             getHoverTitle: function(pathData, pathIndex, pointIndex) {
 
                 if (pointIndex >= 0) {
-                    //point 
+                    //point
                     return pathData.name + '，点：' + pointIndex + '/' + pathData.path.length;
                 }
 
@@ -372,8 +377,8 @@ export default {
 
         that.navgtr.on('move', function(e){
           let idx = e.target.cursor.idx, tail = e.target.cursor.tail, progressBarIndex;
-          
-          // progressBarIndex = parseInt(idx / that.pathList.length * 100) + parseInt(tail * 10); 
+
+          // progressBarIndex = parseInt(idx / that.pathList.length * 100) + parseInt(tail * 10);
 
           that.value = idx;
           that.currentPt = that.routeList[idx];
@@ -409,8 +414,8 @@ export default {
           that.value = 0;
           that.navgtr.start(0)
         }
-        
-        
+
+
 
 
 
@@ -452,7 +457,7 @@ export default {
   width: 100%;
   opacity: 0.85;
   /* box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1) */
-  
+
 }
 
 .type-bar{
@@ -565,4 +570,4 @@ export default {
     border-radius: 10px 10px 0 0;
     padding: 10px;
 }
-</style>
+</style>

src/pages/kede/yys/routes/search.vue

@@ -1,7 +1,8 @@
+
 <template>
     <div style="background:white;">
 
-        <van-nav-bar :title="imei" left-text="返回" left-arrow @click-left="$router.back()" />
+        <van-nav-bar :title="factoryNumber" left-text="返回" left-arrow @click-left="$router.back()" />
 
         <yd-cell-item arrow>
             <span slot="left">开始日期：</span>
@@ -43,8 +44,10 @@ import {NavBar} from 'vant';
 Vue.use(NavBar);
 
 export default {
-    created(){
-        this.imei = this.$route.params.imei;
+    created() {
+      
+        //出厂编号
+        this.factoryNumber = this.$route.params.imei;
 
         let dateTime = new Date()
         this.startDate = dateTime.getFullYear() + '-' + (dateTime.getMonth() + 1) + '-' + dateTime.getDate();
@@ -60,7 +63,8 @@ export default {
             startTime: '00:00',
             endDate: '',
             endTime: '23:59',
-            imei:''
+            factoryNumber: '',
+           
         }
     },
     methods:{
@@ -68,8 +72,8 @@ export default {
             let that = this;
             let startTime = this.startDate +' '+  this.startTime + ':00';
             let endTime = this.endDate  +' '+  this.endTime + ':59';
-            
-            this.$router.push({name:'yys_route_play',params:{imei:this.imei, startTime: startTime, endTime: endTime}});
+            console.log(this.factoryNumber);
+            this.$router.push({ name: 'yys_route_play', params: { factoryNumber: this.factoryNumber, startTime: startTime, endTime: endTime}});
     
         },
         dateTimeChange(e){

src/pages/yys/login.vue

@@ -88,13 +88,14 @@ export default {
         password: password,
         openid: this.openid,
       }
-      this.$http.post('yysLogin', JSON.stringify(formData))
-                .then(resp => {
-                  if (!resp.data.success) {
+      this.$http.post('wx/login', JSON.stringify(formData))
+        .then(resp => {
+            
+                  if (!(resp.data.code==10000)) {
                     this.$notify({ message: resp.data.message });
                     return;
                   }
-                  localStorage.setItem('userid', resp.data.data)
+                  localStorage.setItem('userid', resp.data.data.id)
                   localStorage.setItem('username', username)
                   this.$notify({ type: 'success', message: resp.data.message });
                   this.$router.push({path: '/yys'})