Merge pull request 'pc-master' (#249) from pc-master into portal

Reviewed-on: #249

src/api/index.js

@@ -94,6 +94,38 @@ function sendPostRequest(url, data) {
   });
 }
 
+function sendPostParamsRequest(url, data) {
+  // 一个状态为resolve（包裹的是数据）
+  // 或者状态为reject （包裹的是错误信息）
+  // 的promise对象
+  return new Promise(function (resolve, reject) {
+    axios.post(url,null, {
+      headers: { //头部参数
+        // `Content-Type`: `application/json; charset=utf-8`,
+        // `Access-Control-Allow-Origin`: `*`,
+        // `Access-Control-Allow-Headers`: `Origin, X-Requested-With, Content-Type, Accept`,
+        "token": (localStorage.getItem(`token`) ? localStorage.getItem(`token`) : ``)
+      },
+      params: data
+    }).then(
+      (res) => {
+        if (res.data.code == 401) {
+          localStorage.removeItem(`token`)
+          if(router.currentRoute.name!=`login`){
+            router.push({
+              name: `login`
+            })
+          }
+        }
+        resolve(res);
+      },
+      (err) => {
+        reject(err);
+      }
+    );
+  });
+}
+
 function sendDelRequest(url, data) {
   // 一个状态为resolve（包裹的是数据）
   // 或者状态为reject （包裹的是错误信息）
@@ -153,8 +185,38 @@ function sendPutRequest(url, data) {
     );
   });
 }
+// 虫情接口
+// function sendPostCQRequest(url, data) {
+//   // 一个状态为resolve（包裹的是数据）
+//   // 或者状态为reject （包裹的是错误信息）
+//   // 的promise对象
+//   return new Promise(function (resolve, reject) {
+//     axios.post(url, data, {
+//       headers: {
+//         // `Content-Type`: `application/json; charset=utf-8`,
+//         "token": (localStorage.getItem(`CQtoken`) ? localStorage.getItem(`CQtoken`) : ``)
+//       }
+//     }).then(
+//       (res) => {
+//         if (res.data.code == 401) {
+//           localStorage.removeItem(`token`)
+//           if(router.currentRoute.name!=`login`){
+//             router.push({
+//               name: `login`
+//             })
+//           }
+//         }
+//         resolve(res);
+//       },
+//       (err) => {
+//         reject(err);
+//       }
+//     );
+//   });
+// }
+
 //总接口域名
-// axios.defaults.baseURL = `/jiaxing`;
+axios.defaults.baseURL = `/api`;
 axios.defaults.timeout = 30000; // 设置全局默认请求超时时间为10秒
 
 
@@ -163,520 +225,520 @@ axios.defaults.timeout = 30000; // 设置全局默认请求超时时间为10秒
 export default {
   //防止没有一个post/get会报错 写一个默认的
   get(data) {
-    return sendGetRequest(`/jiaxing`, data);
+    return sendGetRequest(``, data);
   },
   post(data) {
-    return sendPostRequest(`/jiaxing`, data);
+    return sendPostRequest(``, data);
   },
   delete(data) {
-    return sendDelRequest(`/jiaxing`, data);
+    return sendDelRequest(``, data);
   },
 
   put(data) {
-    return sendPutRequest(`/jiaxing`, data);
+    return sendPutRequest(``, data);
   },
 
 
   //接口开始()
   //登录
   login(data) {
-    return sendPostRequest(`/jiaxing/user/login`, data);
+    return sendPostRequest(`/user/login`, data);
   },
   loginOut(data) {
-    return sendGetRequest(`/jiaxing/user/logout`, data);
+    return sendGetRequest(`/user/logout`, data);
   },
 
   //管理员根据设备id查询设备信息
   getSeldevicebyid(data) {
-    return sendGetRequest(`/jiaxing/admin/seldevicebyid`, data);
+    return sendGetRequest(`/admin/seldevicebyid`, data);
   },
   //根据用户id查询对应的设备数据
   getEqbyid(data) {
-    return sendGetRequest(`/jiaxing/sel/eqbyid/` + data, ``);
+    return sendGetRequest(`/sel/eqbyid/` + data, ``);
   },
 //气象站显示
 geteqetdata(data) {
-  return sendGetRequest(`/jiaxing/getcontrol/geteqetdata?userId=`+data ,``)
+  return sendGetRequest(`/getcontrol/geteqetdata?userId=`+data ,``)
 },
 // 数据采集器的实时数据
 getdataRtdata(data) {
-  return sendGetRequest(`/jiaxing/getdata/rtdata?deviceId=` + data, ``)
+  return sendGetRequest(`/getdata/rtdata?deviceId=` + data, ``)
 },
   //测试施肥机读取设备状态信息  //读取数据 根据文档编号读取 所有数据展示都出自这个接口
   postReg(data) {
-    return sendPostRequest(`/jiaxing/readFs/reg`, data);
+    return sendPostRequest(`/readFs/reg`, data);
   },
   //测试施肥机读取设备状态信息  //读取数据 根据文档编号读取 所有数据展示都出自这个接口
   postState(data) {
-    return sendPostRequest(`/jiaxing/readFs/state`, data);
+    return sendPostRequest(`/readFs/state`, data);
   },
   //测试施肥机写入数据信息 //修改数据 根据文档编号修改 所有数据修改都出自这个接口
   postWriteFs(data) {
-    return sendPostRequest(`/jiaxing/writeFs`, data);
+    return sendPostRequest(`/writeFs`, data);
   },
   getByid(data) {
-    return sendGetRequest(`/jiaxing/readFs/byid`, data);
+    return sendGetRequest(`/readFs/byid`, data);
   },
   //获取实时数据
   postRtdata(data) {
-    return sendPostRequest(`/jiaxing/getFs/rtdata?equipmentId=` + data, ``);
+    return sendPostRequest(`/getFs/rtdata?equipmentId=` + data, ``);
   },
   //获取实时数据
   postFsdata(data) {
-    return sendPostRequest(`/jiaxing/chart/fsdata?equipmentId=` + data, ``);
+    return sendPostRequest(`/chart/fsdata?equipmentId=` + data, ``);
   },
   //获取监控地址
   getGethls(data) {
-    return sendGetRequest(`/jiaxing/camera/gethls`, data);
+    return sendGetRequest(`/camera/gethls`, data);
   },
   //根据ID查询用户信息
   getUser(data) {
-    return sendGetRequest(`/jiaxing/api/sel/user`, data)
+    return sendGetRequest(`/api/sel/user`, data)
   },
 
 
   //控制器接口
   //控制器实时数据
   getControlRtdata(data) {
-    return sendPostRequest(`/jiaxing/getcontrol/rtdata?equipmentId=` + data, ``);
+    return sendPostRequest(`/getcontrol/rtdata?equipmentId=` + data, ``);
   },
   //控制器实时数据折线图
   getControlFsdata(data) {
-    return sendPostRequest(`/jiaxing/getcontrol/fsdata?equipmentId=` + data, ``);
+    return sendPostRequest(`/getcontrol/fsdata?equipmentId=` + data, ``);
   },
   //控制器数据上传数据获取
   getControldataUpload(data) {
-    return sendGetRequest(`/jiaxing/readControl/dataUpload`, data)
+    return sendGetRequest(`/readControl/dataUpload`, data)
   },
   //控制器写入数据
   postControlWrite(data) {
-    return sendPostRequest(`/jiaxing/writeJinHuaControl/write`, data);
+    return sendPostRequest(`/writeJinHuaControl/write`, data);
   },
   //控制器传感器通道
   getReadControlSensorChannel(data) {
-    return sendGetRequest(`/jiaxing/readControl/sensorChannel`, data)
+    return sendGetRequest(`/readControl/sensorChannel`, data)
   },
   //控制器 顶模和风机
   getReadControlliShuiControl(data) {
-    return sendGetRequest(`/jiaxing/readControl/liShuiControl`, data)
+    return sendGetRequest(`/readControl/liShuiControl`, data)
   },
   //控制器 传感器输入合成
   getReadControlSensorInputSynthesis(data) {
-    return sendGetRequest(`/jiaxing/readControl/sensorInputSynthesis`, data)
+    return sendGetRequest(`/readControl/sensorInputSynthesis`, data)
   },
   //控制器 主页查看控制器气象站实时数据
   getControlRtDatastation(data) {
-    return sendGetRequest(`/jiaxing/getcontrol/rtDatastation`, data)
+    return sendGetRequest(`/getcontrol/rtDatastation`, data)
   },
   //控制器 设备运行状态
   getControlGetState(data) {
-    return sendGetRequest(`/jiaxing/readControl/getState`, data)
+    return sendGetRequest(`/readControl/getState`, data)
   },
   //控制器  气象站实时数据折线图
   getControlChartdata(data) {
-    return sendPostRequest(`/jiaxing/equip/chartdata?equipmentId=` + data, ``)
+    return sendPostRequest(`/equip/chartdata?equipmentId=` + data, ``)
   },
   //首页历史数据/数据分析弹窗
   selFsAvgdata(data) {
-    return sendPostRequest(`/jiaxing/selFs/avgdata`,data)
+    return sendPostRequest(`/selFs/avgdata`,data)
   },
   //首页历史数据/数据分析弹窗下载数据
   selFsAvgdatadownload(data) {
-    return sendPostRequest(`/jiaxing/selFs/avgdatadownload`,data)
+    return sendPostRequest(`/selFs/avgdatadownload`,data)
   },
   
 
 
   // 根据用户id查询对应的设备大数据信息
   Bigdata_getAllControl(userid, data) {
-    return sendGetRequest(`/jiaxing/Bigdata/getAllControl?userid=${userid}`, data);
+    return sendGetRequest(`/Bigdata/getAllControl?userid=${userid}`, data);
   },
 
   // 获取设备当天的温度
   Bigdata_getTemperature(deviceid, data) {
-    return sendGetRequest(`/jiaxing/Bigdata/getTemperature?deviceid=${deviceid}`, data);
+    return sendGetRequest(`/Bigdata/getTemperature?deviceid=${deviceid}`, data);
   },
 
   // 获取设备一周的温度
   Bigdata_getWeekTemperature(deviceid, data) {
-    return sendGetRequest(`/jiaxing/Bigdata/getWeekTemperature?deviceid=${deviceid}`, data);
+    return sendGetRequest(`/Bigdata/getWeekTemperature?deviceid=${deviceid}`, data);
   },
 
   // 主页查看控制器实时数据
   getcontrol_rtdata(equipmentId, data) {
-    return sendPostRequest(`/jiaxing/getcontrol/rtdata?equipmentId=${equipmentId}`, data);
+    return sendPostRequest(`/getcontrol/rtdata?equipmentId=${equipmentId}`, data);
   },
 
   // 获取摄像头得地址 Copy
   camera_gethls(cameraid, channelid, data) {
-    return sendGetRequest(`/jiaxing/camera/gethls?cameraid=${cameraid}&channelid=${channelid}`, data);
+    return sendGetRequest(`/camera/gethls?cameraid=${cameraid}&channelid=${channelid}`, data);
   },
 
   // 根据用户id查询对应的设备数据 Copy
   sel_eqbyid(userId, data) {
-    return sendGetRequest(`/jiaxing/sel/eqbyid/${userId}`, data);
+    return sendGetRequest(`/sel/eqbyid/${userId}`, data);
   },
 
   // 控制器状态值获取 Copy
   readControl_getState(deviceId, data) {
-    return sendGetRequest(`/jiaxing/readControl/getState?deviceId=${deviceId}`, data);
+    return sendGetRequest(`/readControl/getState?deviceId=${deviceId}`, data);
   },
 
   getcontrol_rtDatastation(equipmentId, data) {
-    return sendGetRequest(`/jiaxing/getcontrol/rtDatastation?equipmentId=${equipmentId}`, data)
+    return sendGetRequest(`/getcontrol/rtDatastation?equipmentId=${equipmentId}`, data)
   },
   //控制器根据设备查看权限
   getcontrol_cpermission(equipmentId, data) {
-    return sendPostRequest(`/jiaxing/getcontrol/cpermission?deviceId=${equipmentId}`, data)
+    return sendPostRequest(`/getcontrol/cpermission?deviceId=${equipmentId}`, data)
   },
   //控制器五防接口
   readControl_fiveControl(data) {
-    return sendGetRequest(`/jiaxing/readControl/fiveControl`, data);
+    return sendGetRequest(`/readControl/fiveControl`, data);
   },
 
   // 查看用户额外权限
   user_getjurisdiction(userId, data) {
-    return sendGetRequest(`/jiaxing/user/getjurisdiction?userId=${userId}`, data)
+    return sendGetRequest(`/user/getjurisdiction?userId=${userId}`, data)
   },
 
 
   //实时数据页面状态值(查看全部设备)
   getStatePermissionStatus(data) {
-    return sendGetRequest(`/jiaxing/getcontrol/getStatePermissionStatus`, data)
+    return sendGetRequest(`/getcontrol/getStatePermissionStatus`, data)
   },
   //获取当前权限能看到的设备
   getPermissionStatus(data) {
-    return sendGetRequest(`/jiaxing/getcontrol/getPermissionStatus`, data)
+    return sendGetRequest(`/getcontrol/getPermissionStatus`, data)
   },
   //根据id删除status设备
   delPermissionStatus(id1, id2) {
-    return sendPostRequest(`/jiaxing/getcontrol/delPermissionStatus?deviceId=${id1}&permissionid=${id2}`, ``)
+    return sendPostRequest(`/getcontrol/delPermissionStatus?deviceId=${id1}&permissionid=${id2}`, ``)
   },
   //根据id添加status设备
   addPermissionStatus(id1, id2) {
-    return sendPostRequest(`/jiaxing/getcontrol/addStatepermission?deviceId=${id1}&Permissionid=${id2}`, ``)
+    return sendPostRequest(`/getcontrol/addStatepermission?deviceId=${id1}&Permissionid=${id2}`, ``)
   },
 
   //添加短信报警
   addWarnMessage(data) {
-    return sendPostRequest(`/jiaxing/shortMessage/setMessage`, data)
+    return sendPostRequest(`/shortMessage/setMessage`, data)
   },
   //短信报警填写条件
   selnowmes(data) {
-    return sendGetRequest(`/jiaxing/shortMessage/selnowmes`, data)
+    return sendGetRequest(`/shortMessage/selnowmes`, data)
   },
   //根据设备id查看短信报警
   messageList(data) {
-    return sendGetRequest(`/jiaxing/shortMessage/selMesById`, data)
+    return sendGetRequest(`/shortMessage/selMesById`, data)
   },
 
   //根据id删除短信报警
   delMessage(data) {
-    return sendDelRequest(`/jiaxing/shortMessage/delmesbyid`, data)
+    return sendDelRequest(`/shortMessage/delmesbyid`, data)
   },
   //控制器新页面接口
   //目标值 目标温度/湿度/co2
   targetValue(data) {
-    return sendGetRequest(`/jiaxing/readControl/targetValue`, data)
+    return sendGetRequest(`/readControl/targetValue`, data)
   },
   //电磁阀1
   solenoidValve1(data) {
-    return sendGetRequest(`/jiaxing/readControl/solenoidValve1`, data)
+    return sendGetRequest(`/readControl/solenoidValve1`, data)
   },
   //电磁阀2
   solenoidValve2(data) {
-    return sendGetRequest(`/jiaxing/readControl/solenoidValve2`, data)
+    return sendGetRequest(`/readControl/solenoidValve2`, data)
   },
   //电磁阀3
   solenoidValve3(data) {
-    return sendGetRequest(`/jiaxing/readControl/solenoidValve3`, data)
+    return sendGetRequest(`/readControl/solenoidValve3`, data)
   },
   //电磁阀4
   solenoidValve4(data) {
-    return sendGetRequest(`/jiaxing/readControl/solenoidValve4`, data)
+    return sendGetRequest(`/readControl/solenoidValve4`, data)
   },
   //电磁阀5
   solenoidValve5(data) {
-    return sendGetRequest(`/jiaxing/readControl/solenoidValve5`, data)
+    return sendGetRequest(`/readControl/solenoidValve5`, data)
   },
   //电磁阀6
   solenoidValve6(data) {
-    return sendGetRequest(`/jiaxing/readControl/solenoidValve6`, data)
+    return sendGetRequest(`/readControl/solenoidValve6`, data)
   },
   //电磁阀7
   solenoidValve7(data) {
-    return sendGetRequest(`/jiaxing/readControl/solenoidValve7`, data)
+    return sendGetRequest(`/readControl/solenoidValve7`, data)
   },
   //电磁阀8
   solenoidValve8(data) {
-    return sendGetRequest(`/jiaxing/readControl/solenoidValve8`, data)
+    return sendGetRequest(`/readControl/solenoidValve8`, data)
   },
   //强制通道输出
   forceChannelOutput(data) {
-    return sendGetRequest(`/jiaxing/readControl/forceChannelOutput`, data)
+    return sendGetRequest(`/readControl/forceChannelOutput`, data)
   },
     //天窗
     readskylight(data) {
-      return sendGetRequest(`/jiaxing/readControl/readskylight`, data)
+      return sendGetRequest(`/readControl/readskylight`, data)
     },
     //空调
     airconditioner(data) {
-      return sendGetRequest(`/jiaxing/readControl/airconditioner`, data)
+      return sendGetRequest(`/readControl/airconditioner`, data)
     },
     
   //固有参数
   intrinsicParameter(data) {
-    return sendGetRequest(`/jiaxing/readControl/intrinsicParameter`, data)
+    return sendGetRequest(`/readControl/intrinsicParameter`, data)
   },
 //厂家内部参数
 manufacturerparameter(data) {
-  return sendGetRequest(`/jiaxing/readControl/manufacturerparameter`, data)
+  return sendGetRequest(`/readControl/manufacturerparameter`, data)
 },
 //高压微雾
 highpressuremist(data) {
-  return sendGetRequest(`/jiaxing/readControl/highpressuremist`, data)
+  return sendGetRequest(`/readControl/highpressuremist`, data)
 },
 //内遮阳
 innercurtain(data) {
-  return sendGetRequest(`/jiaxing/readControl/innercurtain`, data)
+  return sendGetRequest(`/readControl/innercurtain`, data)
 },
 //外遮阳
 externalsunshade(data) {
-  return sendGetRequest(`/jiaxing/readControl/externalsunshade`, data)
+  return sendGetRequest(`/readControl/externalsunshade`, data)
 },
 //风机湿帘
 fanwetcurtain(data) {
-  return sendGetRequest(`/jiaxing/readControl/fanwetcurtain`, data)
+  return sendGetRequest(`/readControl/fanwetcurtain`, data)
 },
 //补光灯
 readfilllight(data) {
-  return sendGetRequest(`/jiaxing/readControl/readfilllight`, data)
+  return sendGetRequest(`/readControl/readfilllight`, data)
 },
 //CO2补气
 co2replenishment(data) {
-  return sendGetRequest(`/jiaxing/readControl/co2replenishment`, data)
+  return sendGetRequest(`/readControl/co2replenishment`, data)
 },
 //冷暖风机
 heatfan(data) {
-  return sendGetRequest(`/jiaxing/readControl/heatfan`, data)
+  return sendGetRequest(`/readControl/heatfan`, data)
 },
 //内保温
 interiorthermalinsulation(data) {
-  return sendGetRequest(`/jiaxing/readControl/interiorthermalinsulation`, data)
+  return sendGetRequest(`/readControl/interiorthermalinsulation`, data)
 },
 //立面保温
 facadeinsulation(data) {
-  return sendGetRequest(`/jiaxing/readControl/facadeinsulation`, data)
+  return sendGetRequest(`/readControl/facadeinsulation`, data)
 },
 //环流风扇
 readcirculationfan(data) {
-  return sendGetRequest(`/jiaxing/readControl/readcirculationfan`, data)
+  return sendGetRequest(`/readControl/readcirculationfan`, data)
 },
 //报警设置
 readalarmSetting(data) {
-  return sendGetRequest(`/jiaxing/readControl/alarmSetting`, data)
+  return sendGetRequest(`/readControl/alarmSetting`, data)
 },
 
 //报警设置
 readalarmSetting(data) {
-  return sendGetRequest(`/jiaxing/readControl/alarmSetting`, data)
+  return sendGetRequest(`/readControl/alarmSetting`, data)
 },
 //主页查看施肥机历史数据
 selFsTime(data) {
-  return sendPostRequest(`/jiaxing/selFs/time`, data)
+  return sendPostRequest(`/selFs/time`, data)
 },
 //主页查看施肥机历史数据
 loadHistorydata(data) {
-  return sendPostRequest(`/jiaxing/load/historydata`, data)
+  return sendPostRequest(`/load/historydata`, data)
 },
 //查看抓取图片历史数据
 imageReadtoday(data) {
-  return sendPostRequest(`/jiaxing/image/readtoday`, data)
+  return sendPostRequest(`/image/readtoday`, data)
 },
 //下载图片
 imageUploadImage(data) {
-  return sendPostRequest(`/jiaxing/image/uploadImage`, data)
+  return sendPostRequest(`/image/uploadImage`, data)
 },
 
 //摄像头操作开始
 cameraStart(cameraSerialNumber,cameraChannelNumber,num) {
-  return sendPostRequest(`/jiaxing/camera/start?cameraid=${cameraSerialNumber}&channelid=${cameraChannelNumber}&direction=${num}`)
+  return sendPostRequest(`/camera/start?cameraid=${cameraSerialNumber}&channelid=${cameraChannelNumber}&direction=${num}`)
 },
 //摄像头操作结束
 cameraStop(cameraSerialNumber,cameraChannelNumber,num) {
-  return sendPostRequest(`/jiaxing/camera/stop?cameraid=${cameraSerialNumber}&channelid=${cameraChannelNumber}&direction=${num}`)
+  return sendPostRequest(`/camera/stop?cameraid=${cameraSerialNumber}&channelid=${cameraChannelNumber}&direction=${num}`)
 },
 
 
 //管理模块
 //根据用户ID获取账户设备
 selUserbyid(data){
-  return sendGetRequest(`/jiaxing/sel/userbyid/`+data, ``)
+  return sendGetRequest(`/sel/userbyid/`+data, ``)
 },
 //根据设备ID获取设备状态值
 selControlPermissions(data){
-  return sendGetRequest(`/jiaxing/getcontrol/selControlPermissions`, data)
+  return sendGetRequest(`/getcontrol/selControlPermissions`, data)
 },
 //根据设备ID修改设备状态值
 putpermission(data){
-  return sendPutRequest(`/jiaxing/getcontrol/putpermission`, data)
+  return sendPutRequest(`/getcontrol/putpermission`, data)
 },
 //根据权限id修改权限显示或者隐藏
 updatePermissionState(data){
-  return sendPutRequest(`/jiaxing/getcontrol/updatePermissionState`, data)
+  return sendPutRequest(`/getcontrol/updatePermissionState`, data)
 },
 
 //根据设备ID获取设备控制值
 selpermission(data){
-  return sendGetRequest(`/jiaxing/getcontrol/selpermission`, data)
+  return sendGetRequest(`/getcontrol/selpermission`, data)
 },
 //根据设备ID修改设备控制值
 putControlpermission(data){
-  return sendPutRequest(`/jiaxing/getcontrol/putControlpermission`, data)
+  return sendPutRequest(`/getcontrol/putControlpermission`, data)
 },
 //根据ID修改施肥机数据
 updatedevice(data){
-  return sendPutRequest(`/jiaxing/device/updatedevice`, data)
+  return sendPutRequest(`/device/updatedevice`, data)
 },
 
 //根据ID修改施肥机名字
 updateFsname(data){
-  return sendPutRequest(`/jiaxing/update/fsname`, data)
+  return sendPutRequest(`/update/fsname`, data)
 },
 //根据用户ID添加小程序气象站
 addphoneeqData(data) {
-    return sendPostRequest(`/jiaxing/getcontrol/addphoneeqData`, data)
+    return sendPostRequest(`/getcontrol/addphoneeqData`, data)
   },
 //根据用户ID删除小程序气象站
 delphoneeqData(data) {
-  return sendDelRequest(`/jiaxing/getcontrol/delphoneeqData`, data)
+  return sendDelRequest(`/getcontrol/delphoneeqData`, data)
 },
 
 //根据用户ID修改小程序气象站
 updatephoneeqData(data) {
-  return sendPutRequest(`/jiaxing/getcontrol/updatephoneeqData`, data)
+  return sendPutRequest(`/getcontrol/updatephoneeqData`, data)
 },
 //修改大数据信息
 updateDataDevice(data) {
-  return sendPutRequest(`/jiaxing/getcontrol/updateBigData`, data)
+  return sendPutRequest(`/getcontrol/updateBigData`, data)
 },
 
 //小程序手机控制权限模块查询
 wxgetpermission(data) {
-  return sendGetRequest(`/jiaxing/getcontrol/wxgetpermission`, data)
+  return sendGetRequest(`/getcontrol/wxgetpermission`, data)
 },
 //查询所有用户
 adminAll(data){
-  return sendGetRequest(`/jiaxing/admin/all`, data)
+  return sendGetRequest(`/admin/all`, data)
 },
 //更新用户信息
 updateUser(data){
-  return sendPutRequest(`/jiaxing/admin/add/userEquipment`, data)
+  return sendPutRequest(`/admin/add/userEquipment`, data)
 },
 //添加用户信息
 addUser(data){
-  return sendPostRequest(`/jiaxing/admin/user`, data)
+  return sendPostRequest(`/admin/user`, data)
 },
 
 //修改密码
 updatePwd(data){
-  return sendPutRequest(`/jiaxing/user/update/pwd`, data)
+  return sendPutRequest(`/user/update/pwd`, data)
 },
 //设备查询
 seldevice(data){
-  return sendGetRequest(`/jiaxing/admin/seldevice`, data)
+  return sendGetRequest(`/admin/seldevice`, data)
 },
 //删除设备信息
 deldevice(data){
-  return sendDelRequest(`/jiaxing/admin/deldevice`, data)
+  return sendDelRequest(`/admin/deldevice`, data)
 },
 //修改手机控制名称
 updatewxgetpermission(data){
-  return sendPutRequest(`/jiaxing/getcontrol/updatewxgetpermission`, data)
+  return sendPutRequest(`/getcontrol/updatewxgetpermission`, data)
 },
 //管理员/用户页面删除关联设备信息
 delUserByid(data){
-  return sendDelRequest(`/jiaxing/admin/delUserByid`, data)
+  return sendDelRequest(`/admin/delUserByid`, data)
 },
 //管理员/用户页面添加关联设备信息
 addUserByid(data){
-  return sendPostRequest(`/jiaxing/admin/addUserByid`, data)
+  return sendPostRequest(`/admin/addUserByid`, data)
 },
 //查询控制器权限
 selectallPermissions(data){
-  return sendGetRequest(`/jiaxing/getcontrol/selectallPermissions`, data)
+  return sendGetRequest(`/getcontrol/selectallPermissions`, data)
 },
 //新增标准控制器权限
 addpermissionall(equipmentId, data) {
-    return sendPostRequest(`/jiaxing/getcontrol/addpermissionall?deviceId=${equipmentId}`, data)
+    return sendPostRequest(`/getcontrol/addpermissionall?deviceId=${equipmentId}`, data)
   },
   //管理控制器权限删除
   delpermission(id1, id2) {
-    return sendDelRequest(`/jiaxing/getcontrol/delpermission?deviceId=${id1}&permissionid=${id2}`, ``)
+    return sendDelRequest(`/getcontrol/delpermission?deviceId=${id1}&permissionid=${id2}`, ``)
   },
   //管理控制器权限添加
   addpermission(id1, id2) {
-    return sendPostRequest(`/jiaxing/getcontrol/addpermission?deviceId=${id1}&permissionid=${id2}`, ``)
+    return sendPostRequest(`/getcontrol/addpermission?deviceId=${id1}&permissionid=${id2}`, ``)
   },
 //管理 设备管理添加设备
 addDevice(data){
-  return sendPostRequest(`/jiaxing/admin/addDevice`, data)
+  return sendPostRequest(`/admin/addDevice`, data)
 },
 //查询施肥级ICCID
 getFsIccid(data){
-  return sendGetRequest(`/jiaxing/readControl/getFsIccid`, data)
+  return sendGetRequest(`/readControl/getFsIccid`, data)
 },
 //查询控制器权限
 getIccid(data){
-  return sendGetRequest(`/jiaxing/readControl/getIccid`, data)
+  return sendGetRequest(`/readControl/getIccid`, data)
 },
   //二维码溯源
   //查看农事作物信息
   getAgriculturalInformation(data) {
-    return sendGetRequest(`/jiaxing/code/getAgriculturalInformation`, data)
+    return sendGetRequest(`/code/getAgriculturalInformation`, data)
   },
   //查看种植计划
   getplant(data) {
-    return sendGetRequest(`/jiaxing/code/getplant`, data)
+    return sendGetRequest(`/code/getplant`, data)
   },
   //查看农场信息管理
   getcodeFarmInformationManagement(data) {
-    return sendGetRequest(`/jiaxing/code/getcodeFarmInformationManagement`, data)
+    return sendGetRequest(`/code/getcodeFarmInformationManagement`, data)
   },
 
   //上传图片
   uploadImage(data) {
-    return sendPostRequest(`/jiaxing/code/uploadImage`, data)
+    return sendPostRequest(`/code/uploadImage`, data)
   },
   //管理页面上传图片
   manageUploadImage(data) {
-    return sendUploadRequest(`/jiaxing/user/upload`, data)
+    return sendUploadRequest(`/user/upload`, data)
   },
    //施肥机系统导入txt的
    upLoadFsdataWriteValue(data) {
-    return sendUploadRequest(`/jiaxing/Fsdata/write/value`, data)
+    return sendUploadRequest(`/Fsdata/write/value`, data)
   },
   //施肥机系统下载txt
   FsdataReadValuedownload(data) {
-    return sendPostRequest(`/jiaxing/Fsdata/read/value?devicecode=${data}`,``)
+    return sendPostRequest(`/Fsdata/read/value?devicecode=${data}`,``)
   },
   //控制器系统导入
   upLoadControlWriteValue(data) {
-    return sendUploadRequest(`/jiaxing/control/write/value`, data)
+    return sendUploadRequest(`/control/write/value`, data)
   },
    //控制器系统下载txt
   controlReadValuedownload(data) {
-    return sendPostRequest(`/jiaxing/control/read/value?devicecode=${data}`,``)
+    return sendPostRequest(`/control/read/value?devicecode=${data}`,``)
   },
 
   // 智能灌注
   //主页查看智能灌溉控制器
   getFi_rtdata(data) {
-    return sendGetRequest(`/jiaxing/getFi/rtdata`, data)
+    return sendGetRequest(`/getFi/rtdata`, data)
   },
   //当天折线图
   chart_fidata(data) {
-    return sendPostRequest(`/jiaxing/chart/fidata?equipmentId=${data}`,``)
+    return sendPostRequest(`/chart/fidata?equipmentId=${data}`,``)
   },
   //智能灌溉1
   readFi_irrigate(url,data) {
@@ -684,57 +746,57 @@ getIccid(data){
   },
   //智能灌溉写入
   postwriteFi_write(data) {
-    return sendPostRequest(`/jiaxing/writeFi/write`, data);
+    return sendPostRequest(`/writeFi/write`, data);
   },
   //智能灌溉状态值
   getFI_getState(data) {
-    return sendGetRequest(`/jiaxing/getFI/getState`, data);
+    return sendGetRequest(`/getFI/getState`, data);
   },
   
  //智能灌溉系统参数
  readControl_getFIIccid(data) {
-  return sendGetRequest(`/jiaxing/readControl/getFIIccid`, data);
+  return sendGetRequest(`/readControl/getFIIccid`, data);
 },
 
      //智能灌溉系统导入txt的
      upLoadFIwritevalue(data) {
-      return sendUploadRequest(`/jiaxing/FI/write/value`, data)
+      return sendUploadRequest(`/FI/write/value`, data)
     },
     //智能灌溉系统导出下载txt
     FIreadvaluedownload(data) {
-      return sendPostRequest(`/jiaxing/FI/read/value?devicecode=${data}`,``)
+      return sendPostRequest(`/FI/read/value?devicecode=${data}`,``)
     },
     //智能灌溉系统数据上传
     readFi_datauploadfi(data) {
-      return sendGetRequest(`/jiaxing/readFi/datauploadfi`, data);
+      return sendGetRequest(`/readFi/datauploadfi`, data);
     },
     //智能灌溉固有参数
     readFi_intrinsicparameterfi(data) {
-      return sendGetRequest(`/jiaxing/readFi/intrinsicparameterfi`, data);
+      return sendGetRequest(`/readFi/intrinsicparameterfi`, data);
     },
      //智能灌溉传感器通道
      readFi_sensorchannelfi(data) {
-      return sendGetRequest(`/jiaxing/readFi/sensorchannelfi`, data);
+      return sendGetRequest(`/readFi/sensorchannelfi`, data);
     },
     //智能灌溉的名称
     getFi_getName(data) {
-      return sendGetRequest(`/jiaxing/getFi/getName`, data);
+      return sendGetRequest(`/getFi/getName`, data);
     },
     //修改智能灌溉名称
     getFi_updateName(data){
-      return sendPutRequest(`/jiaxing/getFi/updateName`, data)
+      return sendPutRequest(`/getFi/updateName`, data)
     },
      //系统页面备忘录获取
      readControl_getMemo(data){
-      return sendGetRequest(`/jiaxing/readControl/getMemo`, data)
+      return sendGetRequest(`/readControl/getMemo`, data)
     },
      //系统页面备忘录修改
      readControl_setMemo(data){
-      return sendPostRequest(`/jiaxing/readControl/setMemo`, data)
+      return sendPostRequest(`/readControl/setMemo`, data)
     },
     //根据设备id查询控制器权限
     getcontrol_cpermission(data){
-      return sendPostRequest(`/jiaxing/getcontrol/cpermission?deviceId=${data}`, ``)
+      return sendPostRequest(`/getcontrol/cpermission?deviceId=${data}`, ``)
     },
     
 
@@ -742,66 +804,81 @@ getIccid(data){
     //二维码溯源部分
     //种植计划
     code_getplant(data){
-      return sendGetRequest(`/jiaxing/code/getplant`, data)
+      return sendGetRequest(`/code/getplant`, data)
     },
 
     //官网接口
     // 轮播图
     website_getows(data){
-      return sendGetRequest(`/jiaxing/website/getowsManagement`, data)
+      return sendGetRequest(`/website/getowsManagement`, data)
     },
     website_addows(data){
-      return sendPostRequest(`/jiaxing/website/addows`, data)
+      return sendPostRequest(`/website/addows`, data)
     },
     website_updateows(data){
-      return sendPutRequest(`/jiaxing/website/updateows`, data)
+      return sendPutRequest(`/website/updateows`, data)
     },
     website_delows(data){
-      return sendDelRequest(`/jiaxing/website/delows`, data)
+      return sendDelRequest(`/website/delows`, data)
     },
     
     //产品展示
     website_getowp(data){
-      return sendGetRequest(`/jiaxing/website/getowp`, data)
+      return sendGetRequest(`/website/getowp`, data)
     },
     website_getowpManagement(data){
-      return sendGetRequest(`/jiaxing/website/getowpManagement`, data)
+      return sendGetRequest(`/website/getowpManagement`, data)
     },
     website_addowp(data){
-      return sendPostRequest(`/jiaxing/website/addowp`, data)
+      return sendPostRequest(`/website/addowp`, data)
     },
     website_updateowp(data){
-      return sendPutRequest(`/jiaxing/website/updateowp`, data)
+      return sendPutRequest(`/website/updateowp`, data)
     },
     website_delowp(data){
-      return sendDelRequest(`/jiaxing/website/delowp`, data)
+      return sendDelRequest(`/website/delowp`, data)
     },
     // 综合 产品/案例/新闻列表
     website_getowpabyowpidMan(data){
-      return sendGetRequest(`/jiaxing/website/getowpabyowpidMan`, data)
+      return sendGetRequest(`/website/getowpabyowpidMan`, data)
     },
     website_addops(data){
-      return sendPostRequest(`/jiaxing/website/addops`, data)
+      return sendPostRequest(`/website/addops`, data)
     },
     website_updateops(data){
-      return sendPutRequest(`/jiaxing/website/updateops`, data)
+      return sendPutRequest(`/website/updateops`, data)
     },
     website_delops(data){
-      return sendDelRequest(`/jiaxing/website/delops`, data)
+      return sendDelRequest(`/website/delops`, data)
     },
     
     //案例介绍
     website_getcaseintroduction(data){
-      return sendGetRequest(`/jiaxing/website/getcaseintroduction`, data)
+      return sendGetRequest(`/website/getcaseintroduction`, data)
     },
   //管理官网页面上传图片
   websiteUploadImage(data) {
-    return sendUploadRequest(`/jiaxing/website/uploadows`, data)
+    return sendUploadRequest(`/website/uploadows`, data)
   },
     
 
       //虫情
       bugzhaodi_login(data){
-        return sendGetRequest(`/jiaxing/bugzhaodi/login`, data)
+        return sendGetRequest(`/bugzhaodi/login`, data)
+      },
+      getDeviceDetailById(data){
+        return sendPostParamsRequest(`/v1/getDeviceDetailById`, data)
+      },
+      getDeviceImages(data){
+        return sendPostParamsRequest(`/v1/getDeviceImages`, data)
+      },
+      getDeviceList(data){
+        return sendPostParamsRequest(`/v1/getDeviceList`, data)
+      },
+      getDeviceImagesDetailById(data){
+        return sendPostParamsRequest(`/v1/getDeviceImagesDetailById`, data)
+      },
+      getInsectChartData(data){
+        return sendPostParamsRequest(`/v1/getInsectChartData`, data)
       },
 };

src/views/index.vue

@@ -246,20 +246,22 @@ export default {
         // 虫情登录
         getbugzhaodi_login(){
                  var userInfo = localStorage.getItem('userInfo') ? JSON.parse(localStorage.getItem('userInfo')) : { userid: -1 }
-            this.api.bugzhaodi_login().then(res=>{
-               if(res.data.data.code==200&&res.data){
-                  localStorage.setItem("CQtoken", res.data.data.data.token);
-                  localStorage.setItem("CQuserName", JSON.stringify(res.data.data.data.userName));
-                  var data={"pageNum": 1,
+            // this.api.bugzhaodi_login().then(res=>{
+            //     console.log(res,11);
+            //    if(res.data.data.code==200&&res.data){
+            //       localStorage.setItem("CQtoken", res.data.data.data.token);
+            //       localStorage.setItem("CQuserName", JSON.stringify(res.data.data.data.userName));
+                
+            //    }
+            // })
+              var data={"pageNum": 1,
     "pageSize": 10,
     "imei":""}
-              axios.post(`/api1/api/v1/getDeviceList`,data, {
-                  headers: { //头部参数
-                 'Authorization': (localStorage.getItem('CQtoken') ? localStorage.getItem('CQtoken') : '')
-                 },
-                }).then(res1=>{
+               this.api.getDeviceList(data).then(res1=>{
+       
                     if(res1.data.code==200){
-                       var list= res1.data.data.list.map(item => {
+                        console.log(res1.data.data.data.list);
+                       var list= res1.data.data.data.list.map(item => {
                              return {
                                     ...item,
                                     deviceId: item.id,
@@ -276,8 +278,6 @@ export default {
                             this.leftList[6].list =list 
                     }
                 })
-               }
-            })
         },
 
         //获取设备名称/配方名称

src/views/insectPest/detail.vue

@@ -96,18 +96,9 @@ export default {
     // 获取设备详情
     getDetail() {
       var data = { deviceId: this.id };
-      axios
-        .post(`/api1/api/v1/getDeviceDetailById`, data, {
-          headers: {
-            //头部参数
-            Authorization: localStorage.getItem("CQtoken")
-              ? localStorage.getItem("CQtoken")
-              : "",
-          },
-        })
-        .then((res) => {
+      this.api.getDeviceDetailById(data).then((res) => {
           if (res.data.code == 200) {
-            this.detail = res.data.data;
+            this.detail = res.data.data.data;
           }
         });
     },
@@ -137,15 +128,7 @@ export default {
         pageNum: 1,
         pageSize: 6,
       };
-      axios.post(`/api1/api/v1/getDeviceImages`, data, {
-          headers: {
-            //头部参数
-            Authorization: localStorage.getItem("CQtoken")
-              ? localStorage.getItem("CQtoken")
-              : "",
-          },
-        })
-        .then((res) => {
+     this.api.getDeviceImages(data).then((res) => {
           if (res.data.code == 200) {
             this.imageList = res.data.data.list;
             this.srcList = this.imageList.map((item) => item.imageUrl);
@@ -159,15 +142,7 @@ export default {
         endTime: this.getTimeNew(),
         deviceId: this.id,
       };
-      axios.post(`/api1/api/v1/getInsectChartData`, data, {
-          headers: {
-            //头部参数
-            Authorization: localStorage.getItem("CQtoken")
-              ? localStorage.getItem("CQtoken")
-              : "",
-          },
-        })
-        .then((res) => {
+     this.api.getInsectChartData(data).then((res) => {
           if (res.data.code == 200) {
             this.chartsData = res.data;
             pestLine("pest-charts", this.chartsData);

src/views/insectPest/imageList.vue

@@ -132,16 +132,7 @@ window.open(routeData.href, '_blank');
         pageNum:  this.currentPage,
         pageSize: this.pageSize,
       };
-      axios
-        .post(`/api1/api/v1/getDeviceImages`, data, {
-          headers: {
-            //头部参数
-            Authorization: localStorage.getItem("CQtoken")
-              ? localStorage.getItem("CQtoken")
-              : "",
-          },
-        })
-        .then((res) => {
+     this.api.getDeviceImages(data).then((res) => {
               this.loading.close()
           if (res.data.code == 200) {
             this.tableData = res.data.data.list;

src/views/insectPest/imageViewer.vue

@@ -35,15 +35,7 @@ export default {
          var data = {
         imageId: this.id,
       };
-      axios.post(`/api1/api/v1/getDeviceImagesDetailById`, data, {
-          headers: {
-            //头部参数
-            Authorization: localStorage.getItem("CQtoken")
-              ? localStorage.getItem("CQtoken")
-              : "",
-          },
-        })
-        .then((res) => {
+        this.api.getDeviceImagesDetailById(data).then((res) => {
           if (res.data.code == 200) {
            this.apiData.resultList=res.data.data.list[0]
           }

src/views/page/largeScreen.vue

@@ -773,16 +773,7 @@ export default {
         pageNum: 1,
         pageSize: 4,
       };
-      axios
-        .post(`/api1/api/v1/getDeviceImages`, data, {
-          headers: {
-            //头部参数
-            Authorization: localStorage.getItem("CQtoken")
-              ? localStorage.getItem("CQtoken")
-              : "",
-          },
-        })
-        .then((res) => {
+     this.api.getDeviceImages(data).then((res) => {
           if (res.data.code == 200) {
             this.imageList = res.data.data.list;
             this.srcList = this.imageList.map((item) => item.imageUrl);
@@ -796,16 +787,7 @@ export default {
         endTime: this.getTimeNew(),
         deviceId: 613,
       };
-      axios
-        .post(`/api1/api/v1/getInsectChartData`, data, {
-          headers: {
-            //头部参数
-            Authorization: localStorage.getItem("CQtoken")
-              ? localStorage.getItem("CQtoken")
-              : "",
-          },
-        })
-        .then((res) => {
+        this.api.getInsectChartData(data).then((res) => {
           if (res.data.code == 200) {
             this.chartsData = res.data;
             pestLine("pest-charts", this.chartsData);

vue.config.js

@@ -40,23 +40,23 @@ module.exports = {
   devServer: {
     // https:true,
       proxy: {
-        "/jiaxing": {
+        "/api": {
           target: 'https://api.lihe-control.com', //地址
           // target: 'http://jiaxingtest.a1.luyouxia.net:21114', //地址
-          //target: 'http://jiaxingtest.a1.luyouxia.net:25762', //地址
+          // target: 'http://jiaxingtest.a1.luyouxia.net:25762', //地址
 
           changeOrigin: true,
           pathRewrite: {
-            "^/jiaxing": "",
-          },
-        },
-        "/api1": {
-          target: 'https://zdny.zznongyeyiqi.com', //地址
-          changeOrigin: true,
-          pathRewrite: {
-            "^/api1": "",
+            "^/api": "",
           },
         },
+        // "/api1": {
+        //   target: 'https://zdny.zznongyeyiqi.com', //地址
+        //   changeOrigin: true,
+        //   pathRewrite: {
+        //     "^/api1": "",
+        //   },
+        // },
       },
     },
   // 第三方插件配置