zhnghongrui 1 年之前
父節點
當前提交
8ff9031cdb
共有 100 個文件被更改,包括 27 次插入6379 次删除
  1. 5 41
      app.json
  2. 0 11
      pages/Introduction/Introduction.js
  3. 0 6
      pages/Introduction/Introduction.json
  4. 0 39
      pages/Introduction/Introduction.wxml
  5. 0 14
      pages/Introduction/Introduction.wxss
  6. 1 1
      pages/denglu/denglu.wxml
  7. 0 149
      pages/details/details.js
  8. 0 13
      pages/details/details.json
  9. 0 81
      pages/details/details.wxml
  10. 0 72
      pages/details/details.wxss
  11. 0 51
      pages/early_warning_list/early_warning_list.js
  12. 0 10
      pages/early_warning_list/early_warning_list.json
  13. 0 32
      pages/early_warning_list/early_warning_list.wxml
  14. 0 61
      pages/early_warning_list/early_warning_list.wxss
  15. 0 89
      pages/fcdetail/fcdetail.js
  16. 0 6
      pages/fcdetail/fcdetail.json
  17. 0 43
      pages/fcdetail/fcdetail.wxml
  18. 0 76
      pages/fcdetail/fcdetail.wxss
  19. 8 353
      pages/index/index.js
  20. 7 127
      pages/index/index.wxml
  21. 0 211
      pages/maillist/maillist.js
  22. 0 14
      pages/maillist/maillist.json
  23. 0 32
      pages/maillist/maillist.wxml
  24. 0 8
      pages/maillist/maillist.wxss
  25. 0 235
      pages/maillist/serch/maillist_serch.js
  26. 0 14
      pages/maillist/serch/maillist_serch.json
  27. 0 31
      pages/maillist/serch/maillist_serch.wxml
  28. 0 8
      pages/maillist/serch/maillist_serch.wxss
  29. 0 109
      pages/material/details/material_details.js
  30. 0 13
      pages/material/details/material_details.json
  31. 0 62
      pages/material/details/material_details.wxml
  32. 0 46
      pages/material/details/material_details.wxss
  33. 0 172
      pages/material/material.js
  34. 0 14
      pages/material/material.json
  35. 0 42
      pages/material/material.wxml
  36. 0 47
      pages/material/material.wxss
  37. 0 199
      pages/material/serch/material_serch.js
  38. 0 9
      pages/material/serch/material_serch.json
  39. 0 35
      pages/material/serch/material_serch.wxml
  40. 0 8
      pages/material/serch/material_serch.wxss
  41. 5 128
      pages/me/me.js
  42. 1 49
      pages/me/me.wxml
  43. 0 190
      pages/me_xuncha_list/me_xuncha_list.js
  44. 0 9
      pages/me_xuncha_list/me_xuncha_list.json
  45. 0 39
      pages/me_xuncha_list/me_xuncha_list.wxml
  46. 0 40
      pages/me_xuncha_list/me_xuncha_list.wxss
  47. 0 54
      pages/menu/menu.js
  48. 0 4
      pages/menu/menu.json
  49. 0 16
      pages/menu/menu.wxml
  50. 0 68
      pages/menu/menu.wxss
  51. 0 23
      pages/more/more.js
  52. 0 13
      pages/more/more.json
  53. 0 92
      pages/more/more.wxml
  54. 0 33
      pages/more/more.wxss
  55. 0 191
      pages/new_patrol_point/new_patrol_point.js
  56. 0 8
      pages/new_patrol_point/new_patrol_point.json
  57. 0 46
      pages/new_patrol_point/new_patrol_point.wxml
  58. 0 98
      pages/new_patrol_point/new_patrol_point.wxss
  59. 0 12
      pages/newcomer/newcomer.js
  60. 0 6
      pages/newcomer/newcomer.json
  61. 0 39
      pages/newcomer/newcomer.wxml
  62. 0 14
      pages/newcomer/newcomer.wxss
  63. 0 90
      pages/patrol_list/patrol_list.js
  64. 0 8
      pages/patrol_list/patrol_list.json
  65. 0 40
      pages/patrol_list/patrol_list.wxml
  66. 0 64
      pages/patrol_list/patrol_list.wxss
  67. 0 136
      pages/qianming/qianming.js
  68. 0 7
      pages/qianming/qianming.json
  69. 0 21
      pages/qianming/qianming.wxml
  70. 0 80
      pages/qianming/qianming.wxss
  71. 0 91
      pages/qiye/qiye.js
  72. 0 12
      pages/qiye/qiye.json
  73. 0 50
      pages/qiye/qiye.wxml
  74. 0 45
      pages/qiye/qiye.wxss
  75. 0 249
      pages/qiyemore/qiyemore.js
  76. 0 8
      pages/qiyemore/qiyemore.json
  77. 0 76
      pages/qiyemore/qiyemore.wxml
  78. 0 86
      pages/qiyemore/qiyemore.wxss
  79. 0 219
      pages/qiyexqtable/qiyexqtable.js
  80. 0 8
      pages/qiyexqtable/qiyexqtable.json
  81. 0 71
      pages/qiyexqtable/qiyexqtable.wxml
  82. 0 78
      pages/qiyexqtable/qiyexqtable.wxss
  83. 0 236
      pages/search/search.js
  84. 0 9
      pages/search/search.json
  85. 0 30
      pages/search/search.wxml
  86. 0 9
      pages/search/search.wxss
  87. 0 112
      pages/teamlist/details/team_details.js
  88. 0 13
      pages/teamlist/details/team_details.json
  89. 0 56
      pages/teamlist/details/team_details.wxml
  90. 0 4
      pages/teamlist/details/team_details.wxss
  91. 0 192
      pages/teamlist/serch/team_serch.js
  92. 0 9
      pages/teamlist/serch/team_serch.json
  93. 0 35
      pages/teamlist/serch/team_serch.wxml
  94. 0 8
      pages/teamlist/serch/team_serch.wxss
  95. 0 173
      pages/teamlist/teamlist.js
  96. 0 14
      pages/teamlist/teamlist.json
  97. 0 41
      pages/teamlist/teamlist.wxml
  98. 0 47
      pages/teamlist/teamlist.wxss
  99. 0 196
      pages/update_patrol_point/update_patrol_point.js
  100. 0 0
      pages/update_patrol_point/update_patrol_point.json

+ 5 - 41
app.json

@@ -1,50 +1,14 @@
 {
   "pages": [
     "pages/index/index",
-    "pages/qiye/qiye",
-    "pages/menu/menu",
-    "pages/search/search",
-    "pages/details/details",
-    "pages/newcomer/newcomer",
-    "pages/Introduction/Introduction",
-    "pages/xuncha/xuncha",
-    "pages/xunchawu/xunchawu",
-    "pages/xunchajilu/xunchajilu",
-    "pages/xunjianimg/xunjianimg",
+    
     "pages/me/me",
-    "pages/more/more",
-    "pages/qiyemore/qiyemore",
-    "pages/qiyexqtable/qiyexqtable",
-    "pages/zhenggaijindu/zhenggaijindu",
-    "pages/xqzggzs/xqzggzs",
-    "pages/xqzggzs2/xqzggzs2",
-    "pages/xunjian/xunjian",
-    "pages/xunjiancz/xunjiancz",
-    "pages/qianming/qianming",
-    "pages/xunjianmore/xunjianmore",
+    
     "pages/notice/notice",
     "pages/notice/notice_details",
-    "pages/material/material",
-    "pages/denglu/denglu",
-    "pages/material/details/material_details",
-    "pages/teamlist/teamlist",
-    "pages/teamlist/details/team_details",
-    "pages/warehouselist/warehouselist",
-    "pages/warehouselist/details/warehouse_details",
-    "pages/material/serch/material_serch",
-    "pages/warehouselist/serch/warehouse_serch",
-    "pages/teamlist/serch/team_serch",
-    "pages/maillist/maillist",
-    "pages/maillist/serch/maillist_serch",
-    "pages/xqzgdetail/xqzgdetail",
-    "pages/fcdetail/fcdetail",
-    "pages/patrol_list/patrol_list",
-    "pages/new_patrol_point/new_patrol_point",
-    "pages/update_patrol_point/update_patrol_point",
-    "pages/xungengdetails/xungengdetails",
-    "pages/xungengjilu/xungengjilu",
-    "pages/early_warning_list/early_warning_list",
-    "pages/me_xuncha_list/me_xuncha_list"
+    
+    "pages/denglu/denglu"
+   
   ],
   "requiredPrivateInfos": [
     "getLocation"

+ 0 - 11
pages/Introduction/Introduction.js

@@ -1,11 +0,0 @@
-// pages/Introduction/Introduction.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-  
-})

+ 0 - 6
pages/Introduction/Introduction.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "使用攻略"
-}

+ 0 - 39
pages/Introduction/Introduction.wxml

@@ -1,39 +0,0 @@
-<!--pages/Introduction/Introduction.wxml-->
-<view class="container">
-  <text class="title">二道应急小程序使用攻略</text>
-  <text>
-    一、遭遇拥挤踩踏事故怎么办
-
-  1.发觉拥挤的人群向着自己行走的方向拥来时,应该马上避到一旁,但是不要奔跑,以免摔倒。
-
-  2.可以到教室里暂避一时。切记不要逆着人流前进,那样非常容易被推倒在地。
-
-  3.若身不由己陷入人群之中,一定要先稳住双脚。切记远离教室的玻璃窗,以免因玻璃破碎而被扎伤。
-
-  4.遭遇拥挤的人流时,一定不要采用体位前倾或者低重心的姿势,即便鞋子被踩掉,也不要贸然弯腰提鞋或系鞋带。
-
-  5.如有可能,抓住一样坚固牢靠的东西,例如楼梯柱之类,待人群过去后,迅速而镇静地离开现场。
-
-  6.学生在校上下楼梯时要遵守秩序,靠右行走。课间操、放学时要排好队,不能从楼梯跑下,遇到其他班级要让行,不可争抢先行。
-
-  二、出现混乱局面后怎么办
-
-  1.在拥挤的人群中,要时刻保持警惕,当发现有人情绪不对,或人群开始骚动时,就要做好准备保护自己和他人。
-
-  2.此时脚下要敏感些,千万不能被绊倒,避免自己成为拥挤踩踏事件的诱发因素。
-
-  3.当发现自己前面有人突然摔倒了,马上要停下脚步,同时大声呼救,告知后面的人不要向前靠近。
-
-  4.当带着孩子遭遇拥挤的人群时,最好把孩子抱起来,避免其在混乱中被踩伤。
-
-  5.若被推倒,要设法靠近墙壁。面向墙壁,身体蜷成球状,双手在颈后紧扣,以保护身体最脆弱的部位。
-
-  三、 事故已经发生该怎么办
-
-  1.拥挤踩踏事故发生后,一方面赶快报警,等待救援,另一方面,在医务人员到达现场前,要抓紧时间用科学的方法开展自救和互救。
-
-  2.在救治中,要遵循先救重伤者、老人、儿童及妇女的原则。判断伤势的依据有:神志不清、呼之不应者伤势较重;脉搏急促而乏力者伤势较重;血压下降、瞳孔放大者伤势较重;有明显外伤,血流不止者伤势较重。
-
-  3.当发现伤者呼吸、心跳停止时,要赶快做人工呼吸,辅之以胸外按压。
-  </text>
-</view>

+ 0 - 14
pages/Introduction/Introduction.wxss

@@ -1,14 +0,0 @@
-/* pages/IntroductionIntroduction.wxss */
-.container{
-  margin: 30rpx 30rpx;
-}
-.title{
-  display: flex;
-  justify-content: center;
-  font-size: 40rpx;
-}
-text{
-  color: #000;
-  font-size: 32rpx;
-  text-align: justify;
-}

+ 1 - 1
pages/denglu/denglu.wxml

@@ -21,5 +21,5 @@
       <!-- <button type="" class="qx_btn">取消</button> -->
     </view>
   </view>
-  <!-- <view class="btm_tit">长春市二道应急局</view> -->
+
 </view>

+ 0 - 149
pages/details/details.js

@@ -1,149 +0,0 @@
-// pages/details/details.js
-
-import http from '../../base/httputil'
-const app = getApp()
-Page({
-
-
-  onLoad(e) {
-    this.data.busEnterpriseId = e.busEnterpriseId
-  },
-  onShow() {
-
-    this.getEnterpriseDetails()
-  },
-  data: {
-    host: app.globalData.host,
-    busEnterpriseId: null,
-    enterpriseDetails: null,
-
-    //店铺经纬度
-    latitude: 43.8691319,
-    longitude: 125.3504459,
-    //标记点
-    markers: [{
-      id: 0,
-      name: "编程小石头",
-      address: "长春首佳科技有限公司",
-      latitude: 43.8691319,
-      longitude: 125.3504459,
-      width: 35,
-      height: 50
-    }],
-    isShowEdit: true,
-
-  },
-
-
-  getEnterpriseDetails() {
-    let obj = new Object();
-    obj.busEnterpriseId = this.data.busEnterpriseId
-    http.post("/system/AppEnterpriseController/getEnterpriseDetails", obj, this.getEnterpriseDetailsSuccess)
-  },
-  getEnterpriseDetailsSuccess(res) {
-    //  var currentUserId=res.enterpriseDetails.userId;
-    //  var loginUserid=app.loginUserId; 
-    this.isShowEdit = (res.enterpriseDetails.userId === app.loginUserId)
-    this.setData({
-      enterpriseDetails: res.enterpriseDetails,
-      latitude: res.enterpriseDetails.latitude,
-      longitude: res.enterpriseDetails.longitude,
-      isShowEdit: this.isShowEdit,
-
-      markers: [{
-        id: res.enterpriseDetails.busEnterpriseId,
-        name: res.enterpriseDetails.businessName,
-        address: res.enterpriseDetails.businessAddress,
-        latitude: res.enterpriseDetails.latitude,
-        longitude: res.enterpriseDetails.longitude,
-        width: 35,
-        height: 50,
-      }]
-    })
-  },
-
-
-
-
-
-
-
-  //拨打电话
-  Call() {
-    wx.makePhoneCall({
-      phoneNumber: '17649876533'
-    })
-  },
-  //巡更点跳转
-  xungengList() {
-    wx.navigateTo({
-      url: '../patrol_list/patrol_list?enterpriseId=' + this.data.busEnterpriseId,
-    })
-  },
-  //导航
-  navRoad(event) {
-
-    wx.getLocation({ //获取当前经纬度
-      type: 'wgs84', //返回可以用于wx.openLocation的经纬度,
-      success: function (res) {
-        wx.openLocation({ //​使用微信内置地图查看位置。
-          latitude: Number(event.currentTarget.dataset.marker.latitude), //要去的纬度-地址
-          longitude: Number(event.currentTarget.dataset.marker.longitude), //要去的经度-地址
-          name: event.currentTarget.dataset.marker.name,
-          address: event.currentTarget.dataset.marker.address
-        })
-      }
-    })
-  },
-
-
-
-  //-------跳转
-  //巡检跳转
-  bindViewXunJian() {
-    wx.navigateTo({
-      url: '../xunjian/xunjian?busEnterpriseId=' + this.data.busEnterpriseId
-        + "&isBeforeBack=true",
-    })
-  },
-  //巡检跳转
-  bindViewXunChaJiLu() {
-    wx.navigateTo({
-      url: '../xunchajilu/xunchajilu?busEnterpriseId='
-        + this.data.enterpriseDetails.busEnterpriseId
-        + "&businessName=" + this.data.enterpriseDetails.businessName,
-    })
-  },
-  //企业详情
-  bindViewQiYeXiangQingTable() {
-    wx.navigateTo({
-      url: '../qiyexqtable/qiyexqtable?busEnterpriseId=' + this.data.busEnterpriseId,
-    })
-  },
-  bindViewQiYeDelete() {
-    wx.showModal({
-      title: '提示',
-      content: '确认废弃该企业?',
-      complete: (res) => {
-        if (res.cancel) {
-
-        } else {
-          this.deleteEnterprise()
-        }
-      }
-    })
-  },
-  deleteEnterprise() {
-    let obj = new Object();
-    obj.busEnterpriseId = this.data.busEnterpriseId
-    http.post("/system/AppEnterpriseController/deleteEnterprise", obj, this.deleteEnterpriseSuccess)
-  },
-  deleteEnterpriseSuccess(res) {
-    wx.showToast({
-      title: res.msg,
-    })
-    if (res.code == 200) {
-      wx.navigateBack()
-    }
-  },
-})

+ 0 - 13
pages/details/details.json

@@ -1,13 +0,0 @@
-{
-  "usingComponents": {
-    
-  },
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "企业详情",
-  "permission": {
-    "scope.userLocation": {
-      "desc": "导航需要" 
-    }
-  }
-}

+ 0 - 81
pages/details/details.wxml

@@ -1,81 +0,0 @@
-<!-- 企业详情页面 -->
-<view class="container">
-  <view class="map">
-    <map longitude="{{enterpriseDetails.longitude}}" latitude="{{enterpriseDetails.latitude}}" scale="17" markers="{{markers}}" bindmarkertap="navRoad" data-marker="{{markers[0]}}" show-location />
-
-    <view class="map_btn">
-    <text class="iconfont icon-wenjianguanli" bindtap="bindViewXunChaJiLu"></text>
-    <text class="iconfont icon-icon-test" bindtap="bindViewQiYeXiangQingTable" wx:if="{{isShowEdit}}"></text>
-    <text class="iconfont icon-pinleishanchu" bindtap="bindViewQiYeDelete" wx:if="{{isShowEdit}}"></text>
-    </view>
-
-    <view class="map_view">
-
-      <view>
-        <span>经度:</span>
-        <i>{{enterpriseDetails.longitude}}</i>
-      </view>
-      <view>
-        <span>纬度:</span>
-        <i>{{enterpriseDetails.latitude}}</i>
-      </view>
-      <view>
-        <span>企业名称:</span>
-        <i>{{enterpriseDetails.businessName}}</i>
-      </view>
-      <view>
-        <span>机构代码:</span>
-        <i>{{enterpriseDetails.orgCode}}</i>
-      </view>
-      <view>
-        <span>企业编码:</span>
-        <i>{{enterpriseDetails.enterpriseCode}}</i>
-      </view>
-      <view>
-        <span>办公地址:</span>
-        <i>{{enterpriseDetails.officeAddress}}</i>
-      </view>
-      <view>
-        <span>经营地址:</span>
-        <i>{{enterpriseDetails.businessAddress}}</i>
-      </view>
-      <view>
-        <span>监管人员:</span>
-        <i>{{enterpriseDetails.supervisor}}</i>
-      </view>
-      <view>
-        <span>主管部门:</span>
-        <i>{{enterpriseDetails.tradeDept}}</i>
-      </view>
-      <view>
-        <span>所属部门:</span>
-        <i>{{enterpriseDetails.deptName}}</i>
-      </view>
-      <view>
-        <span>主要负责人:</span>
-        <i>{{enterpriseDetails.mainPerson}}</i>
-      </view>
-      <view class="phone" bindtap="Call">
-        <span>负责人电话:</span>
-        <i>{{enterpriseDetails.mainPersonPhone}}</i>
-      </view>
-      <view>
-        <span>安全负责人:</span>
-        <i>{{enterpriseDetails.headSecurity}}</i>
-      </view>
-      <view class="phone" bindtap="Call">
-        <span>负责人电话:</span>
-        <i>{{enterpriseDetails.headSecurityPhone}}</i>
-      </view>
-    
-    <view  class="xungengdian "bindtap="xungengList">
-       <i style="color: blue;padding-bottom: 40rpx;"> 巡更点</i> 
-      </view>
-     
-    </view>
-
-    <!-- 巡检悬浮按钮 -->
-    <view class="float_btn" bindtap="bindViewXunJian">检</view>
-  
-  </view>
-</view>

+ 0 - 72
pages/details/details.wxss

@@ -1,72 +0,0 @@
-map{
-  height: 40vh;
-  width: 100vw;
-}
-.map{
-  height: 40vh;
-  width: 100vw;
-  position: relative;
-}
-.map canvas{
-  width:100%;
-  height: 100%;
-}
-.map_view{
-  margin: 30rpx 30rpx;
-}
-.map_view view{
-  display: flex;
-  flex-direction: row;
-  font-size: 34rpx;
-  line-height: 50rpx;
-  padding-bottom: 10rpx;
-}
-.map_view view span{
-  width: 240rpx;
-  text-align: right;
-  color: #181818;
-}
-.map_view view i{
- color: rgb(146, 146, 146);
- white-space:normal;
-word-break:break-all;
-word-wrap:break-word
-}
-.map_btn{
-  background: rgba(0, 0, 0, 0.479);
-  display: flex;
-  flex-direction: row;
-  /* width: 220rpx; */
-  width: auto;
-  padding-left: 20rpx;
-  padding-right: 20rpx;
-  height: 70rpx;
-  position: absolute;
-  right:20rpx;
-  bottom:20rpx;
-  z-index: 99999;
-  border-radius: 50rpx;
-  justify-content: space-evenly;
-  align-items: center;
-}
-.map_btn .iconfont{
-  color: #fff;
-  font-size: 50rpx;
-}
-.logo-text{
-  display: none;
-}
-.xungengdian{
-  
-  
- 
-  align-items: center;
- 
-  justify-content: center;
-  text-align: center;
-  text-decoration:underline;
-  color:blue;
-  
-}
-
-

+ 0 - 51
pages/early_warning_list/early_warning_list.js

@@ -1,51 +0,0 @@
-// pages/early_warning_list/early_warning_list.js
-import http from '../../base/httputil'
-const app = getApp()
-
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    mList: null
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-    if (app.globalToken == null || app.globalToken == '') {
-      return
-    }
-    http.send_get("/system/AppIndexController/getLateInspectionList", null, this.getListSuccess)
-  },
-  
-  getListSuccess(res) {
-    if (res.code == 200) {
-      var popInfo = res.data.late_inspection_list
-      console.log(popInfo)
-      if (res.data != null && res.data.late_inspection_list != null && res.data.late_inspection_list.length > 0) {
-        this.data.mList = res.data.late_inspection_list
-        this.setData({
-          mList: this.data.mList
-        })
-      }
-    }
-  },
-  bindViewDetails(res) {
-    let busInspectionId = res.currentTarget.dataset.item.busInspectionId
-    let buslogid = res.currentTarget.dataset.item.busLogId
-    wx.navigateTo({
-      url: '../zhenggaijindu/zhenggaijindu?busInspectionId=' + busInspectionId + "&buslogId=" + buslogid,
-    })
-  },
-
-})

+ 0 - 10
pages/early_warning_list/early_warning_list.json

@@ -1,10 +0,0 @@
-{
-  "component": true, 
-  "usingComponents": {
-    
-  },
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "预警"
-
-}

+ 0 - 32
pages/early_warning_list/early_warning_list.wxml

@@ -1,32 +0,0 @@
-<!--pages/early_warning_list/early_warning_list.wxml-->
-<view class="container">
-  <!-- 搜索 -->
-  <!-- <view class="search-container" bindtap="bindViewSearchEnd" >
-    <view class="search-left">
-      <input type="text" placeholder="搜索"  />
-    </view>
-    <button class="search-right">
-      <text class="iconfont icon-sousuo"></text>
-    </button>
-  </view> -->
- 
-  <!-- 列表 -->
-  <view class="list_vi">
-    <!--循环本行-->
-    <view class="list_li flex-c"  wx:for="{{mList}}" wx:key="index" bindtap="bindViewDetails"
-     data-isrisk="{{item.isRisk}}" data-item='{{item}}'>
-      <view class="list_li_1">
-        <text>巡检项目:{{item.busItemsName}}</text>
-         <!-- <i class="iconfont icon-xiangyou list_right"></i> -->
-      </view>
-      <view class="list_li_1" >
-        <text class="time-text list_li_3">所属企业: {{item.busEnterpriseName}}</text>
-      </view>
-      <view class="list_li_1">
-        <text class="time-text list_li_3"  style="color: red;" wx:if="{{item.mu<0}}">整改到期时间: {{item.latTime}}</text>
-        <text class="time-text list_li_3"  style="color:#FFB915;" wx:if="{{item.mu>0}}">整改到期时间: {{item.latTime}}</text>
-      </view>
-    </view>
-    </view>
-
-</view>

+ 0 - 61
pages/early_warning_list/early_warning_list.wxss

@@ -1,61 +0,0 @@
-/* pages/early_warning_list/early_warning_list.wxss */
-/**index.wxss**/
-
-.qy_con{
-  display: flex;
-  flex-direction: row;
-  justify-content:space-around;
-  text-align: center;
-  margin: 30rpx 30rpx;
-}
-.qy_con view{
-height: 140rpx;
-color: #fff;
-display: flex;
-flex-direction: column;
-padding: 15rpx 40rpx;
-position: relative;
-}
-.qy_con view image{
-  position: absolute;
-  top:0px;
-  left: 0px;
-  width: 100%;
-  height: 100%;
-  z-index: -1;
-  }
-.qy_con view h2{
-  font-size: 58rpx;
-  font-weight: bolder;
-  padding-top: 10rpx;
-  }
-  .qy_con view p{
-    font-size: 35rpx;
-    }
-
-  .flex-c{
-    display: flex;
-    flex-direction: column !important;
-  }
-  .list_li_1, .list_li_2{
-    display: flex;
-  }
-  .list_li_2 .time-text{
-    display: block;
-    font-size: 28rpx !important;
-    color: rgb(168, 168, 168) !important;
-    margin-right: 20rpx;
-}
-.list_li_2 .time-text:nth-child(1){
-    margin-left: 55rpx;
-}
-.list_vi .list_li{
-  display: flex;
-  flex-direction: row;
-  height: auto !important;
-  line-height: 60rpx;
-  padding-bottom: 10rpx;
-}
-.list_li_3{
-  font-size: 30rpx !important;
-}

+ 0 - 89
pages/fcdetail/fcdetail.js

@@ -1,89 +0,0 @@
-import util from '../../base/utils'
-import http from '../../base/httputil'
-const app = getApp()
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    host: app.globalData.host,
-    logId:null,
-    askCompany:null,
-    opinion:null,
-    nickname:null,
-    lasttime:null,
-    gzsTime:null,
-    deptName:null,
-    fcCode:null,
-    checkTime:null,
-    checker1Code:null,
-    checker2Code:null,
-    qianming01:null,
-    qianming02:null,
-    qianming03:null,
-    signature:null,
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-    this.data.logId=options.logId
-    var time= util.formatDate(new Date(),'yyyy年MM月dd日')
-    this.setData({
-      time:time
-    })
-    var obj={};
-    obj["logId"]=this.data.logId
-    // obj["userId"]=app.loginUserId;
-    http.post_nocheck("/system/AppXunchaController/getFcyjgzsDetail",obj,this.detailsSuccess)
-    wx.showShareMenu({
-      menus: ["shareAppMessage"],
-    });
-  },
-  detailsSuccess(e){
-    
-    if(e.code == 200){
-      this.data.lasttime=util.formatDate(new Date(e.data.fcyjgzs.lasttime),'yyyy年MM月dd日') ;
-      this.data.deptName=e.data.fcyjgzs.checkDept;
-      this.data.askCompany=e.data.fcyjgzs.askCom;
-      this.data.opinion=e.data.fcyjgzs.myoption;
-      this.data.qianming01=e.data.fcyjgzs.checker1Sign;
-      this.data.qianming02=e.data.fcyjgzs.checker2Sign;
-      this.data.qianming03=e.data.fcyjgzs.becheckerSign;
-      this.data.checker1Code=e.data.fcyjgzs.checker1Code;
-      this.data.checker2Code=e.data.fcyjgzs.checker2Code;
-      this.data.checkTime=util.formatDate(new Date(e.data.fcyjgzs.checkTime),'yyyy年MM月dd日') ;
-      this.data.fcCode=e.data.fcyjgzs.code;
-      this.data.signature=e.data.fcyjgzs.seal;
-
-      this.setData({
-        lasttime:this.data.lasttime,
-        checkTime:this.data.checkTime,
-        nickname:this.data.nickname,
-        opinion:this.data.opinion,
-        askCompany:this.data.askCompany,
-        fcCode:this.data.fcCode,
-        checker1Code:this.data.checker1Code,
-        checker2Code:this.data.checker2Code,
-        qianming01:this.data.qianming01,
-        qianming02:this.data.qianming02,
-        qianming03:this.data.qianming03,
-        deptName:this.data.deptName,
-        signature:this.data.signature,
-
-      })
-    }
-  }, 
-   /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-    var mLogId = this.data.logId;
-    return {
-      title: '复查意见告知书',
-      path: '/pages/fcdetail/fcdetail?logId=' + mLogId,
-    }
-  }
-
-})

+ 0 - 6
pages/fcdetail/fcdetail.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "复查意见告知书"
-}

+ 0 - 43
pages/fcdetail/fcdetail.wxml

@@ -1,43 +0,0 @@
-<view class="container">
-  <view class="zg_bh"><text>编号:</text><input type="number" style="width: 400rpx;"  disabled="disabled" value="{{fcCode}}"/></view>
-  <text class="con_tit mar_top">复查意见告知书</text>
-  <view class="flex_row text_ind mar_top2 ">本机关于 <input type="text" style="width: 400rpx;" value="{{checkTime}}"  disabled="disabled" /> ,对你单位做出了隐患限期整改告知书(编号:<text type="text" style="width: 250rpx;" >{{fcCode}}</text>),经对你单位整改情况进行复查,提出如下意见:</view>
-  <textarea  disabled="disabled" value="{{opinion}}"></textarea>
-  <view class="flex_row text_ind">现告知你单位对上述问题于 <input type="text" style="width: 400rpx;" disabled="disabled" value="{{lasttime}}"/> 前整改完毕,达到有关法律法规规章和标准规定的要求。由此造成应当采取措施,确保安全生产。</view>
-  <view class="flex_row text_ind">逾期未整改或在整改过程中存在安全生产违法行为的,我单位将提报相关执法部门进行依法查处。</view>
-  <view class="flex_row text_ind">如果对本告知内容有异议,可向<input type="text" style="width: 400rpx;"  disabled="disabled" value="{{askCompany}}"/>咨询或说明情况,也可通过12350安全生产举报电话进行反映。在没有新书面告知前,本告知要求不停止执行,法律另有规定的除外。</view>
-
-  <!-- <view class="flex_row mar_top">检查人员:{{nickname}}</view>
-  <view class="flex_row mar_top">
-    <text>检查人员编号:</text><input type="text" style="width: 400rpx;"  disabled="disabled" value="{{checker1Code}}"/>
-  </view> -->
-  <view class="flex_row mar_top txt_vi">
-    <text>检查人员(签名):</text>
-    <image wx:if="{{qianming01 != undefined && qianming01 != null}}" src="{{qianming01}}" class="qm_img"></image>
-  </view>
-  <view class="flex_row mar_top">
-    <text>检查人员编号:</text><input type="text" style="width: 400rpx;"  disabled="disabled" value="{{checker1Code}}"/>
-  </view>
-  <view class="flex_row mar_top txt_vi">
-    <text>检查人员(签名):</text>
-    <image wx:if="{{qianming02 != undefined && qianming02 != null}}" src="{{qianming02}}" class="qm_img"></image>
-  </view>
-  <view class="flex_row mar_top">
-    <text>检查人员编号:</text><input type="text" style="width: 400rpx;"  disabled="disabled" value="{{checker2Code}}"/>
-  </view>
-  <view class="flex_row mar_top txt_vi">
-    <text>被复查单位负责人(签名):</text>
-    <image wx:if="{{qianming03 != undefined && qianming03 != null}}" src="{{qianming03}}" class="qm_img"></image>
-  </view>
-  <view class="flex_row mar_top2 sign_layout_parent">
-    <view style="text-align: right;" wx:if="{{signature != undefined && signature != null}}">
-      <view style="text-align: right;"><text type="text" style="width: 340rpx;" />{{deptName}}</view>
-      <view style="text-align: right;"><text type="text" style="width: 340rpx;" />{{checkTime}}</view>
-      <view class="sign_layout" style="text-align: right; ">
-        <image src="{{signature}}" class="sign_img"></image>
-      </view>
-    </view>
-
-  </view>
-  <view style="height: 20rpx;"></view>
-</view>

+ 0 - 76
pages/fcdetail/fcdetail.wxss

@@ -1,76 +0,0 @@
-.container{
-  margin: 30rpx;
-}
-.zg_bh{
-  display: flex;
-  flex-direction: row;
-  color: #666;
-}
-input{
-  border-bottom: 1px solid rgb(238, 238, 238);
-  height: 50rpx;
-  line-height: 50rpx;
-}
-.con_tit{
-  text-align: center;
-  height: 100rpx;
-  line-height: 100rpx;
-  font-size: 44rpx;
-  display: block;
-}
-.flex_row{
-  margin-bottom: 20rpx;
-  line-height: 70rpx;
-  font-size: 34rpx;
-  color: #333;
-}
-.flex_row input{
-display: inline-table;
-padding: 0px 10rpx;
-text-align: center;
-}
-.text_ind{
-  text-indent:60rpx;
-}
-textarea{
-  border: 1px solid rgb(238, 238, 238);
-  outline: 0px;
-  padding: 1%;
-  width: 98%;
-  margin-bottom: 20rpx;
-}
-.mar_top{
-  margin-top: 10rpx;
-}
-.mar_top2{
-  margin-top: 30rpx;
-}
-button{
-  width: 70%!important;
-  margin: 50rpx auto;
-}
-.qm_img{
-  width: 200rpx;
-  height: 160rpx;
-}
-.txt_vi{
-  display: flex;
-}
-.width_400{
-width:400rpx ;
-}
-.color_red{
-  color: #f00;
-}
-.sign_img{
-  width: 220rpx;
-  height: 220rpx;
-}
-.sign_layout_parent{
-  position: relative;
-}
-.sign_layout{
-  position: absolute;
-  top: -40%;
-  right: 35rpx;
-}

+ 8 - 353
pages/index/index.js

@@ -8,141 +8,31 @@ Page({
 
     host: app.globalData.host,
 
-    current: 0, //当前所在页面的 index
-
-    indicatorDots: true, //是否显示面板指示点
-
-    autoplay: true, //是否自动切换
-
-    interval: 3000, //自动切换时间间隔
-
-    duration: 800, //滑动动画时长
-
-    circular: true, //是否采用衔接滑动
-
-    imgUrls: [
-
-      // '../images/banner.jpg',
-
-      // '../images/banner3.jpg',
-
-      // '../images/banner2.jpg'
-
-    ],
-
-    links: [
-
-      // '/pages/second/register',
-
-      // '/pages/second/register',
-
-      // '/pages/second/register'
-
-    ],
-
-    //功能数据-孙一石
-    //记录首页点击-登录后继续跳转
+    current: 0, //当前所在页面的 index    
     dofun: null,
     xunjianImgCount: '000,000',
     NoticeTitle: "登录查看公告",
     noticeItem: '',
-    // mList: null,
+    
   },
   onReady() {
-    // this.popup = this.selectComponent("#popup");
+  
   },
-  // showPopup() {
-  //   this.setData({
-  //     mList: this.data.mList
-  //   })
-  //   this.popup.showPopup();
-  // },
-  //取消事件
-  // _error() {
-  //   console.log('你点击了取消');
-  //   this.popup.hidePopup();
-  // },
-  // //确认事件
-  // _success() {
-  //   console.log('你点击了确定');
-  //   this.popup.hidePopup();
-  // },
-
+  
   onLoad() {
-    this.setData({
-      imgUrls: [
-        this.data.host + '/images/banner.jpg',
-        this.data.host + '/images/banner3.jpg',
-        this.data.host + '/images/banner2.jpg'
-      ]
-
-    })
+   
 
   
   },
-  // requestPopupData() {
-  //   // wx.navigateTo({
-  //   //   url: '../early_warning_list/early_warning_list',
-  //   // })
-  //   if (app.globalToken == null || app.globalToken == '') {
-  //     return
-  //   }
-  //   http.send_get("/system/AppIndexController/getLateInspectionList", null, this.getListSuccess)
-  // },
-
-  // menuItemClick(res) {
-  //   let busInspectionId = res.detail.iteminfo.busInspectionId
-  //   let buslogid = res.detail.iteminfo.busLogId
-  //   wx.navigateTo({
-  //     url: '../zhenggaijindu/zhenggaijindu?busInspectionId=' + busInspectionId + "&buslogId=" + buslogid,
-  //   })
-  // },
+  
+  
   onShow() {
-    // if (app.globalToken == null) {
-    //   wx.showToast({
-    //     title: '尚未登录,登录后即可使用',
-    //     icon: 'none'
-    //   })
-    // }
+
     
-    // this.requestPopupData()
-    this.initIndexPage();
   },
 
-  // 待办跳转
-  bindViewDaiBan() {
-    // wx.navigateTo({
-    // url: '../daiban/daiban'
-    // })
-  },
-  // 企业跳转
-  bindViewQiYe() {
-    if (app.globalToken == null) {
-      wx.showToast({
-        title: '尚未登录,登录后即可使用',
-        icon: 'none'
-      })
-      return
-    }
 
-    wx.navigateTo({
-      url: '../qiye/qiye'
-    })
-  },
-  // 巡查跳转
-  bindViewXunCha() {
 
-    if (app.globalToken == null) {
-      wx.showToast({
-        title: '尚未登录,登录后即可使用',
-        icon: 'none'
-      })
-      return
-    }
-    wx.navigateTo({
-      url: '../xuncha/xuncha'
-    })
-  },
   // 通知公告更多跳转
   bindViewGengDuo() {
     if (app.globalToken == null) {
@@ -156,207 +46,6 @@ Page({
       url: '../notice/notice'
     })
   },
-  //物资跳转
-  bindViewWuZi() {
-    if (app.globalToken == null) {
-      wx.showToast({
-        title: '尚未登录,登录后即可使用',
-        icon: 'none'
-      })
-      return
-    }
-    wx.navigateTo({
-      url: '../material/material',
-    })
-  },
-  //队伍跳转
-  bindViewDuiWu() {
-    if (app.globalToken == null) {
-      wx.showToast({
-        title: '尚未登录,登录后即可使用',
-        icon: 'none'
-      })
-      return
-    }
-    wx.navigateTo({
-      url: '../teamlist/teamlist',
-    })
-  },
-  //仓库跳转
-  bindViewCangKu() {
-    if (app.globalToken == null) {
-      wx.showToast({
-        title: '尚未登录,登录后即可使用',
-        icon: 'none'
-      })
-      return
-    }
-    wx.navigateTo({
-      url: '../warehouselist/warehouselist',
-    })
-  },
-  // 新手指南跳转
-  bindViewNewComer() {
-    wx.navigateTo({
-      url: '../newcomer/newcomer',
-    })
-  },
-  //巡检跳转
-  bindViewXunJian() {
-    if (app.globalToken == null) {
-      wx.showToast({
-        title: '尚未登录,登录后即可使用',
-        icon: 'none'
-      })
-      return
-    }
-    wx.navigateTo({
-      url: '../search/search',
-    })
-  },
-  //巡更跳转
-  bindViewXungeng() {
-    if (app.globalToken == null) {
-      wx.showToast({
-        title: '尚未登录,登录后即可使用',
-        icon: 'none'
-      })
-      return
-    }
-    this.scan()
-  },
-
-  scan() {
-
-    wx.scanCode({
-      onlyFromCamera: true,
-      success: (res) => {
-
-
-        wx.navigateTo({
-          url: '../xungengdetails/xungengdetails?id=' + res.result,
-        })
-
-
-
-      },
-
-      fail: (res) => {
-
-        // console.log(res);
-        //  wx.showToast({
-        //   title: '扫描失败',
-        //   icon:'none'
-        // })
-
-      }
-
-    })
-
-  },
-  // 使用攻略跳转
-  bindViewIntroduction() {
-
-    wx.navigateTo({
-      url: '../Introduction/Introduction'
-    })
-  },
-  bindViewXunjianimg() {
-    if (app.globalToken == null) {
-      wx.showToast({
-        title: '尚未登录,登录后即可使用',
-        icon: 'none'
-      })
-      return
-    }
-    wx.navigateTo({
-      url: '../xunjianimg/xunjianimg'
-    })
-  },
-
-  // 图片轮播
-  //轮播图的切换事件
-
-  swiperChange: function (e) {
-
-    this.setData({
-
-      swiperCurrent: e.detail.current
-
-    })
-
-  },
-
-  //点击指示点切换
-
-  chuangEvent: function (e) {
-
-    this.setData({
-
-      swiperCurrent: e.currentTarget.id
-
-    })
-
-  },
-  //点击图片触发事件
-
-  swipclick: function (e) {
-
-    // console.log(this.data.swiperCurrent);
-
-    wx.switchTab({
-
-      // url: this.data.links[this.data.swiperCurrent]
-
-    })
-
-  },
-
-  //首页功能js-孙一石
-  init_userInfo(e) {
-    this.data.dofun = e.currentTarget.dataset.fun
-    // let that = this
-    // if (app.globalToken == null) {
-    //   http.showLoading()
-    //   wx.getUserProfile({
-    //     desc: 'desc',
-    //     success: (res) => {
-    //       this.getSysUserInfo(res.userInfo)
-    //     },
-    //     fail: res => {
-    //       console.log(res)
-    //     },
-
-    //   })
-    // } else {
-    this.callByName(this.data.dofun)
-    // }
-  },
-
-
-
-  callByName(name) {
-    if (name == "bindViewDaiBan") {
-      //待办
-      this.bindViewDaiBan()
-    } else if (name == "bindViewQiYe") {
-      //企业
-      this.bindViewQiYe()
-    } else if (name == "bindViewXunCha") {
-      this.bindViewXunCha()
-    } else if (name == "bindViewXunjianimg") {
-      this.bindViewXunjianimg()
-    } else if (name == "bindViewGengDuo") {
-      this.bindViewGengDuo()
-    } else if (name == "bindViewWuZi") {
-      this.bindViewWuZi()
-    } else if (name == "bindViewDuiWu") {
-      this.bindViewDuiWu()
-    } else if (name == "bindViewCangKu") {
-      this.bindViewCangKu()
-    }
-  },
-
   initIndexPage() {
     if (app.globalToken == null || app.globalToken == '') {
       return
@@ -388,41 +77,7 @@ Page({
 
   },
 
-  getListSuccess(res) {
-    if (res.code == 200) {
-
-      var popInfo = res.data.late_inspection_list
-      console.log(popInfo)
-      if (res.data != null && res.data.late_inspection_list != null && res.data.late_inspection_list.length > 0) {
-        // this.data.mList = res.data.late_inspection_list
-        // // this.showPopup()
-        // this.popup.showPopup()
-        // this.setData({
-        //   mList: this.data.mList
-        // })
-        // setTimeout(() => {
-        //   this.popup.hidePopup();
-        // }, 2000)
-        wx.showModal({
-          title: '是否需要确认预警?',
-          content: '',
-          complete: (res) => {
-            if (res.cancel) {
-
-            }
-
-            if (res.confirm) {
-              wx.navigateTo({
-                url: '../early_warning_list/early_warning_list',
-              })
-            }
-          }
-        })
-      } else {
 
-      }
-    }
-  },
 
   goNoticeDetails(e) {
 

+ 7 - 127
pages/index/index.wxml

@@ -1,144 +1,24 @@
 <!--index.wxml-->
-<!-- 自定义顶部栏 -->
-<view class="nav-bar">
- <image src="{{host}}/images/top_nav_03.png"  class="nav-bar-img"/>
-<view class="nav-barback" ></view>
-</view>
+
 <!-- 占位,高度与顶部栏一样 -->
 <view style="height:450rpx;"></view>
 <view class="container">
-<view class="bg">
-  <image src="{{host}}/images/top_nav_05.png" class="img" mode="widthFix" />
-</view>
+
 
   <!-- 头部图片 -->
   <view class="head_banner wid15"></view>
-  <!-- 快速跳转按钮 -->
-  <view class="nav">
-    <view class="item" bindtap="bindViewCangKu" data-fun="bindViewCangKu">
-      <image class="img" src="{{host}}/images/nav_db.png" />
-      <text>仓库</text>
-    </view>
-    <!-- <view class="icon_vi" bindtap="bindViewCangKu">
-        <view class="icon_bg icon_ck">
-        <i class="iconfont icon-cangkukucun"></i>
-      </view>
-        <text>仓库</text>
-      </view> -->
-    <view class="item" bindtap="bindViewQiYe" data-fun="bindViewQiYe">
-      <image class="img" src="{{host}}/images/nav_qy.png" />
-      <text>企业</text>
-    </view>
-    <view class="item" bindtap="bindViewXunCha" data-fun="bindViewXunCha">
-      <image class="img" src="{{host}}/images/nav_xc.png" />
-      <text>巡查</text>
-    </view>
-  </view>
-  <!-- 分割线 -->
-  <!-- 新手指南 使用攻略 -->
-  <view class="top_banner">
-<view class="fg_line">
-  <image src="{{host}}/images/line1.png"/>
-</view>
-    <p bindtap="init_userInfo" data-fun="bindViewXunjianimg">安全隐患</p>
-    <h1 bindtap="init_userInfo" data-fun="bindViewXunjianimg">{{xunjianImgCount}}</h1>
-    <span bindtap="init_userInfo" data-fun="bindViewXunjianimg">- 急事办 -</span>
-
-    <view class="xszn top_banner_btn" open-type="contact" style="width:unset" bindtap="bindViewNewComer">
-      <span>新手指南</span>
-      <i>newcomer</i>
-    </view>
-    <view class="sygl top_banner_btn" open-type="contact" style="width:unset" bindtap="bindViewIntroduction">
-      <span>使用攻略</span>
-    </view>
-    <view class="fg_line">
-      <image src="{{host}}/images/line2.png"/>
-    </view>
-  </view>
 
+  
   <!-- 通知公告 -->
   <view class="tzgg">
-  <view class="img"><image src="{{host}}/images/xcx_lb.png" /></view>
+ 
     <!-- <b>[待办]</b> -->
     <text catchtap="goNoticeDetails"data-item='{{noticeItem}}'>{{NoticeTitle}} </text>
     <view class="more" data-fun="bindViewGengDuo" bindtap="init_userInfo">更多></view>
   </view>
-  <!-- 中间图片banner -->
-  <!-- <view class="con_banner">
-<image class="img" src="../images/banner.jpg" mode="widthFix"/>
-</view> -->
-  <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}">
-    <block wx:for="{{imgUrls}}">
-      <swiper-item>
-        <image src="{{item}}" class="slide-image" />
-      </swiper-item>
-    </block>
-  </swiper>
-  <!-- 应急通道 -->
-  <view class="yjtd_vi">
-    <view class="tittle">
-      <image class="img" src="{{host}}/images/yjtd.png" />
-      <span>应急通道</span>
-      <u>安全第一,预防为主!</u>
-    </view>
-    <view class="line2"></view>
-    <view class="yjtd_icon">
-      <view class="icon_vi" bindtap="bindViewXungeng">
-      <view class="icon_bg icon_xg">
-        <i class="iconfont icon-xunjiandian"></i>
-      </view>
-        <text>巡更</text>
-      </view>
-      <view class="icon_vi" bindtap="bindViewXunJian">
-        <view class="icon_bg icon_xj">
-        <i class="iconfont icon-xunjianjilu"></i>
-      </view>
-        <text>巡检</text>
-      </view>
-      <!-- <view class="icon_vi">
-        <view class="icon_bg icon_yj">
-        <i class="iconfont icon-yingjizhongxin"></i>
-      </view>
-        <text>应急</text>
-      </view> -->
-      <!-- <view class="icon_vi">
-        <view class="icon_bg icon_hy">
-        <i class="iconfont icon-huiyi"></i>
-      </view>
-        <text>会议</text>
-      </view> -->
-      <view class="icon_vi" bindtap="bindViewWuZi">
-        <view class="icon_bg icon_wz">
-        <i class="iconfont icon-wuzichubei"></i>
-      </view>
-        <text>物资</text>
-      </view>
-      <!-- <view class="icon_vi" bindtap="bindViewCangKu">
-        <view class="icon_bg icon_ck">
-        <i class="iconfont icon-cangkukucun"></i>
-      </view>
-        <text>仓库</text>
-      </view> -->
-      <view class="icon_vi" bindtap="bindViewDuiWu">
-        <view class="icon_bg icon_dw">
-        <i class="iconfont icon-dangjian_duiwujianshe"></i>
-      </view>
-        <text>队伍</text>
-      </view>
-    </view>
-  </view>
-   <!-- <button bindtap="requestPopupData"> 点我 </button> -->
-  <!-- <popup id='popup'
-      title='小组件'
-      content='学会了吗'
-      btn_no='没有'
-      btn_ok='学会了'
-      bind:error="_error" 
-      bind:success="_success"
-      menulist="{{mList}}" 
-      mainmodel="{{mainmodel}}"
-      bindmenuItemClick="menuItemClick" >
 
-  </popup> -->
+  
+  
+
 
 </view>

+ 0 - 211
pages/maillist/maillist.js

@@ -1,211 +0,0 @@
-// pages/maillist.js
-import http from '../../base/httputil'
-const app = getApp()
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
- /**
-     * 控制上拉到底部时是否出现 "数据加载中..."
-     */
-    hidden: true,
-    /**
-     * 数据是否正在加载中,避免数据多次加载
-     */
-    loadingData: false,
-    bookList: [],
-    isRefresh: true,
-    total: 0,
-    pageNum: 1 // 页码
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (){
-    this.loadData()
-   
-  },
-
-  loadData(){
-    let obj = new Object()
-    obj.nickName = ""
-    obj.pageNum = this.data.pageNum
-    obj.pageSize = 10
-    obj.reasonable = false
-
-   
-    http.send_get("/system/AppPBookController/getPBookList", obj, this.getBookListSuccess)
-  },
-  getBookListSuccess(res) {
-
-    
-    if (res.code == 200) {
-      // 显示加载图标
-      wx.showLoading({
-        title: '玩命加载中',
-      })
-      var that = this
-
-      if (res.data.rows.length == 0) {
-        wx.showToast({
-          title: '暂无更多数据',
-          icon: "none"
-        })
-      }
-      if (this.data.isRefresh) {
-        this.setData({
-          bookList: res.data.rows,
-          total: res.data.total
-        })
-
-
-
-        // 隐藏导航栏加载框
-        setTimeout(function () {
-          that.setData({
-            loadingData: false
-          });
-          wx.hideNavigationBarLoading();
-          // 停止下拉动作
-          wx.stopPullDownRefresh();
-          wx.hideLoading()
-
-        }, 1000)
-
-      } else {
-        this.setData({
-          bookList: this.data.bookList.concat(res.data.rows)
-        })
-        // 隐藏加载框
-
-        setTimeout(function () {
-          that.setData({
-            hidden: true,
-            loadingData: false
-          });
-
-          wx.hideLoading();
-        }, 1000)
-
-      }
-    } else {
-      
-    }
-  },
-  onPullDownRefresh: function () {
-    
-    // 显示顶部刷新图标
-    wx.showNavigationBarLoading();
-    var that = this;
-    var loadingData = this.data.loadingData
-    if (loadingData) {
-      return;
-    }
-    that.setData({
-      pageNum: 1,
-      isRefresh: true
-    })
-    this.loadData()
-  },
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-    let that = this
-    var loadingData = that.data.loadingData
-
-    var hidden = that.data.hidden
-    // 页数+1
-    that.setData({
-      pageNum: that.data.pageNum + 1,
-      isRefresh: false
-    })
-    if (hidden) {
-      that.setData({
-        hidden: false
-      });
-      console.info(that.data.hidden);
-    }
-
-    if (loadingData) {
-      return;
-    }
-    that.setData({
-      loadingData: true
-    });
-
-
-    //console.log("@@@@"+Math.ceil(this.data.total/10))
-    // if(Math.ceil(that.data.total/10)>=that.data.pageNum){
-    that.loadData();
-
-    // }else{
-
-    //   setTimeout(function () {
-    //     that.setData({
-    //       hidden: true,
-    //     });
-
-    //   }, 2000)
-    // }
-
-
-  },
-
-  // 搜索结果跳页
-  bindViewSearchEnd() {
-    wx.navigateTo({
-      url: '../maillist/serch/maillist_serch'
-    })
-  },
-  Call(e){
-    let phone = e.currentTarget.dataset.index
-    if(phone.phonenumber!=""){
-      wx.makePhoneCall({
-        phoneNumber: phone.phonenumber
-      })
-    }else{
-      wx.showToast({
-        title: '该联系人暂无电话',
-        icon:'error'
-      })
-    }
-
-  },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
- 
-
- 
-
-
-})

+ 0 - 14
pages/maillist/maillist.json

@@ -1,14 +0,0 @@
-{
-  "component": true, 
-  "usingComponents": {
-  },
-
-
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "enablePullDownRefresh": true,
-  "onPullDownRefresh": true,
-  "onReachBottom": true,
-  "navigationBarTitleText": "通讯录"
-
-}

+ 0 - 32
pages/maillist/maillist.wxml

@@ -1,32 +0,0 @@
-<!--pages/maillist.wxml-->
-<view class="container">
-  <!-- 搜索 -->
-
-  <view class="search-container">
-    <view class="search-left">
-      <input type="text" bindtap="bindViewSearchEnd" placeholder="搜索" />
-    </view>
-    <button bindtap="bindViewSearchEnd" class="search-right">
-      <text class="iconfont icon-sousuo"></text>
-    </button>
-  </view>
-
-  <!-- 列表 -->
-  <view class="list_vi2">
-    <view class="list_li4" catchtap="Call" wx:for="{{bookList}}" wx:key="index" data-index="{{item}}">
-      <view class="txl_img"><i class="iconfont icon-yonghutouxiang"></i></view>
-      <view class="txl_txt">
-        <text>{{item.nickName}}</text>
-        <i>{{item.phonenumber}}</i>
-      </view>
-    </view>
-  
-
-  </view>
-
-
-
-  <view class='data-loading' hidden='{{hidden}}'>
-    数据加载中...
-  </view>
-</view>

+ 0 - 8
pages/maillist/maillist.wxss

@@ -1,8 +0,0 @@
-/* pages/maillist.wxss */
-.data-loading {
-  height: 100rpx;
-  line-height: 100rpx;
-  background-color: #fff;
-  text-align: center;
-  font-size: 14px;
-}

+ 0 - 235
pages/maillist/serch/maillist_serch.js

@@ -1,235 +0,0 @@
-// pages/maillist.js
-import http from '../../../base/httputil'
-const app = getApp()
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
- /**
-     * 控制上拉到底部时是否出现 "数据加载中..."
-     */
-    hidden: true,
-    /**
-     * 数据是否正在加载中,避免数据多次加载
-     */
-    loadingData: false,
-    bookList: [],
-    isRefresh: true,
-    total: 0,
-    pageNum: 1 ,// 页码
-    serchValue:""
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (){
-   // this.loadData()
-   
-  },
-  searchEnterprise(e) {
-    var obj = new Object()
-    //每次搜索初始化数据
-    this.setData({
-      serchValue: e.detail.value,
-      bookList: [],
-      hidden: true,
-      loadingData: false,
-      isRefresh: true,
-      total: 0,
-      pageNum: 1, // 页
-    })
-    obj.nickName = e.detail.value
-    obj.pageNum = this.data.pageNum
-    obj.pageSize = 10
-    obj.reasonable = false
-    this.loadData(obj)
-
-  },
-
-
-  loadData(data){
-    http.send_get("/system/AppPBookController/getPBookList", data, this.getBookListSuccess)
-  },
-  getBookListSuccess(res) {
-
-   
-    if (res.code == 200) {
-      // 显示加载图标
-      wx.showLoading({
-        title: '玩命加载中',
-      })
-      var that = this
-
-      if (res.data.rows.length == 0) {
-        wx.showToast({
-          title: '暂无更多数据',
-          icon: "none"
-        })
-      }
-      if (this.data.isRefresh) {
-        this.setData({
-          bookList: res.data.rows,
-          total: res.data.total
-        })
-
-
-
-        // 隐藏导航栏加载框
-        setTimeout(function () {
-          that.setData({
-            loadingData: false
-          });
-          wx.hideNavigationBarLoading();
-          // 停止下拉动作
-          wx.stopPullDownRefresh();
-          wx.hideLoading()
-
-        }, 1000)
-
-      } else {
-        this.setData({
-          bookList: this.data.bookList.concat(res.data.rows)
-        })
-        // 隐藏加载框
-
-        setTimeout(function () {
-          that.setData({
-            hidden: true,
-            loadingData: false
-          });
-
-          wx.hideLoading();
-        }, 1000)
-
-      }
-    } else {
-      
-    }
-  },
-  onPullDownRefresh: function () {
-    if (this.data.serchValue == "") {
-      wx.showToast({
-        title: '请输入搜索内容',
-        icon: 'error'
-      })
-      return
-    }
-    // 显示顶部刷新图标
-    wx.showNavigationBarLoading();
-    var that = this;
-    var loadingData = this.data.loadingData
-    if (loadingData) {
-      return;
-    }
-    that.setData({
-      pageNum: 1,
-      isRefresh: true
-    })
-    let obj = new Object()
-    obj.pageNum = this.data.pageNum
-    obj.nickName = this.data.serchValue
-    obj.pageSize = 10
-    obj.reasonable = false
-    this.loadData(obj)
-  },
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-    let that = this
-    var loadingData = that.data.loadingData
-
-    var hidden = that.data.hidden
-    // 页数+1
-    that.setData({
-      pageNum: that.data.pageNum + 1,
-      isRefresh: false
-    })
-    if (hidden) {
-      that.setData({
-        hidden: false
-      });
-      console.info(that.data.hidden);
-    }
-
-    if (loadingData) {
-      return;
-    }
-    that.setData({
-      loadingData: true
-    });
-
-
-    //console.log("@@@@"+Math.ceil(this.data.total/10))
-    // if(Math.ceil(that.data.total/10)>=that.data.pageNum){
-      let obj = new Object()
-      obj.pageNum = that.data.pageNum
-      obj.nickName = that.data.serchValue
-      obj.pageSize = 10
-      obj.reasonable = false
-    that.loadData(obj);
-
-    // }else{
-
-    //   setTimeout(function () {
-    //     that.setData({
-    //       hidden: true,
-    //     });
-
-    //   }, 2000)
-    // }
-
-
-  },
-
-  
-  Call(e){
-    let phone = e.currentTarget.dataset.index
-    if(phone.phonenumber!=""){
-    wx.makePhoneCall({
-      phoneNumber: phone.phonenumber
-    })
-  }else{
-    wx.showToast({
-      title: '该联系人暂无电话',
-      icon:'error'
-    })
-  }
-  },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
- 
-
- 
-
-
-})

+ 0 - 14
pages/maillist/serch/maillist_serch.json

@@ -1,14 +0,0 @@
-{
-  "component": true, 
-  "usingComponents": {
-  },
-
-
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "enablePullDownRefresh": true,
-  "onPullDownRefresh": true,
-  "onReachBottom": true,
-  "navigationBarTitleText": "通讯录"
-
-}

+ 0 - 31
pages/maillist/serch/maillist_serch.wxml

@@ -1,31 +0,0 @@
-<!--pages/maillist.wxml-->
-<view class="container">
-  <!-- 搜索 -->
-  <view class="search-container">
-    <view class="search-left">
-      <input type="text" bindinput="searchEnterprise" placeholder="搜索" />
-    </view>
-    <button bindtap="bindViewSearchEnd" class="search-right">
-      <text class="iconfont icon-sousuo"></text>
-    </button>
-  </view>
-
-  <!-- 列表 -->
-  <view class="list_vi2">
-    <view class="list_li4" catchtap="Call" wx:for="{{bookList}}" wx:key="index" data-index="{{item}}">
-      <view class="txl_img"><i class="iconfont icon-yonghutouxiang"></i></view>
-      <view class="txl_txt">
-        <text>{{item.nickName}}</text>
-        <i>{{item.phonenumber}}</i>
-      </view>
-    </view>
-  
-
-  </view>
-
-
-
-  <view class='data-loading' hidden='{{hidden}}'>
-    数据加载中...
-  </view>
-</view>

+ 0 - 8
pages/maillist/serch/maillist_serch.wxss

@@ -1,8 +0,0 @@
-/* pages/maillist.wxss */
-.data-loading {
-  height: 100rpx;
-  line-height: 100rpx;
-  background-color: #fff;
-  text-align: center;
-  font-size: 14px;
-}

+ 0 - 109
pages/material/details/material_details.js

@@ -1,109 +0,0 @@
-// pages/material/material_details.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    connector: "",
-    connectorPhone: "",
-    createBy: "",
-    createTime: "",
-
-    materialName: "",
-    materialParms: "",
-    materialType: "",
-    num: "",
-
-    productionDate: "",
-    purpose: "",
-    remark: "",
-    searchValue: "",
-    technology: "",
-
-    warehouseName: ""
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-    let details = JSON.parse(options.details)
-    this.setData({
-      connector: details.connector,
-      connectorPhone: details.connectorPhone,
-      createBy: details.createBy,
-      createTime: details.createTime,
-
-      materialName: details.materialName,
-      materialParms: details.materialParms,
-      materialType: details.materialType,
-      num: details.num,
-
-      productionDate: details.productionDate,
-      purpose: details.purpose,
-      remark: details.remark,
-      searchValue: details.searchValue,
-      technology: details.technology,
-
-      warehouseName: details.warehouseName
-
-    })
-
-  },
-//拨打电话
-Call() {
- 
-  wx.makePhoneCall({
-    phoneNumber: this.data.connectorPhone
-  })
-},
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

+ 0 - 13
pages/material/details/material_details.json

@@ -1,13 +0,0 @@
-{
-  "component": true, 
-  "usingComponents": {
-    
-  },
-
-
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "物资详情"
-
-}
-

+ 0 - 62
pages/material/details/material_details.wxml

@@ -1,62 +0,0 @@
-<!-- 物资详情页面 -->
-<view class="container">
-  <view class="notice_tit">
-
-  <view class="tit"><i class="iconfont icon-dian"></i>物资名称</view>
-    <view class="bor">
-  <i>{{materialName}}</i>
-  </view>
-  <view class="tit"><i class="iconfont icon-dian"></i>所属仓库名称</view>
-    <view class="bor">
-  <i>{{warehouseName}}</i>
-  </view>
-  <view class="tit"><i class="iconfont icon-dian"></i>负责人</view>
-    <view class="bor">
-  <i>{{connector}}</i>
-  </view>
-  <view class="tit"><i class="iconfont icon-dian"></i>联系电话</view>
-    <view class="bor"bindtap="Call">
-    <i class="iconfont icon-weibiaoti--"></i>
-  <i class="phone" >{{connectorPhone}}</i>
-
-  </view>
-  <!-- <view class="tit"><i class="iconfont icon-dian"></i>创建人</view>
-    <view class="bor">
-  <i>{{createBy}}</i>
-  </view> -->
-  <view class="tit"><i class="iconfont icon-dian"></i>生产日期</view>
-    <view class="bor">
-  <i>{{productionDate}}</i>
-  </view>
-  <view class="tit"><i class="iconfont icon-dian"></i>技术状况</view>
-    <view class="bor">
-  <i>{{technology}}</i>
-  </view>
-  <view class="tit"><i class="iconfont icon-dian"></i>品牌、型号</view>
-    <view class="bor">
-  <i>{{materialParms}}</i>
-  </view>
-  <view class="tit"><i class="iconfont icon-dian"></i>主要功能和用途</view>
-    <view class="bor">
-  <i>{{purpose}}</i>
-  </view>
-  <view class="tit"><i class="iconfont icon-dian"></i>物资类型</view>
-    <view class="bor">
-  <i>{{materialType}}</i>
-  </view>
-  <view class="tit"><i class="iconfont icon-dian"></i>数量</view>
-    <view class="bor">
-  <i>{{num}}</i>
-  </view>
-  <view class="tit"><i class="iconfont icon-dian"></i>备注</view>
-    <view class="bor">
-  <i>{{remark}}</i>
-  </view>
-<!-- <view class="phone" bindtap="Call">
-  <span>负责人电话:</span>
-  <i>{{enterpriseDetails.mainPersonPhone}}</i>
-</view> -->
-
-</view>
-</view>
-

+ 0 - 46
pages/material/details/material_details.wxss

@@ -1,46 +0,0 @@
-/* pages/material/material_details.wxss */
-.container{
-  margin: 30rpx 30rpx;
-}
-.notice_tit{
-  font-size: 32rpx;
-color: #181818;
-text-align: left;
-display: flex;
-flex-direction: column;
-}
-.tit{
-  color: #f94b0e;
-  list-style: circle;
-  font-size: 34rpx;
-  font-weight: 500;
-  height: 60rpx;
-  line-height: 60rpx;
-  margin-bottom: 30rpx;
-}
-.notice_tit_s{
-  display: flex;
-  flex-direction: column;
-  align-items: left;
-  padding-bottom: 40rpx;
-}
-.notice_tit_s i{
-  font-size: 32rpx;
-  color: #181818;
-}
-.bor{
-  width: 92%;
-  padding: 3% 4%;
-  box-shadow: 0px 0px 10rpx #e9e9e9;
-  border-radius: 14rpx;
-  margin-bottom: 30rpx;
-}
-.icon-weibiaoti--{
-  font-size: 36rpx;
-  color: #ffaa8a;
-  margin-right: 14rpx;
-}
-.icon-dian{
-  font-size: 38rpx;
-  color: #f94b0e;
-}

+ 0 - 172
pages/material/material.js

@@ -1,172 +0,0 @@
-import http from '../../base/httputil'
-const app = getApp()
-
-Page({
-  data: {
-
-    /**
-     * 控制上拉到底部时是否出现 "数据加载中..."
-     */
-    hidden: true,
-    /**
-     * 数据是否正在加载中,避免数据多次加载
-     */
-    loadingData: false,
-    enterpriseList: [],
-    isRefresh: true,
-    total: 0,
-    pageNum: 1 // 页码
-  },
-  onLoad: function () {
-    // wx.showLoading({
-    //   title: '加载中'
-    // })
-    this.loadData()
-  },
-  //加载数据
-  loadData: function () {
-    let obj = new Object()
-    obj.pageNum = this.data.pageNum
-    obj.pageSize = 10
-    obj.reasonable = false
-    http.send_get("/system/AppMaterialController/geMaterialList", obj, this.getQiyeEnterpriseListSuccess)
-
-
-  },
-
-  getQiyeEnterpriseListSuccess(res) {
-
-
-    if (res.code == 200) {
-      // 显示加载图标
-      wx.showLoading({
-        title: '玩命加载中',
-      })
-      var that = this
-
-      if (res.data.rows.length == 0) {
-        wx.showToast({
-          title: '暂无更多数据',
-          icon: "none"
-        })
-        that.setData({
-          hidden: true,
-          loadingData: false
-        });
-      }
-      if (this.data.isRefresh) {
-        this.setData({
-          enterpriseList: res.data.rows,
-          total: res.data.total
-        })
-
-
-
-        // 隐藏导航栏加载框
-        setTimeout(function () {
-          that.setData({
-            loadingData: false
-          });
-          wx.hideNavigationBarLoading();
-          // 停止下拉动作
-          wx.stopPullDownRefresh();
-          wx.hideLoading()
-
-        }, 1000)
-
-      } else {
-        this.setData({
-          enterpriseList: this.data.enterpriseList.concat(res.data.rows)
-        })
-        // 隐藏加载框
-
-        setTimeout(function () {
-          that.setData({
-            hidden: true,
-            loadingData: false
-          });
-
-          wx.hideLoading();
-        }, 1000)
-
-      }
-    } else {
-      //("@@!", "请求失败")
-    }
-  },
-  onPullDownRefresh: function () {
-    // 显示顶部刷新图标
-    wx.showNavigationBarLoading();
-    var that = this;
-    var loadingData = this.data.loadingData
-    if (loadingData) {
-      return;
-    }
-    that.setData({
-      pageNum: 1,
-      isRefresh: true
-    })
-    this.loadData()
-  },
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-    let that = this
-    var loadingData = that.data.loadingData
-
-    var hidden = that.data.hidden
-    // 页数+1
-    that.setData({
-      pageNum: that.data.pageNum + 1,
-      isRefresh: false
-    })
-    if (hidden) {
-      that.setData({
-        hidden: false
-      });
-      console.info(that.data.hidden);
-    }
-
-    if (loadingData) {
-      return;
-    }
-    that.setData({
-      loadingData: true
-    });
-
-
-    //console.log("@@@@"+Math.ceil(this.data.total/10))
-    // if(Math.ceil(that.data.total/10)>=that.data.pageNum){
-    that.loadData();
-
-    // }else{
-
-    //   setTimeout(function () {
-    //     that.setData({
-    //       hidden: true,
-    //     });
-
-    //   }, 2000)
-    // }
-
-
-  },
-
-  // 搜索结果跳页
-  bindViewSearchEnd() {
-    wx.navigateTo({
-      url: '../material/serch/material_serch'
-    })
-  },
-  bindViewDetails(e) {
-    let material_details = e.currentTarget.dataset.index
-
-
-
-
-    wx.navigateTo({
-      url: '../material/details/material_details?details=' + JSON.stringify(material_details)
-    })
-  }
-})

+ 0 - 14
pages/material/material.json

@@ -1,14 +0,0 @@
-{
-  "component": true, 
-  "usingComponents": {
-  },
-
-
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "enablePullDownRefresh": true,
-  "onPullDownRefresh": true,
-  "onReachBottom": true,
-  "navigationBarTitleText": "物资"
-
-}

+ 0 - 42
pages/material/material.wxml

@@ -1,42 +0,0 @@
-<!--pages/material/material.wxml-->
-<!-- 物资列表页面 -->
-<view class="container">
-  <!-- 搜索 -->
-  <view class="search-container">
-    <view class="search-left">
-      <input type="text" bindtap="bindViewSearchEnd" placeholder="搜索" />
-    </view>
-    <button bindtap="bindViewSearchEnd" class="search-right">
-      <text class="iconfont icon-sousuo"></text>
-    </button>
-  </view>
-  <!-- 列表 -->
-<view class="list_vi">
-    <view class="list_li3" catchtap="bindViewDetails" wx:for="{{enterpriseList}}" wx:key="index" data-index="{{item}}">
-      <!-- <i class="list_icon iconfont icon-queding" wx:if="{{item.riskCount == 0}}"></i>
-      <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.riskCount > 0}}"></i> -->
-      <i class="iconfont icon-wuzichubei"></i>
-      <view class="notice_li">
-      
-      <view class="li_tit">{{item.materialName}}</view>
-      <view class="li_time">
-      <text>所属仓库:{{item.warehouseName}}</text>
-      </view>
-      </view>
-  
-      <i class="iconfont icon-xiangyou list_right"></i>
-    </view>
-
-    <view class='data-loading' hidden='{{hidden}}'>
-    数据加载中...
-  </view>
-</view>
-    </view>
-
-    
-
-
-
-
-
-

+ 0 - 47
pages/material/material.wxss

@@ -1,47 +0,0 @@
-.qy_con {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-around;
-  text-align: center;
-  margin: 30rpx 30rpx;
-}
-
-.qy_con view {
-  height: 140rpx;
-  color: #fff;
-  display: flex;
-  flex-direction: column;
-  padding: 15rpx 40rpx;
-  position: relative;
-}
-
-.qy_con view image {
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  width: 100%;
-  height: 100%;
-  z-index: -1;
-}
-
-.qy_con view h2 {
-  font-size: 58rpx;
-  font-weight: bolder;
-  padding-top: 10rpx;
-}
-
-.qy_con view p {
-  font-size: 35rpx;
-}
-
-.icon-jiahao {
-  font-size: 60rpx;
-}
-
-.data-loading {
-  height: 100rpx;
-  line-height: 100rpx;
-  background-color: #fff;
-  text-align: center;
-  font-size: 14px;
-}

+ 0 - 199
pages/material/serch/material_serch.js

@@ -1,199 +0,0 @@
-import http from '../../../base/httputil'
-const app = getApp()
-Page({
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    host: app.globalData.host,
-    materialList: [],
-    /**
-     * 控制上拉到底部时是否出现 "数据加载中..."
-     */
-    hidden: true,
-    /**
-     * 数据是否正在加载中,避免数据多次加载
-     */
-    loadingData: false,
-    isRefresh: true,
-    total: 0,
-    pageNum: 1, // 页码
-    serchValue: ""
-  },
-  onLoad() {
-    // this.list(null)
-  },
-  // 搜索结果跳页
-  bindViewSearchEnd() {
-    // wx.navigateTo({
-    // url: '../search/search'
-    // })
-  },
-  // 物资详情页
-  bindViewDetails(e) {
-    let material_details = e.currentTarget.dataset.index
-
-    wx.navigateTo({
-      url: '../details/material_details?details=' + JSON.stringify(material_details)
-    })
-  },
-
-  searchEnterprise(e) {
-   
-    var obj = new Object()
-    //每次搜索初始化数据
-    this.setData({
-      serchValue: e.detail.value,
-      materialList: [],
-      hidden: true,
-      loadingData: false,
-      isRefresh: true,
-      total: 0,
-      pageNum: 1, // 页
-    })
-    obj.materialName = e.detail.value
-    obj.pageNum = this.data.pageNum
-    obj.pageSize = 10
-    obj.reasonable = false
-    this.list(obj)
-  },
-
-  list(data) {
-   
-    http.send_get("/system/AppMaterialController/geMaterialList", data, this.getMaterListSuccess)
-  },
-
-  getMaterListSuccess(res) {
-
-    if (res.code == 200) {
-      // 显示加载图标
-      wx.showLoading({
-        title: '玩命加载中',
-      })
-      var that = this
-
-      if (res.data.rows.length == 0) {
-        wx.showToast({
-          title: '暂无更多数据',
-          icon: "none"
-        })
-      }
-      if (this.data.isRefresh) {
-        this.setData({
-          materialList: res.data.rows,
-          total: res.data.total
-        })
-
-
-
-        // 隐藏导航栏加载框
-        setTimeout(function () {
-          that.setData({
-            loadingData: false
-          });
-          wx.hideNavigationBarLoading();
-          // 停止下拉动作
-          wx.stopPullDownRefresh();
-          wx.hideLoading()
-
-        }, 1000)
-
-      } else {
-        this.setData({
-          materialList: this.data.materialList.concat(res.data.rows)
-        })
-        // 隐藏加载框
-
-        setTimeout(function () {
-          that.setData({
-            hidden: true,
-            loadingData: false
-          });
-
-          wx.hideLoading();
-        }, 1000)
-
-      }
-    } else {
-     //("@@!", "请求失败")
-    }
-  },
-  onPullDownRefresh: function () {
-    // 显示顶部刷新图标
-    if (this.data.serchValue == "") {
-      wx.showToast({
-        title: '请输入搜索内容',
-        icon: 'error'
-      })
-      return
-    }
-    wx.showNavigationBarLoading();
-    var that = this;
-    var loadingData = this.data.loadingData
-    if (loadingData) {
-      return;
-    }
-    that.setData({
-      pageNum: 1,
-      isRefresh: true
-    })
-
-    let obj = new Object()
-    obj.pageNum = this.data.pageNum
-    obj.materialName = this.data.serchValue
-    obj.pageSize = 10
-    obj.reasonable = false
-    this.list(obj)
-  },
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-    let that = this
-    var loadingData = that.data.loadingData
-
-    var hidden = that.data.hidden
-    // 页数+1
-    that.setData({
-      pageNum: that.data.pageNum + 1,
-      isRefresh: false
-    })
-    if (hidden) {
-      that.setData({
-        hidden: false
-      });
-      console.info(that.data.hidden);
-    }
-
-    if (loadingData) {
-      return;
-    }
-    that.setData({
-      loadingData: true
-    });
-
-
-    //console.log("@@@@"+Math.ceil(this.data.total/10))
-    // if(Math.ceil(that.data.total/10)>=that.data.pageNum){
-    // that.loadData();
-    let obj = new Object()
-    obj.pageNum = that.data.pageNum
-    obj.materialName = that.data.serchValue
-    obj.pageSize = 10
-    obj.reasonable = false
-    that.list(obj)
-
-    // }else{
-
-    //   setTimeout(function () {
-    //     that.setData({
-    //       hidden: true,
-    //     });
-
-    //   }, 2000)
-    // }
-
-
-  },
-
-})

+ 0 - 9
pages/material/serch/material_serch.json

@@ -1,9 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "搜索结果",
-  "enablePullDownRefresh": true,
-  "onPullDownRefresh": true,
-  "onReachBottom": true
-}

+ 0 - 35
pages/material/serch/material_serch.wxml

@@ -1,35 +0,0 @@
-<view class="container">
-  <!-- 搜索 -->
-  <view class="search-container">
-    <view class="search-left">
-      <input type="text" bindinput="searchEnterprise" placeholder="搜索" />
-    </view>
-    <button bindtap="bindViewSearchEnd" class="search-right">
-      <text class="iconfont icon-sousuo"></text>
-    </button>
-  </view>
-
-  <!-- 列表 -->
-  <view class="list_vi">
-    <view class="list_li3" catchtap="bindViewDetails" wx:for="{{materialList}}" wx:key="index" data-index="{{item}}">
-      <!-- <i class="list_icon iconfont icon-queding" wx:if="{{item.riskCount == 0}}"></i>
-      <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.riskCount > 0}}"></i> -->
-      <i class="iconfont icon-wuzichubei"></i>
-      <view class="notice_li">
-      
-      <view class="li_tit">{{item.materialName}}</view>
-      <view class="li_time">
-      <text>{{item.connector}}</text>
-      </view>
-      </view>
-  
-      <i class="iconfont icon-xiangyou list_right"></i>
-    </view>
-</view>
-
-
-
-<view class='data-loading' hidden='{{hidden}}'>
-    数据加载中...
-  </view>
-</view>

+ 0 - 8
pages/material/serch/material_serch.wxss

@@ -1,8 +0,0 @@
-/* pages/material/serch/material_serch.wxss */
-.data-loading {
-  height: 100rpx;
-  line-height: 100rpx;
-  background-color: #fff;
-  text-align: center;
-  font-size: 14px;
-}

+ 5 - 128
pages/me/me.js

@@ -56,56 +56,10 @@ Page({
     }
   },
 
-bindViewClear(){
-  wx.showModal({
-    title: '提示',
-    content: '确认清除缓存?',
-    complete: (res) => {
-      if (res.cancel) {
-        
-      }
-  
-      if (res.confirm) {
-        this.clear()
-      }
-    }
-  })
-},
-/**
- * 跳转我的巡查
- */
-bindViewMyXunCha(){
-  wx.navigateTo({
-    url: '../me_xuncha_list/me_xuncha_list',
-  })
-},
-GoMailList(){
-  wx.navigateTo({
-    url: '../maillist/maillist',
-  })
-},
-
-clear(){
-  wx.clearStorage({
-    success: (res) => {
-      wx.showToast({
-        title: '清理成功',
-      })
-      app.globalToken=null;
-      app.isLoginSuccess=false;
-     this.setData({
-      isShowAccoutDialog : false,
-      isBindSuccess : false,      
-      userName :"未登录",
-      password: null,
-      openid: null
-     })
-    wx.reLaunch({
-      url: '../denglu/denglu'
-    })
-    },
-  })
-},
+
+
+
+
   
  
   /**
@@ -150,82 +104,5 @@ clear(){
   onShareAppMessage() {
 
   },
-  bindViewTest(){
-    //  wx.navigateTo({
-    //   // url: '../xqzgdetail/xqzgdetail?logId='+this.data.buslogid,
-    //         url: '../fcdetail/fcdetail?logId='+this.data.buslogid,
-    // })
-  }
-  // bindViewXqzgDetail(){
-  //   wx.navigateTo({
-  //     url: '../xqzgdetail/xqzgdetail?logId='+this.data.buslogid,
-  //   })
-  // },
-  // bindViewFcDetail(){
-  //   wx.navigateTo({
-  //     url: '../fcdetail/fcdetail?logId='+this.data.buslogid,
-  //   })
-  // },
-
-  // init_userInfo() {
-
-  //   let that = this
-  //   if (app.globalToken == null) {
-  //     wx.getUserProfile({
-  //       desc: 'desc',
-  //       success: (res) => {
-  //         this.getSysUserInfo(res.userInfo)
-  //         that.setData({
-  //           userInfo : res.userInfo
-  //         })
-  //       },
-  //       fail: res => {
-  //         console.log(res)
-  //       },
-  //     })
-  //   }
-  // },
-  // getSysUserInfo(info) {
-  //   let that = this
-  //   wx.login({
-  //     success(res) {
-  //       var code = res.code
-  //       var data = {
-  //         wxCode: code,
-  //         wxNickName: info.nickName,
-  //         wxAvatarUrl: info.avatarUrl
-  //       }
-        
-  //       http.send_post("/auth/applogin", data, that.loginSuccess)
-  //     },
-  //     fail(res) {
-  //       console.log("ffff", res)
-  //     }
-  //   })
-  // },
-  // modalCancel(){
-  //   this.setData({
-  //     isShowAccoutDialog : false
-  //   })
-  // },
-  // modalSubmit(){
-  //   let obj = new Object()
-  //   obj.openid = this.openid
-  //   obj.userName = this.userName
-  //   obj.password = this.password
-  //   http.send_post("/system/minapp/AppLoginController/bindWxUser",obj,this.modalSubmitSuccess)
-  // },
-  // modalSubmitSuccess(res){
-  //   wx.showToast({
-  //     title: res.msg,
-  //     icon: "none"
-  //   })
-  //   if (res.code == 200) {
-  //     this.setData({
-  //       isShowAccoutDialog : false,
-  //       isBindSuccess : true
-  //     })
-  //   }
-
-  // },
+
 })

+ 1 - 49
pages/me/me.wxml

@@ -7,57 +7,9 @@
     {{userInfo.nickName}}
   </div> -->
   <text class="userNickName" >{{userName}}</text>
-  <!-- <text class="userNickName"  wx:if="{{isBindSuccess}}">{{userName}}</text> -->
-  <!-- <text class="userNickName" wx:if="{{isBindSuccess}}" >{{userInfo.nickName}}</text> -->
-  <!-- <text>部门:</text> -->
-  </view>
-  <image src="../images/me.png" class="me_bg"/>
-</view>
-<view class="me_tit">
-  
 
-  <view class="tit_one" wx:if="{{isBindSuccess}}" bindtap="GoMailList">
-    <image src="../images/metit1.png" class="metit" />
-    <view class="meline">
-      <i class="iconfont icon-tongxunlu"></i>
-        <text>通讯录</text>
-        <i class="iconfont icon-xiangyou"></i>
-      </view>
-  </view>
-  <view class="tit_one" bindtap="bindViewClear" wx:if="{{isBindSuccess}}" >
-    <image src="../images/metit1.png" class="metit" />
-    <view class="meline">
-      <i class="iconfont icon-yunongtongqingchuhuancun" ></i>
-        <text>清除缓存</text>
-        <i class="iconfont icon-xiangyou"></i>
-      </view>
-  </view>
-  <view class="tit_one" bindtap="bindViewMyXunCha" wx:if="{{isBindSuccess}}" >
-    <image src="../images/metit1.png" class="metit" />
-    <view class="meline">
-      <i class="iconfont icon-xunjianjilu" ></i>
-        <text>我的巡查</text>
-        <i class="iconfont icon-xiangyou"></i>
-      </view>
-  </view>
-  <view class="tit_one" bindtap="bindViewTest">
-    <image src="../images/metit1.png" class="metit" />
-    <view class="meline">
-    <i class="iconfont icon-guanyuwomen"></i>
-        <text>关于我们</text>
-        <i class="iconfont icon-xiangyou"></i>
-      </view>
   </view>
+  <image src="../images/me.png" class="me_bg"/>
 </view>
 
-  <!-- <button wx:if="{{!isBindSuccess}}" bindtap="init_userInfo" class="wd_btn">绑定账号</button>
-  <label wx:if="{{isBindSuccess}}">账号绑定成功</label> -->
-
-
-
-
-  <modal wx:if="{{isShowAccoutDialog}}" bindcancel="modalCancel" bindconfirm="modalSubmit">
-    <view class="vi_inp">账号<input bindinput="inputUserName" /></view>
-    <view class="vi_inp">密码<input bindinput="inputPassword" password type="text" /></view>
-  </modal>
 </view>

+ 0 - 190
pages/me_xuncha_list/me_xuncha_list.js

@@ -1,190 +0,0 @@
-import http from '../../base/httputil'
-const app = getApp()
-Page({
-
-  onLoad() {
-    this.onPullDownRefresh();
-  },
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    host: app.globalData.host,
-    xunchaList: null,
-    /**
-     * 控制上拉到底部时是否出现 "数据加载中..."
-     */
-    hidden: true,
-    /**
-     * 数据是否正在加载中,避免数据多次加载
-     */
-    loadingData: false,
-    isRefresh: true,
-    total: 0,
-    pageNum: 1, // 页码
-    serchValue: "",
-    menulist: [{
-        "id": "1",
-        "url": "icon-anquanxuncha",
-        "title": "巡更",
-        "bindtap": ""
-      },
-      {
-        "id": "2",
-        "url": "icon-xunjian",
-        "title": "巡检",
-        "bindtap": "bindViewQiYeChaXun"
-      },
-    ],
-    mainmodel: {
-
-    }
-  },
-
-  toBindXunjinaMore(e) {
-    let isrisk = e.currentTarget.dataset.isrisk
-    let buslogid = e.currentTarget.dataset.buslogid
-    if (isrisk == 0) {
-      wx.showToast({
-        title: '没有发现安全隐患,请放心!!',
-        icon: "none"
-      })
-    } else {
-      wx.navigateTo({
-        url: '../xunjianmore/xunjianmore?buslogid=' + buslogid
-      })
-    }
-  },
-
-  getXunchaListSuccess(res) {
-
-    if (res.code == 200) {
-      // 显示加载图标
-      wx.showLoading({
-        title: '玩命加载中',
-      })
-      var that = this
-
-      if (res.data.rows.length == 0) {
-        wx.showToast({
-          title: '暂无更多数据',
-          icon: "none"
-        })
-      }
-      if (this.data.isRefresh) {
-        this.setData({
-          xunchaList: res.data.rows,
-          total: res.data.total
-        })
-
-        // 隐藏导航栏加载框
-        setTimeout(function () {
-          that.setData({
-            loadingData: false
-          });
-          wx.hideNavigationBarLoading();
-          // 停止下拉动作
-          wx.stopPullDownRefresh();
-          wx.hideLoading()
-
-        }, 1000)
-
-      } else {
-        this.setData({
-          xunchaList: this.data.xunchaList.concat(res.data.rows)
-        })
-        // 隐藏加载框
-
-        setTimeout(function () {
-          that.setData({
-            hidden: true,
-            loadingData: false
-          });
-
-          wx.hideLoading();
-        }, 1000)
-
-      }
-    } else {
-      
-    }
-  },
-  onPullDownRefresh: function () {
-    wx.showNavigationBarLoading();
-    var that = this;
-    var loadingData = this.data.loadingData
-    if (loadingData) {
-      return;
-    }
-    that.setData({
-      pageNum: 1,
-      isRefresh: true
-    })
-
-    let obj = new Object()
-    obj.pageNum = this.data.pageNum
-    obj.busEnterpriseName = this.data.serchValue
-    obj.pageSize = 10
-    obj.reasonable = false
-    obj.createBy=app.loginUserId
-    this.list(obj)
-  },
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-    let that = this
-    var loadingData = that.data.loadingData
-
-    var hidden = that.data.hidden
-    // 页数+1
-    that.setData({
-      pageNum: that.data.pageNum + 1,
-      isRefresh: false
-    })
-    if (hidden) {
-      that.setData({
-        hidden: false
-      });
-     
-    }
-
-    if (loadingData) {
-      return;
-    }
-    that.setData({
-      loadingData: true
-    });
-
-    let obj = new Object()
-    obj.pageNum = that.data.pageNum
-    obj.busEnterpriseName = that.data.serchValue
-    obj.pageSize = 10
-    obj.reasonable = false
-    obj.createBy=app.loginUserId
-    that.list(obj)
-  },
-  
-  getXunchaListByEnterpriseName(e) {
-    var obj = new Object()
-    this.setData({
-      serchValue: e.detail.value,
-      teamList: [],
-      hidden: true,
-      loadingData: false,
-      isRefresh: true,
-      total: 0,
-      pageNum: 1, // 页
-    })
-    obj.busEnterpriseName = e.detail.value
-    obj.pageNum = this.data.pageNum
-    obj.pageSize = 10
-    obj.reasonable = false
-    obj.createBy=app.loginUserId
-    this.list(obj)
-  },
-  list(data) {
-    http.send_get("/system/AppXunchaController/getXunchaList", data, this.getXunchaListSuccess)
-  },
-
-})

+ 0 - 9
pages/me_xuncha_list/me_xuncha_list.json

@@ -1,9 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "我的巡查",
-  "enablePullDownRefresh": true,
-  "onPullDownRefresh": true,
-  "onReachBottom": true
-}

+ 0 - 39
pages/me_xuncha_list/me_xuncha_list.wxml

@@ -1,39 +0,0 @@
-<!--pages/xunchaWu/xunchawu.wxml-->
-<!--pages/xunchalist/xunchalist.wxml-->
-<view class="container">
-  <!-- 搜索 -->
-  <view class="search-container">
-    <view class="search-left">
-      <input type="text" bindinput="getXunchaListByEnterpriseName" placeholder="搜索" />
-    </view>
-    <button bindtap="bindViewSearchEnd" class="search-right">
-      <text class="iconfont icon-sousuo"></text>
-    </button>
-  </view>
-
-  <!-- 列表 -->
-  <view class="list_vi">
-    <view class="list_li list_li_c" wx:for="{{xunchaList}}" wx:key="index"
-    bindtap="toBindXunjinaMore"
-     data-isrisk="{{item.isRisk}}" data-buslogid="{{item.busLogId}}">
-      <view class="list_r">
-        <view class="list_li1">
-          <i class="list_icon iconfont icon-queding" wx:if="{{item.isRisk != 1}}"></i>
-          <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.isRisk == 1}}"></i>
-          <text>[{{item.busLogTypeLabel}}]{{item.busEnterpriseName}}</text>
-        </view>
-        <view class="list_li2">
-          <text>{{item.deptName}}</text>
-          <text>{{item.nickName}}</text>
-          <text>{{item.createTime}}</text>
-        </view>
-      </view>
-      <i class="iconfont icon-xiangyou list_right"></i>
-    </view>
-  </view>
-  <!--bindmenuItemClick为按钮点击的时候的回调方法  mainmodel是显示的按钮,menulist为折叠的菜单的数组数据-->
-  <menu bindmenuItemClick="menuItemClick" mainmodel="{{mainmodel}}" menulist="{{menulist}}"></menu>
-  <view class='data-loading' hidden='{{hidden}}'>
-    数据加载中...
-  </view>
-</view>

+ 0 - 40
pages/me_xuncha_list/me_xuncha_list.wxss

@@ -1,40 +0,0 @@
-.qy_con{
-  display: flex;
-  flex-direction: row;
-  justify-content:space-around;
-  text-align: center;
-  margin: 30rpx 30rpx;
-}
-.qy_con view{
-height: 140rpx;
-color: #fff;
-display: flex;
-flex-direction: column;
-padding: 15rpx 40rpx;
-position: relative;
-}
-.qy_con view image{
-  position: absolute;
-  top:0px;
-  left: 0px;
-  width: 100%;
-  height: 100%;
-  z-index: -1;
-  }
-.qy_con view h2{
-  font-size: 58rpx;
-  font-weight: bolder;
-  padding-top: 10rpx;
-  }
-  .qy_con view p{
-    font-size: 35rpx;
-    }
-    .data-loading {
-      height: 100rpx;
-      line-height: 100rpx;
-      background-color: #fff;
-      text-align: center;
-      font-size: 14px;
-    }
-
-  

+ 0 - 54
pages/menu/menu.js

@@ -1,54 +0,0 @@
-// components/menu/menu.js
-Component({
-  /**
-   * ����������б�
-   */
-  
-  properties: {
-    mainmodel: {
-      type: Object,
-      value: {}
-    },
-    menulist: {
-      type: Object,
-      value: []
-    }
-  },
-  //使用全局样式
-  options: {
-    addGlobalClass: true,
-  },
-
-  /**
-   * ����ij�ʼ����
-   */
-  data: {
-    showmenus:true,
-  },
-
-  /**
-   * ����ķ����б�
-   */
-  methods: {
-    showclick:function(){
-      
-      let isshow = !this.data.showmenus;
-      
-      this.setData({
-        showmenus: isshow,
-      })
-    },
-    itemclick:function(e){
-      this.showclick();
-      
-      let info = e.currentTarget.dataset.item;
-      if (info){
-        this.triggerEvent('menuItemClick', {
-            "iteminfo":info
-        })
-      }
-    }
-   
-
-  }
-})

+ 0 - 4
pages/menu/menu.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

+ 0 - 16
pages/menu/menu.wxml

@@ -1,16 +0,0 @@
-<!--pages/menu/menu.wxml-->
-<view class='menu_box'>
-    <view hidden='{{showmenus}}' class='menu_bg'>
-    <block wx:for='{{menulist}}' wx:key='menulist'>
-      <view class='menu_main' catchtap='itemclick' data-item='{{item}}'>
-        <image class='menu_img iconfont {{item.url}}' src='' />
-        <text class='menu_title'  hidden='{{mainmodel.title.length > 0 ? false:true}}'>{{item.title}}</text>
-      </view>
-    </block>
-    </view>
-    <view catchtap='showclick' class='menu_main menu_con'>
-      <i class="iconfont icon-jiahao"></i>
-    <!-- <i wx:if="{{showmenus}}" class="iconfont icon-jiahao" style="z-index: 999;"></i> -->
-    <!-- <i wx:else class="iconfont icon-jiahao" style="z-index: -1;"></i> -->
-    </view>
-</view>

+ 0 - 68
pages/menu/menu.wxss

@@ -1,68 +0,0 @@
-/* components/menu/menu.wxss */
-
-
-
-.menu_box{
-  position: fixed;
-  bottom: 150rpx;
-  right: 30rpx;
-  /* background-color: red; */
-  text-align: center;
-}
-
-.menu_main{
-  top: 10rpx;
-  width: 100rpx;
-  height: auto;
-  border-radius: 50%;
-  display: flex;
-  flex-direction: column;
-  text-align: center;
-  pointer-events: auto
-  }
-  .menu_bg .iconfont{
-    color: #f94b0e;
-    font-size: 50rpx;
-    margin: 10rpx auto;
-  }
-  .menu_con{
-    top: 10rpx;
-    width: 100rpx;
-    height: 100rpx;
-    background-color: #f94b0e;
-    border-radius: 50%;
-    display: flex;
-    box-shadow: 5rpx 5rpx 10rpx rgb(153, 153, 153);
-    
-    }
-.menu_img{
-margin-top: 10rpx;
-width: 50rpx;
-height: 50rpx;
-/* background-color: red; */
-}
-.menu_title{
-  display: block;
-  width: 100%;
-  text-align: center;
-  font-size: 30rpx;
-
-}
-.icon-jiahao{
-  font-size: 50rpx;
-
-  color: #fff;
-  /* margin: auto; */
-  position: absolute;bottom:10rpx;left:50%;transform:translate(-50%,-50%);
-}
-.menu_bg{
-  background: rgb(236, 235, 235);
-  padding-bottom: 60rpx;
-  margin-bottom: -50rpx;
-  padding-top: 20rpx;
-  border-top-left-radius: 50rpx;
-  border-top-right-radius: 50rpx;
-}
-.menu_bg .menu_main{
-  margin-bottom: 20rpx;
-}

+ 0 - 23
pages/more/more.js

@@ -1,23 +0,0 @@
-// pages/qiye/qiye.js
-const app = getApp()
-Page({
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    host: app.globalData.host
-  },
-  // 搜索结果跳页
-  bindViewSearchEnd() {
-    wx.navigateTo({
-       url: '../search/search'
-    })
-  },
-  // 企业详细页
-  bindViewDetails() {
-    wx.navigateTo({
-       url: '../details/details'
-    })
-  },
-
-})

+ 0 - 13
pages/more/more.json

@@ -1,13 +0,0 @@
-{
-  "component": true, 
-  "usingComponents": {
-    "menu": "/pages/menu/menu"
-  },
-
-
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "通知公告"
-
-}
-

+ 0 - 92
pages/more/more.wxml

@@ -1,92 +0,0 @@
-<view class="container">
-  <!-- 搜索 -->
-  <view class="search-container">
-  <view class="search-left">
-    <input type="text" placeholder="搜索"/>
-  </view>
-  <button bindtap="bindViewSearchEnd" class="search-right">
-    <image class="img" src="{{host}}/images/shearh.png" />
-  </button>
-</view>
-
-<!-- 列表 -->
-<view class="list_vi">
-  <view class="list_li" bindtap="bindViewDetails">
-    <i class="list_icon iconfont icon-queding"></i>
-    <text>[巡检]长春首佳科技有限公司</text>
-    <i class="iconfont icon-xiangyou list_right"></i>
-  </view>
-  <view class="line2"></view>
-  <view class="list_li" bindtap="bindViewDetails">
-    <i class="list_icon iconfont icon-yingjipingtai"></i>
-    <text>[巡检]长春首佳科技有限公司</text>
-    <i class="iconfont icon-xiangyou list_right"></i>
-  </view>
-  <view class="line2"></view>
-  <view class="list_li" bindtap="bindViewDetails">
-    <i class="list_icon iconfont icon-queding"></i>
-    <text>[巡检]长春首佳科技有限公司</text>
-    <i class="iconfont icon-xiangyou list_right"></i>
-  </view>
-  <view class="line2"></view>
-  <view class="list_li" bindtap="bindViewDetails">
-    <i class="list_icon iconfont icon-yingjipingtai"></i>
-    <text>[巡检]长春首佳科技有限公司</text>
-    <i class="iconfont icon-xiangyou list_right"></i>
-  </view>
-  <view class="line2"></view>
-  <view class="list_li" bindtap="bindViewDetails">
-    <i class="list_icon iconfont icon-queding"></i>
-    <text>[巡检]长春首佳科技有限公司</text>
-    <i class="iconfont icon-xiangyou list_right"></i>
-  </view>
-  <view class="line2"></view>
-  <view class="list_li" bindtap="bindViewDetails">
-    <i class="list_icon iconfont icon-yingjipingtai"></i>
-    <text>[巡检]长春首佳科技有限公司</text>
-    <i class="iconfont icon-xiangyou list_right"></i>
-  </view>
-  <view class="line2"></view>
-  <view class="list_li">
-    <i class="list_icon iconfont icon-queding"></i>
-    <text>[巡检]长春首佳科技有限公司</text>
-    <i class="iconfont icon-xiangyou list_right"></i>
-  </view>
-  <view class="line2"></view>
-  <view class="list_li">
-    <i class="list_icon iconfont icon-queding"></i>
-    <text>[巡检]长春首佳科技有限公司</text>
-    <i class="iconfont icon-xiangyou list_right"></i>
-  </view>
-  <view class="line2"></view>
-  <view class="list_li">
-    <i class="list_icon iconfont icon-queding"></i>
-    <text>[巡检]长春首佳科技有限公司</text>
-    <i class="iconfont icon-xiangyou list_right"></i>
-  </view>
-  <view class="line2"></view>
-  <view class="list_li">
-    <i class="list_icon iconfont icon-queding"></i>
-    <text>[巡检]长春首佳科技有限公司</text>
-    <i class="iconfont icon-xiangyou list_right"></i>
-  </view>
-  <view class="line2"></view>
-  <view class="list_li">
-    <i class="list_icon iconfont icon-queding"></i>
-    <text>[巡检]长春首佳科技有限公司</text>
-    <i class="iconfont icon-xiangyou list_right"></i>
-  </view>
-  <view class="line2"></view>
-  <view class="list_li">
-    <i class="list_icon iconfont icon-queding"></i>
-    <text>[巡检]长春首佳科技有限公司</text>
-    <i class="iconfont icon-xiangyou list_right"></i>
-  </view>
-  <view class="line2"></view>
-
-</view>
-
-
-
-
-</view>

+ 0 - 33
pages/more/more.wxss

@@ -1,33 +0,0 @@
-.qy_con{
-  display: flex;
-  flex-direction: row;
-  justify-content:space-around;
-  text-align: center;
-  margin: 30rpx 30rpx;
-}
-.qy_con view{
-height: 140rpx;
-color: #fff;
-display: flex;
-flex-direction: column;
-padding: 15rpx 40rpx;
-position: relative;
-}
-.qy_con view image{
-  position: absolute;
-  top:0px;
-  left: 0px;
-  width: 100%;
-  height: 100%;
-  z-index: -1;
-  }
-.qy_con view h2{
-  font-size: 58rpx;
-  font-weight: bolder;
-  padding-top: 10rpx;
-  }
-  .qy_con view p{
-    font-size: 35rpx;
-    }
-
-  

+ 0 - 191
pages/new_patrol_point/new_patrol_point.js

@@ -1,191 +0,0 @@
-import http from '../../base/httputil'
-const app = getApp()
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    host: app.globalData.host,
-    enterpriseId: null,
-    details: {
-      id: null,
-      longitude: Number,
-      latitude: Number,
-      name: null,
-      code: null,
-      remark: '',
-    },
-
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-    this.data.enterpriseId = options.enterpriseId
-    // this.getDetails()
-  },
-
-  // getDetails() {
-  //   let obj = new Object();
-  //   obj.id = this.id
-  //   http.post("/system/AppEnterpriseController/getEnterpriseDetails", obj, this.getEnterpriseDetailsSuccess)
-  // },
-  // getEnterpriseDetailsSuccess(res) {
-  //   this.setData({
-  //     enterpriseDetails: res.enterpriseDetails,
-  //   })
-  // },
-  //-----------------------------------------
-  bindInputName(e) {
-    this.data.details.name = e.detail.value
-  },
-  bindInputRemark(e) {
-    this.data.details.remark = e.detail.value
-  },
-  bindInputCode(e) {
-    this.data.details.code = e.detail.value
-  },
-  bindViewScan(){
-    wx.scanCode({
-      onlyFromCamera: true,
-      success: (res) => {
-       this.setData({
-        ['details.code']:res.result,
-      })
-      },
-      fail: (res) => {
-        wx.showToast({
-          title: '扫描失败请重试',
-          icon:'none'
-        })
-      }
-    })
-  },
-  //------------------------------------------
-
-  updateDetails() {
-      
-    if(isNaN(this.data.details.longitude)||isNaN(this.data.details.latitude)){
-      wx.showToast({
-        title:'请点击定位当前位置',
-        icon:'none'
-      })
-      return
-    }
-
-    if(this.data.details.name==null||this.data.details.name==''){
-      wx.showToast({
-        title:'请输入巡更点名称',
-        icon:'none'
-      })
-      return
-    }
-    
-    if(this.data.details.code==null||this.data.details.name==''){
-      wx.showToast({
-        title:'请扫描或输入巡更点编码',
-        icon:'none'
-      })
-      return
-    }
-  
-  
-    let obj = new Object();
-    obj.busEnterpriseId = this.data.enterpriseId
-    obj.busPatrolstationName = this.data.details.name
-    obj.busPatrolstationCode = this.data.details.code
-    obj.longitude=this.data.details.longitude
-    obj.latitude=this.data.details.latitude
-    obj.remarks = this.data.details.remark
-    
-    http.post("/system/AppPatrolstationController/addPatrolstation", obj, this.updateDetailsSuccess)
-  },
-  updateDetailsSuccess(res) {
-    wx.showToast({
-      title: res.msg,
-      icon:'none'
-    })
-    if(res.code == 200){
-      wx.navigateBack()
-    }
-  },
-  deletePatrolPoint() {
-    // let obj = new Object();
-    // obj.busEnterpriseId = this.data.enterpriseDetails.busEnterpriseId
-    // http.post("/system/AppEnterpriseController/deleteEnterprise", obj, this.deleteEnterpriseSuccess)
-  },
-  // deleteEnterpriseSuccess(res) {
-  //   wx.showToast({
-  //     title: res.msg,
-  //   })
-  //   if(res.code == 200){
-  //     wx.navigateTo({
-  //       url: '../qiye/qiye'
-  //     })
-  //   }
-  // },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  },
-  
-  getLocation() {
-    let that = this
-    wx.getLocation({
-      type: 'wgs84', //返回可以用于wx.openLocation的经纬度
-      success: function (res) {
-        that.setData({
-          ['details.longitude']:  res.longitude,
-          ['details.latitude']:  res.latitude
-        })
-      },
-    })
-  },
-})

+ 0 - 8
pages/new_patrol_point/new_patrol_point.json

@@ -1,8 +0,0 @@
-{
-  "usingComponents": {},
-
-
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "新增巡更点"
-}

+ 0 - 46
pages/new_patrol_point/new_patrol_point.wxml

@@ -1,46 +0,0 @@
-<!--pages/qiyexqtable/qiyexqtanle.wxml-->
-<!-- 巡更点新增页面 -->
-<view class="container">
-  <view class="page-section">
-    <!-- <view class="input_vi">
-      <view class="input_title">经度</view>
-      <input class="inp_txt" bindtap="getLocation" value="{{details.longitude}}" auto-focus placeholder="点击获取当前位置" disabled="true"  maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">纬度</view>
-      <input class="inp_txt" bindtap="getLocation"  value="{{details.latitude}}" placeholder="点击获取当前位置"disabled="true"  maxlength="100"/>
-    </view> -->
-
-
-    <view class="input_vi input_vic">
-      <view class="input_title">坐标</view>
-    <view  class="flex_c"  wx:if="{{details.latitude==null}}">
-      <input class="inp_txt2" value="{{details.longitude}}" disabled="true" placeholder="点击获取坐标" maxlength="20" bindtap="getLocation" />
-    </view>
-      <view class="flex_c" wx:else>
-       <input class="inp_txt2" value="{{details.longitude}}" disabled="true" maxlength="20"/>
-      <text>,</text><input class="inp_txt2" value="{{details.latitude}}" disabled="true"  maxlength="20"/>
-      <image style="margin-left: 5rpx;" src="../images/icon_hq.png" class="icon" bindtap="getLocation" />
-      </view>
-      
-    </view>
-    <view class="input_vi">
-      <view class="input_title">巡更点名称</view>
-      <input class="inp_txt" bindinput="bindInputName" value="{{details.name}}"  placeholder="请输入巡更点名称" maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">巡更点编号</view>
-      <i class="iconfont icon-saoyisao1" bindtap="bindViewScan"></i>
-      <input class="inp_txt inp_txt2" bindinput="bindInputCode" value="{{details.code}}"  placeholder="请扫描巡更点编号" maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">巡更点描述</view>
-      <input class="inp_txt" bindinput="bindInputRemark" value="{{details.remark}}"  placeholder="请输入巡更点描述" maxlength="100"/>
-    </view>
-  </view>
-
-  <view class="table_btn">
-    <button type="primary" class="tj_btn" bindtap="updateDetails">提交</button>
-  </view>
-
-</view>

+ 0 - 98
pages/new_patrol_point/new_patrol_point.wxss

@@ -1,98 +0,0 @@
-/* pages/qiyexqtable/qiyexqtanle.wxss */
-.container{
-  padding: 30rpx 30rpx;
-}
-.page-section{
-  display: flex;
-  flex-direction: column;
-}
-.input_vi{
-  display: block;
-  border-bottom: 1px solid #f3f3f3;
-  height: 100rpx;
-  margin-bottom: 20rpx;
-}
-.input_vi .input_title{
-  font-size: 34rpx;
-  height: 100rpx;
-  line-height: 100rpx;
-  color: #181818;
-  float: left;
-}
-.input_vi input{
-  border:0px;
-  height: 100rpx;
-  line-height: 100rpx;
- padding-left: 20rpx;
- border-radius: 10rpx;
- font-size: 34rpx;
- color: #555;
- text-align: right;
-}
-.input-placeholder, .input-placeholder-dark{
- color: #c5c5c5!important;
-}
-.table_btn{
-  display: flex;
-  flex-direction: row;
-}
-.sc_btn{
-  width: 30%!important;
-  font-size: 32rpx;
-  margin: 60rpx auto;
-padding: 24rpx 0px!important;
-}
-.tj_btn{
-  width: 60%!important;
-  font-size: 32rpx;
-  margin: 60rpx auto;
-  padding: 24rpx 0px!important;
-}
-.input_vi input.inp_txt2{
-  border:0px;
-  height: 100rpx;
-  line-height: 100rpx;
- padding-left: 20rpx;
- border-radius: 10rpx;
- font-size: 34rpx;
- color: #555;
- text-align: right;
- float: right;
-}
-.input_vi i{
-  display: block;
-  float: right;
-  line-height: 100rpx;
-  margin-left: 14rpx;
-  color: #535353;
-  font-size: 48rpx;
- }
-
- .inp_txt2{
-  text-align: left!important;
-  font-size: 18rpx;
-  width: 200rpx!important;
- }
- .input_vic{
-   display: flex;
-   flex-direction: row;
- }
- .input_vic image{
-   align-items: center;
-   display: flex;
- }
- .flex_c{
-   display: flex;
-   flex-direction: row;
-   margin-left: auto;
-   align-items: center;
- }
- .input_vic text{
-   font-size: 32rpx;
-   line-height: 100rpx;
-   color: #555;
- }
- .icon{
-  height: 40rpx;
-  width: 40rpx;
-}

+ 0 - 12
pages/newcomer/newcomer.js

@@ -1,12 +0,0 @@
-// pages/newcomer/newcomer.js
-const app = getApp()
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    host: app.globalData.host
-  },
-  
-})

+ 0 - 6
pages/newcomer/newcomer.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "新手指南"
-}

+ 0 - 39
pages/newcomer/newcomer.wxml

@@ -1,39 +0,0 @@
-<!--pages/newcomer/newcomer.wxml-->
-<view class="container">
-  <text class="title">二道应急小程序新手指南</text>
-  <text>
-    一、遭遇拥挤踩踏事故怎么办
-
-  1.发觉拥挤的人群向着自己行走的方向拥来时,应该马上避到一旁,但是不要奔跑,以免摔倒。
-
-  2.可以到教室里暂避一时。切记不要逆着人流前进,那样非常容易被推倒在地。
-
-  3.若身不由己陷入人群之中,一定要先稳住双脚。切记远离教室的玻璃窗,以免因玻璃破碎而被扎伤。
-
-  4.遭遇拥挤的人流时,一定不要采用体位前倾或者低重心的姿势,即便鞋子被踩掉,也不要贸然弯腰提鞋或系鞋带。
-
-  5.如有可能,抓住一样坚固牢靠的东西,例如楼梯柱之类,待人群过去后,迅速而镇静地离开现场。
-
-  6.学生在校上下楼梯时要遵守秩序,靠右行走。课间操、放学时要排好队,不能从楼梯跑下,遇到其他班级要让行,不可争抢先行。
-
-  二、出现混乱局面后怎么办
-
-  1.在拥挤的人群中,要时刻保持警惕,当发现有人情绪不对,或人群开始骚动时,就要做好准备保护自己和他人。
-
-  2.此时脚下要敏感些,千万不能被绊倒,避免自己成为拥挤踩踏事件的诱发因素。
-
-  3.当发现自己前面有人突然摔倒了,马上要停下脚步,同时大声呼救,告知后面的人不要向前靠近。
-
-  4.当带着孩子遭遇拥挤的人群时,最好把孩子抱起来,避免其在混乱中被踩伤。
-
-  5.若被推倒,要设法靠近墙壁。面向墙壁,身体蜷成球状,双手在颈后紧扣,以保护身体最脆弱的部位。
-
-  三、 事故已经发生该怎么办
-
-  1.拥挤踩踏事故发生后,一方面赶快报警,等待救援,另一方面,在医务人员到达现场前,要抓紧时间用科学的方法开展自救和互救。
-
-  2.在救治中,要遵循先救重伤者、老人、儿童及妇女的原则。判断伤势的依据有:神志不清、呼之不应者伤势较重;脉搏急促而乏力者伤势较重;血压下降、瞳孔放大者伤势较重;有明显外伤,血流不止者伤势较重。
-
-  3.当发现伤者呼吸、心跳停止时,要赶快做人工呼吸,辅之以胸外按压。
-  </text>
-</view>

+ 0 - 14
pages/newcomer/newcomer.wxss

@@ -1,14 +0,0 @@
-/* pages/newcomer/newcomer.wxss */
-.container{
-  margin: 30rpx 30rpx;
-}
-.title{
-  display: flex;
-  justify-content: center;
-  font-size: 40rpx;
-}
-text{
-  color: #000;
-  font-size: 32rpx;
-  text-align: justify;
-}

+ 0 - 90
pages/patrol_list/patrol_list.js

@@ -1,90 +0,0 @@
-import http from '../../base/httputil'
-const app = getApp()
-Page({
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    host: app.globalData.host,
-    enterpriseId: null,
-    mList: null,
-    keyword: '',
-  },
-
-  onLoad(options) {
-    this.data.enterpriseId = options.enterpriseId
-  },
-  onShow() {
-    this.getPatrolPointList()
-  },
-
-  getPatrolPointList() {
-    let obj = new Object()
-    // obj.pageNum = this.data.pageNum
-    // obj.busEnterpriseName = ""
-    // obj.pageSize = 10
-    // obj.reasonable = true
-    obj.busEnterpriseId = this.data.enterpriseId
-    obj.searchValue = this.data.keyword
-    // obj.searchFrom='app'
-    http.send_get("/system/AppPatrolstationController/getPatrolstationList", obj, this.getPatrolPointListSuccess)
-  },
-  getPatrolPointListSuccess(res) {
-    if (res.code == 200) {
-      this.setData({
-        mList: res.data
-      })
-    }
-  },
-
-
-
-  // 搜索结果跳页
-  bindViewSearchEnd() {
-    // wx.navigateTo({
-    // url: '../xunchawu/xunchawu'
-    // })
-    this.getPatrolPointList();
-  },
-
-  bindViewInputSearch(e) {
-    this.data.keyword = e.detail.value
-  },
-  // bindViewSearchEnd(e){
-  //   let isrisk = e.currentTarget.dataset.isrisk
-  //   let buslogid = e.currentTarget.dataset.buslogid
-  //   if(isrisk == 0){
-  //     wx.showToast({
-  //       title: '没有发现安全隐患,请放心!!',
-  //       icon: "none" 
-  //     })
-  //   }else{
-  //     console.log(isrisk,"####",buslogid)
-  //     wx.navigateTo({
-  //       url: '../xunjianmore/xunjianmore?buslogid='+buslogid
-  //     })
-  //   }
-
-  // },
-  bindViewAddPatrol() {
-    wx.navigateTo({
-      url: '../new_patrol_point/new_patrol_point?enterpriseId=' + this.data.enterpriseId
-    })
-  },
-  bindViewToDetails(e) {
-    let id = e.currentTarget.dataset.id
-    let delFlag = e.currentTarget.dataset.delflag
-    if (delFlag != null && delFlag != '') {
-      wx.showToast({
-        title: '该巡更点已废弃',
-        icon: 'none'
-      })
-    } else {
-
-      wx.navigateTo({
-        url: '../xungengdetails/xungengdetails?id=' + id,
-      })
-    }
-  }
-
-})

+ 0 - 8
pages/patrol_list/patrol_list.json

@@ -1,8 +0,0 @@
-{
-  "component": true, 
-  "usingComponents": {},
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "巡更点列表"
- 
-}

+ 0 - 40
pages/patrol_list/patrol_list.wxml

@@ -1,40 +0,0 @@
-<view class="container">
-  <!-- 搜索 -->
-  <view class="search-container" bindtap="bindViewSearchEnd">
-    <view class="search-left">
-      <input type="text" placeholder="搜索" bindinput="bindViewInputSearch" />
-    </view>
-    <button class="search-right">
-      <text class="iconfont icon-sousuo"></text>
-    </button>
-  </view>
-  
-  <!-- 列表 -->
-  <view class="list_vi">
-    <!--循环本行-->
-    <!-- <i class="iconfont icon-wushuju zwsj"></i>
-  <text class="zwsj_text">暂无数据</text> -->
-    <view class="list_li flex-c"  wx:for="{{mList}}" wx:key="index"
-    bindtap="bindViewToDetails" data-id="{{item.busPatrolstationCode}}" data-delflag="{{item.delFlag}}">
-      <view class="list_li_1">
-        <!-- <i class="list_icon iconfont icon-queding" wx:if="{{item.isRisk != 1}}"></i> -->
-        <!-- <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.isRisk == 1}}"></i> -->
-        <text>[{{item.busEnterpriseName}}]{{item.busPatrolstationName}}</text>
-        <text class="txt_ri" wx:if="{{item.delFlag!=null&&item.delFlag!=''}}">{{item.delFlag}}</text>
-        <i class="iconfont icon-xiangyou list_right"></i>
-      </view>
-      <view class="list_li_2">
-        <text class="time-text">{{item.busPatrolstationCode}}</text>
-        <text class="time-text">{{item.remarks}}</text>
-        <!-- <text class="time-text">{{item.busEnterpriseName}}</text> -->
-      </view>
-      <!-- <view class="line2"></view> -->
-    </view>
-    <!--bindmenuItemClick为按钮点击的时候的回调方法  mainmodel是显示的按钮,menulist为折叠的菜单的数组数据-->
-    <!-- <menu bindmenuItemClick="menuItemClick" mainmodel="{{mainmodel}}" menulist="{{menulist}}"></menu> -->
-
-  </view>
-
-  <!-- 巡检悬浮按钮 -->
-  <view class="float_btn iconfont icon-jiahao" bindtap="bindViewAddPatrol"></view>
-</view>

+ 0 - 64
pages/patrol_list/patrol_list.wxss

@@ -1,64 +0,0 @@
-/**index.wxss**/
-
-.qy_con{
-  display: flex;
-  flex-direction: row;
-  justify-content:space-around;
-  text-align: center;
-  margin: 30rpx 30rpx;
-}
-.qy_con view{
-height: 140rpx;
-color: #fff;
-display: flex;
-flex-direction: column;
-padding: 15rpx 40rpx;
-position: relative;
-}
-.qy_con view image{
-  position: absolute;
-  top:0px;
-  left: 0px;
-  width: 100%;
-  height: 100%;
-  z-index: -1;
-  }
-.qy_con view h2{
-  font-size: 58rpx;
-  font-weight: bolder;
-  padding-top: 10rpx;
-  }
-  .qy_con view p{
-    font-size: 35rpx;
-    }
-
-  .flex-c{
-    display: flex;
-    flex-direction: column !important;
-  }
-  .list_li_1, .list_li_2{
-    display: flex;
-  }
-  .list_li_2 .time-text{
-    display: block;
-    font-size: 28rpx !important;
-    color: rgb(168, 168, 168) !important;
-    margin-right: 20rpx;
-}
-.list_li_2 .time-text:nth-child(1){
-    margin-left: 55rpx;
-}
-.list_vi .list_li{
-  display: flex;
-  flex-direction: row;
-  height: auto !important;
-  line-height: 60rpx;
-  padding-bottom: 10rpx;
-}
-.txt_ri{
-  color: rgb(223, 0, 0)!important;
-  font-size: 24rpx;
-  position: absolute;
-  right: 90rpx;
-}
-  

+ 0 - 136
pages/qianming/qianming.js

@@ -1,136 +0,0 @@
-var content = null;
-var touchs = [];
-var canvasw = 0;
-var canvash = 0;
-var that = null;
-const app = getApp()
-Page({
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    host: app.globalData.host,
-    index: null,
-  },
-  // 画布的触摸移动开始手势响应
-  start: function (event) {
-    // console.log("触摸开始" + event.changedTouches[0].y)
-    // console.log("触摸开始" + event.changedTouches[0].x)
-    //获取触摸开始的 x,y
-    let point = {
-      x: event.changedTouches[0].y,
-      y: event.changedTouches[0].x
-    }
-    touchs.push(point)
-  },
-
-  // 画布的触摸移动手势响应
-  move: function (e) {
-    let point = {
-      x: e.touches[0].y,
-      y: e.touches[0].x
-    }
-    touchs.push(point)
-    if (touchs.length >= 2) {
-      this.draw(touchs)
-    }
-  },
-
-  // 画布的触摸移动结束手势响应
-  end: function (e) {
-    // console.log("触摸结束" + e)
-    //清空轨迹数组
-    for (let i = 0; i < touchs.length; i++) {
-      touchs.pop()
-    }
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.data.index = options.index
-    that = this
-    //获得Canvas的上下文
-    content = wx.createCanvasContext('firstCanvas')
-    //设置线的颜色
-    content.setStrokeStyle("#000")
-    //设置线的宽度
-    content.setLineWidth(5)
-    //设置线两端端点样式更加圆润
-    content.setLineCap('round')
-    //设置两条线连接处更加圆润
-    content.setLineJoin('round')
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-    // 获取画布尺寸
-    var query = wx.createSelectorQuery()
-    query.select('#canvas').boundingClientRect()
-    query.exec(function (res) {
-      canvasw = res[0].width;
-      canvash = res[0].height
-    })
-  },
-
-  //绘制
-  draw: function (touchs) {
-    let point1 = touchs[0]
-    let point2 = touchs[1]
-    touchs.shift()
-    content.moveTo(point1.y, point1.x)
-    content.lineTo(point2.y, point2.x)
-    content.stroke()
-    content.draw(true)
-  },
-  //清除操作
-  clearClick: function () {
-    //清除画布
-    content.clearRect(0, 0, canvasw, canvash)
-    content.draw(true)
-  },
-  //保存图片
-  saveClick: function () {
-    var that = this
-    wx.canvasToTempFilePath({
-      canvasId: 'firstCanvas',
-      success: function (res) {
-        //打印图片路径
-        var path = res.tempFilePath
-        //上传图片
-        // that.uploadSignPic(path)
-        // console.log(path)
-        let page = getCurrentPages();
-        let prevPage = page[page.length - 2];
-        //获取全局唯一的文件管理器 
-        wx.getFileSystemManager().readFile({ //读取本地文件内容
-          filePath: path, // 文件路径
-          encoding: 'base64', // 返回格式
-          success: res => {
-            prevPage.setData({
-              index: that.data.index,
-              qianming: path,
-              qianmingBase64: res.data,
-            });
-            //返回页面
-            wx.navigateBack()
-          }
-        });
-      }
-    })
-  },
-
-
-  // /**
-  //  * 上传签名图片
-  //  */
-  // uploadSignPic: function (path) {
-  //   //具体实现的业务逻辑
-  // }
-
-})

+ 0 - 7
pages/qianming/qianming.json

@@ -1,7 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "签名",
-  "pageOrientation": "landscape"
-}

+ 0 - 21
pages/qianming/qianming.wxml

@@ -1,21 +0,0 @@
-<!-- 手写界面 -->
-<view class='hand_writing_container'>
-<view class="tit_vi">
-  <view class="tips_title">请在区域内进行签名</view>
-  <view class="btn_container">
-    <view class="btn clean" bindtap="clearClick">
-      <i class="iconfont icon-qingkongbeifen"></i>
-      <text>内容清除</text>
-    </view>
-    <view class="btn submit" bindtap="saveClick">
-      <i class="iconfont icon-wodetijiao"></i>
-      <text>确认提交</text>
-    </view>
-  </view>
-</view>
-  <view id="canvas" class="canvas">
-    <canvas class='firstCanvas' canvas-id="firstCanvas" bindtouchmove='move' bindtouchstart='start' bindtouchend='end' disable-scroll='true'>
-    </canvas>
-  </view>
-
-</view>

+ 0 - 80
pages/qianming/qianming.wxss

@@ -1,80 +0,0 @@
-.hand_writing_container {
-  width: 100%;
-  padding: 0rpx 40rpx;
-  box-sizing: border-box;
-
-}
-.tit_vi{
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.tips_title {
-  height: 40rpx;
-  line-height: 60rpx;
-  margin-bottom: 20rpx;
-  font-size: 20rpx;
-  font-weight: 500;
-  color: #181818;
-  text-align: left;
-}
-
-.canvas {
-  width: 100%;
-  height: 66.194968vh;
-  margin-bottom: 3.7735849vh;
-  box-sizing: border-box;
-  border: 1rpx dashed #555;
-}
-
-.firstCanvas {
-  background-color: white;
-  width: 100%;
-  height: 100%;
-}
-
-.btn_container {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-around;
-}
-
-.btn {
-  width: 120rpx;
-  height: 35rpx;
-  padding: 0 10rpx;
-  box-sizing: border-box;
-  border-radius: 50rpx;
-  /* justify-content:space-between; */
-  display: flex;
-  align-items: center;
-  justify-content:center;
-  margin-left: 20rpx;
-}
-
-.btn text {
-  /* line-height: 35rpx; */
-  font-size: 16rpx;
-  color: #fff;
-  padding-left: 10rpx;
-}
-.btn i {
-  font-size: 16px;
-  color: #fff;
-}
-.btn i.icon-wodetijiao {
-  font-size: 22rpx;
-  color: #fff;
-}
-
-.clean {
-  background-color: #ff3d33;
-}
-
-.submit {
-  background-color: #07c160;
- 
-}

+ 0 - 91
pages/qiye/qiye.js

@@ -1,91 +0,0 @@
-// pages/qiye/qiye.js
-import http from '../../base/httputil'
-const app = getApp()
-Page({
-  /**
-   * 组件的初始数据
-   */
-  onLoad() {
-  
-  },
-  onShow(){
-  this.initQiyePage()
-  },
-  data: {
-    host: app.globalData.host,
-    weekCount: 0,
-    monthCount: 0,
-    totalCount: 0,
-
-    enterpriseList: [],
-
-
-    menulist: [{
-        "id": "1",
-        "url": "icon-anquanxuncha",
-        "title": "巡查",
-      },
-      {
-        "id": "2",
-        "url": "icon-xunjian",
-        "title": "巡检",
-      },
-    ],
-    mainmodel: {
-
-    }
-  },
-  // 搜索结果跳页
-  bindViewSearchEnd() {
-    wx.navigateTo({
-      url: '../search/search'
-    })
-  },
-  // 企业详细页
-  bindViewDetails(e) {
-    let busEnterpriseId = e.currentTarget.dataset.enterpriseid
-    let delFlag = e.currentTarget.dataset.delflag
-    if(delFlag==1){
-      wx.showToast({
-        title: '该企业已废弃',
-        icon:'none'
-      })
-    }else{
-    wx.navigateTo({
-      url: '../details/details?busEnterpriseId=' + busEnterpriseId
-    })
-  }
-  },
-  //企业表单详细
-  bindViewQiYeMore() {
-    wx.navigateTo({
-      url: '../qiyemore/qiyemore',
-    })
-  },
-
-  initQiyePage() {
-    http.send_post("/system/AppEnterpriseController/getInitEnterpriseData", null, this.getQiyePageSuccess)
-    http.send_post("/system/AppEnterpriseController/getInitEnterpriseList", null, this.getQiyeEnterpriseListSuccess)
-  },
-  getQiyePageSuccess(res) {
-    if(res.code==200){
-      let enterpriseCount = res.data.enterpriseCount;
-      this.setData({
-        weekCount: enterpriseCount.weekCount,
-        monthCount: enterpriseCount.monthCount,
-        totalCount: enterpriseCount.totalCount,
-      })
-    }
-  
-  },
-  getQiyeEnterpriseListSuccess(res) {
-    if(res.code==200){
-    this.setData({
-      enterpriseList: res.rows
-    })}
-  },
-  changeSearch(e) {
-
-  }
-
-})

+ 0 - 12
pages/qiye/qiye.json

@@ -1,12 +0,0 @@
-{
-  "component": true, 
-  "usingComponents": {
-  },
-
-
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "企业"
-
-}
-

+ 0 - 50
pages/qiye/qiye.wxml

@@ -1,50 +0,0 @@
-<!-- 企业列表页面 -->
-<view class="container">
-  <!-- 搜索 -->
-  <view class="search-container">
-    <view class="search-left">
-      <input type="text" bindtap="bindViewSearchEnd" placeholder="搜索" disabled="true"/>
-    </view>
-    <button bindtap="bindViewSearchEnd" class="search-right">
-      <text class="iconfont icon-sousuo"></text>
-    </button>
-  </view>
-  <!-- 企业录入数量 -->
-  <view class="qy_con">
-    <view class="qy_bz">
-      <image src="{{host}}/images/qy_bz.png" />
-      <h2>{{weekCount}}</h2>
-      <p>本周录入</p>
-
-    </view>
-    <view class="qy_by">
-      <image src="{{host}}/images/qy_by.png" />
-      <h2>{{monthCount}}</h2>
-      <p>本月录入</p>
-    </view>
-    <view class="qy_zs">
-      <image src="{{host}}/images/qy_zs.png" />
-      <h2>{{totalCount}}</h2>
-      <p>企业总数</p>
-    </view>
-  </view>
-  <!-- 列表 -->
-  <view class="list_vi">
-    <view class="list_li" bindtap="bindViewDetails" wx:for="{{enterpriseList}}" wx:key="index" data-enterpriseid="{{item.busEnterpriseId}}"  data-delflag="{{item.delFlag}}">
-      <i class="list_icon iconfont icon-queding" wx:if="{{item.riskCount == 0}}"></i>
-      <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.riskCount > 0}}"></i>
-      <text>{{item.businessName}}</text>
-      <text class="txt_ri" wx:if="{{item.delFlag==1}}">废弃</text>
-      <i class="iconfont icon-xiangyou list_right"></i>
-    </view>
-
-
-
-  </view>
-        
-  <!-- 巡检悬浮按钮 -->
-  <view class="float_btn iconfont icon-jiahao" bindtap="bindViewQiYeMore"></view>
-
-
-
-</view>

+ 0 - 45
pages/qiye/qiye.wxss

@@ -1,45 +0,0 @@
-.qy_con {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-around;
-  text-align: center;
-  margin: 30rpx 30rpx;
-}
-
-.qy_con view {
-  height: 140rpx;
-  color: #fff;
-  display: flex;
-  flex-direction: column;
-  padding: 15rpx 40rpx;
-  position: relative;
-}
-
-.qy_con view image {
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  width: 100%;
-  height: 100%;
-  z-index: -1;
-}
-
-.qy_con view h2 {
-  font-size: 58rpx;
-  font-weight: bolder;
-  padding-top: 10rpx;
-}
-
-.qy_con view p {
-  font-size: 35rpx;
-}
-
-.icon-jiahao {
-  font-size: 60rpx;
-}
-.txt_ri{
-  color: rgb(223, 0, 0)!important;
-  font-size: 24rpx;
-  position: absolute;
-  right: 90rpx;
-}

+ 0 - 249
pages/qiyemore/qiyemore.js

@@ -1,249 +0,0 @@
-// pages/qiyemore/qiyemore.js
-import http from '../../base/httputil'
-const app = getApp()
-Page({
-
-  onLoad() {
-    // console.log("@@","load")
-    //this.getLocation()
-  },
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    host: app.globalData.host,
-    longitude: Number,
-    form: {
-      longitude: Number,
-      latitude: Number,
-      businessName: '',
-      orgCode: '',
-      enterpriseCode: '',
-      officeAddress: '',
-      businessAddress: '',
-      supervisor: '',
-      tradeDept: '',
-      deptId: '',
-      mainPerson: '',
-      mainPersonPhone: '',
-      headSecurity: '',
-      headSecurityPhone: '',
-
-    }
-  },
-  //-------------------------------表单数据绑定方法---------------------------------------
-  get_businessName(e) {
-    this.data.form.businessName = e.detail.value
-  },
-  get_orgCode(e) {
-    this.data.form.orgCode = e.detail.value
-  },
-  get_qrCode(e) {
-    this.data.form.enterpriseCode = e.detail.value
-  },
-  get_officeAddress(e) {
-    this.data.form.officeAddress = e.detail.value
-  },
-  get_businessAddress(e) {
-    this.data.form.businessAddress = e.detail.value
-  },
-  get_supervisor(e) {
-    this.data.form.supervisor = e.detail.value
-  },
-  get_tradeDept(e) {
-    this.data.form.tradeDept = e.detail.value
-  },
-  get_mainPerson(e) {
-    this.data.form.mainPerson = e.detail.value
-  },
-  get_mainPersonPhone(e) {
-    this.data.form.mainPersonPhone = e.detail.value
-  },
-  get_headSecurity(e) {
-    this.data.form.headSecurity = e.detail.value
-  },
-  headSecurityPhone(e) {
-    this.data.form.headSecurityPhone = e.detail.value
-  },
-  //----------------------------------------------------------------------------
-
-
-  saoyisao() {
-
-    wx.scanCode({
-      onlyFromCamera: true,
-      success: (res) => {
-        //this.data.form.qrCode=res.result
-        this.setData({
-          ['form.enterpriseCode']: res.result
-        })
-      },
-      fail: (res) => {
-        wx.showToast({
-          title: '扫描失败请手动输入',
-          icon: 'none'
-        })
-      }
-    })
-  },
-
-  addEnterprise(e) {
-    if (isNaN(this.data.form.latitude) || isNaN(this.data.form.longitude)) {
-      wx.showToast({
-        title: '请点击获取当前位置',
-        icon: 'none'
-      })
-      return
-    }
-   
-    if(this.data.form.businessName==null||this.data.form.businessName==''){
-      wx.showToast({
-        title: '请输入企业名称',
-        icon:'none'
-      })
-      return
-    }
-
-    if(this.data.form.enterpriseCode==null||this.data.form.enterpriseCode==''){
-      wx.showToast({
-        title: '请输入企业编码',
-        icon:'none'
-      })
-      return
-    }
-  
-    if(this.data.form.orgCode==null||this.data.form.orgCode==''){
-      wx.showToast({
-        title: '请输入机构代码证号',
-        icon:'none'
-      })
-      return
-    }
-
-    if(this.data.form.officeAddress==null||this.data.form.officeAddress==''){
-      wx.showToast({
-        title: '请输入办公地址',
-        icon:'none'
-      })
-      return
-    }
-  
-    if(this.data.form.mainPerson==null||this.data.form.mainPerson==''){
-      wx.showToast({
-        title: '请输入主要负责人姓名',
-        icon:'none'
-      })
-      return
-    }
-    if(this.data.form.mainPersonPhone==null||this.data.form.mainPersonPhone==''){
-      wx.showToast({
-        title: '请输入主要负责人电话',
-        icon:'none'
-      })
-      return
-    }
-    let obj = new Object()
-    obj.enterpriseCode = this.data.form.enterpriseCode
-    obj.latitude = this.data.form.latitude
-    obj.longitude = this.data.form.longitude
-    obj.businessName = this.data.form.businessName
-    obj.orgCode = this.data.form.orgCode
-    obj.officeAddress = this.data.form.officeAddress
-    obj.businessAddress = this.data.form.businessAddress
-    obj.supervisor = this.data.form.supervisor
-    obj.tradeDept = this.data.form.tradeDept
-    obj.mainPerson = this.data.form.mainPerson
-    obj.mainPersonPhone = this.data.form.mainPersonPhone
-    obj.headSecurity = this.data.form.headSecurity
-    obj.headSecurityPhone = this.data.form.headSecurityPhone
-    
-     http.post("/system/AppEnterpriseController/addEnterprise", obj, this.addEnterpriseSuccess)
-  },
-  addEnterpriseSuccess(e) {
-    wx.showToast({
-      title: e.msg,
-      icon: "none"
-    })
-    if (e.code == 200) {
-      // wx.navigateTo({
-      // url: '../qiye/qiye',
-      // })
-      wx.navigateBack()
-    }
-  },
-
-
-
-  getLocation() {
-    let that = this
-    wx.getLocation({
-      type: 'wgs84', //返回可以用于wx.openLocation的经纬度
-      success: function (res) {
-        that.setData({
-
-          ['form.longitude']: res.longitude,
-          ['form.latitude']: res.latitude
-
-
-        })
-      },
-    })
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

+ 0 - 8
pages/qiyemore/qiyemore.json

@@ -1,8 +0,0 @@
-{
-  "usingComponents": {},
-
-
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "企业详情"
-}

+ 0 - 76
pages/qiyemore/qiyemore.wxml

@@ -1,76 +0,0 @@
-<!--pages/qiyemore/qiyemore.wxml-->
-<!-- 企业新增页面 -->
-<view class="container">
-  <view class="page-section">
-    <!-- <view class="input_vi">
-      <view class="input_title">经度</view>
-      <input bindtap="getLocation" value="{{form.longitude}}" disabled="true" class="inp_txt" auto-focus placeholder="点击获取当前位置"  maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">纬度</view>
-      <input bindtap="getLocation" value="{{form.latitude}}" disabled="true" class="inp_txt" placeholder="点击获取当前位置" maxlength="100" />
-    </view> -->
-    <view class="input_vi input_vic">
-      <view class="input_title">坐标</view>
-    <view  class="flex_c"  wx:if="{{form.latitude==null}}">
-      <input class="inp_txt2" value="{{form.longitude}}" disabled="true" placeholder="点击获取坐标" maxlength="20" bindtap="getLocation" />
-    </view>
-      <view class="flex_c" wx:else>
-       <input class="inp_txt2" value="{{form.longitude}}" disabled="true" maxlength="20"/>
-      <text>,</text><input class="inp_txt2" value="{{form.latitude}}" disabled="true"  maxlength="20"/>
-      <image style="margin-left: 5rpx;" src="../images/icon_hq.png" class="icon" bindtap="getLocation" />
-      </view>
-      
-    </view>
-    <view class="input_vi">
-      <view class="input_title">企业名称</view>
-      <input bindinput="get_businessName" class="inp_txt" placeholder="请输入企业名称" maxlength="100" />
-    </view>
-    <view class="input_vi">
-      <view class="input_title">企业编码</view>
-      <i class="iconfont icon-saoyisao1" bindtap="saoyisao"></i>
-      <input bindinput="get_qrCode" class="inp_txt inp_txt2" placeholder="请输入或扫描"value="{{form.enterpriseCode}}"  maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">机构代码</view>
-      <input bindinput="get_orgCode" class="inp_txt" placeholder="请输入机构代码证号"  maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">办公地址</view>
-      <input bindinput="get_officeAddress" class="inp_txt"  placeholder="请输入办公地址"  maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">经营地址</view>
-      <input bindinput="get_businessAddress" class="inp_txt" placeholder="请输入经营地址"  maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">监管人员</view>
-      <input bindinput="get_supervisor" class="inp_txt" placeholder="请输入监管人员姓名"  maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">主管部门</view>
-      <input bindinput="get_tradeDept" class="inp_txt" placeholder="请输入主管部门名称" maxlength="100" />
-    </view>
-    <!-- <view class="input_vi">
-      <view class="input_title">所属部门</view>
-      <input class="inp_txt" placeholder="将会获取焦点" />
-    </view> -->
-    <view class="input_vi">
-      <view class="input_title">主要负责人</view>
-      <input bindinput="get_mainPerson" class="inp_txt" placeholder="请输入主要负责人姓名"  maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">负责人电话</view>
-      <input bindinput="get_mainPersonPhone" type="number" placeholder="请输入负责人电话" maxlength="13"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">安全负责人</view>
-      <input bindinput="get_headSecurity" class="inp_txt" placeholder="请输入安全负责人"  maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">负责人电话</view>
-      <input bindinput="headSecurityPhone" type="number" placeholder="请输入安全负责人电话" maxlength="13"/>
-    </view>
-  </view>
-  <button type="primary" class="tj_btn" bindtap="addEnterprise">提交</button>
-</view>

+ 0 - 86
pages/qiyemore/qiyemore.wxss

@@ -1,86 +0,0 @@
-/* pages/qiyemore/qiyemore.wxss */
-.container{
-  padding: 30rpx 30rpx;
-}
-.page-section{
-  display: flex;
-  flex-direction: column;
-}
-.input_vi{
-  display: block;
-  border-bottom: 1px solid #f3f3f3;
-  height: 100rpx;
-}
-.input_vi .input_title{
-  font-size: 34rpx;
-  height: 100rpx;
-  line-height: 100rpx;
-  color: #181818;
-  float: left;
-}
-.input_vi input{
-  border:0px;
-  height: 100rpx;
-  line-height: 100rpx;
- padding-left: 20rpx;
- border-radius: 10rpx;
- font-size: 34rpx;
- color: #555;
- text-align: right;
-}
-.input_vi input.inp_txt2{
-  border:0px;
-  height: 100rpx;
-  line-height: 100rpx;
- padding-left: 20rpx;
- border-radius: 10rpx;
- font-size: 34rpx;
- color: #555;
- text-align: right;
- float: right;
-}
-.input_vi i{
- display: block;
- float: right;
- line-height: 100rpx;
- margin-left: 14rpx;
- color: #535353;
- font-size: 48rpx;
-}
-.input-placeholder, .input-placeholder-dark{
- color: #c5c5c5!important;
-}
-.tj_btn{
-  width: 100%!important;
-  font-size: 32rpx;
-  margin: 60rpx auto;
-  padding: 24rpx 46rpx!important;
-}
-.icon{
-  height: 40rpx;
-  width: 40rpx;
-}
-.inp_txt2{
-  text-align: left!important;
-  font-size: 18rpx;
-  width: 200rpx!important;
- }
- .input_vic{
-   display: flex;
-   flex-direction: row;
- }
- .input_vic image{
-   align-items: center;
-   display: flex;
- }
- .flex_c{
-   display: flex;
-   flex-direction: row;
-   margin-left: auto;
-   align-items: center;
- }
- .input_vic text{
-   font-size: 32rpx;
-   line-height: 100rpx;
-   color: #555;
- }

+ 0 - 219
pages/qiyexqtable/qiyexqtable.js

@@ -1,219 +0,0 @@
-import http from '../../base/httputil'
-const app = getApp()
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    host: app.globalData.host,
-    busEnterpriseId: null,
-    enterpriseDetails: {
-      busEnterpriseId: null,
-      longitude: Number,
-      latitude: Number,
-      businessName: null,
-      orgCode: null,
-      officeAddress: null,
-      businessAddress: null,
-      supervisor: null,
-      tradeDept: null,
-      deptId: null,
-      mainPerson: null,
-      mainPersonPhone: null,
-      headSecurity: null,
-      headSecurityPhone: null
-    },
-
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-    this.busEnterpriseId = options.busEnterpriseId
-    this.getEnterpriseDetails()
-  },
-
-  getEnterpriseDetails() {
-    let obj = new Object();
-    obj.busEnterpriseId = this.busEnterpriseId
-    http.post("/system/AppEnterpriseController/getEnterpriseDetails", obj, this.getEnterpriseDetailsSuccess)
-  },
-  getEnterpriseDetailsSuccess(res) {
-    this.setData({
-      enterpriseDetails: res.enterpriseDetails,
-    })
-  },
-  //-----------------------------------------
-  get_businessName(e) {
-    this.data.enterpriseDetails.businessName = e.detail.value
-  },
-  get_officeAddress(e) {
-    this.data.enterpriseDetails.officeAddress = e.detail.value
-  },
-  get_businessAddress(e) {
-    this.data.enterpriseDetails.businessAddress = e.detail.value
-  },
-  get_supervisor(e) {
-    this.data.enterpriseDetails.supervisor = e.detail.value
-  },
-  get_tradeDept(e) {
-    this.data.enterpriseDetails.tradeDept = e.detail.value
-  },
-  get_mainPerson(e) {
-    this.data.enterpriseDetails.mainPerson = e.detail.value
-  },
-  get_mainPersonPhone(e) {
-    this.data.enterpriseDetails.mainPersonPhone = e.detail.value
-  },
-  get_headSecurity(e) {
-    this.data.enterpriseDetails.headSecurity = e.detail.value
-  },
-  headSecurityPhone(e) {
-    this.data.enterpriseDetails.headSecurityPhone = e.detail.value
-  },
-
-  getLocation() {
-    let that = this
-    wx.getLocation({
-      type: 'wgs84', //返回可以用于wx.openLocation的经纬度
-      success: function (res) {
-
-        that.setData({
-
-          ['enterpriseDetails.longitude']: res.longitude,
-          ['enterpriseDetails.latitude']: res.latitude
-
-
-        })
-      },
-    })
-  },
-
-  //------------------------------------------
-
-  updateEnterprise() {
-    if(this.data.enterpriseDetails.businessName==null||this.data.enterpriseDetails.businessName==''){
-      wx.showToast({
-        title: '请输入企业名称',
-        icon:'none'
-      })
-      return
-    }
-
-    if(this.data.enterpriseDetails.officeAddress==null||this.data.enterpriseDetails.officeAddress==''){
-      wx.showToast({
-        title: '请输入办公地址',
-        icon:'none'
-      })
-      return
-    }
-  
-    if(this.data.enterpriseDetails.mainPerson==null||this.data.enterpriseDetails.mainPerson==''){
-      wx.showToast({
-        title: '请输入主要负责人姓名',
-        icon:'none'
-      })
-      return
-    }
-    
-    if(this.data.enterpriseDetails.mainPersonPhone==null||this.data.enterpriseDetails.mainPersonPhone==''){
-      wx.showToast({
-        title: '请输入主要负责人电话',
-        icon:'none'
-      })
-      return
-    }
-    
-    let obj = new Object();
-    obj.busEnterpriseId = this.data.enterpriseDetails.busEnterpriseId
-    obj.businessName = this.data.enterpriseDetails.businessName
-    obj.officeAddress = this.data.enterpriseDetails.officeAddress
-    obj.businessAddress = this.data.enterpriseDetails.businessAddress
-    obj.supervisor = this.data.enterpriseDetails.supervisor
-    obj.tradeDept = this.data.enterpriseDetails.tradeDept
-    obj.mainPerson = this.data.enterpriseDetails.mainPerson
-    obj.mainPersonPhone = this.data.enterpriseDetails.mainPersonPhone
-    obj.headSecurity = this.data.enterpriseDetails.headSecurity
-    obj.headSecurityPhone = this.data.enterpriseDetails.headSecurityPhone
-    obj.latitude = this.data.enterpriseDetails.latitude
-    obj.longitude = this.data.enterpriseDetails.longitude
-    http.post("/system/AppEnterpriseController/updateEnterprise", obj, this.updateEnterpriseSuccess)
-  },
-  updateEnterpriseSuccess(res) {
-    wx.showToast({
-      title: res.msg,
-    })
-    if(res.code == 200){
-      wx.navigateBack()
-      // wx.navigateTo({
-        // url: '../details/details?busEnterpriseId=' + this.busEnterpriseId,
-      // })
-    }
-  },
-  deleteEnterprise() {
-    let obj = new Object();
-    obj.busEnterpriseId = this.data.enterpriseDetails.busEnterpriseId
-    http.post("/system/AppEnterpriseController/deleteEnterprise", obj, this.deleteEnterpriseSuccess)
-  },
-  deleteEnterpriseSuccess(res) {
-    wx.showToast({
-      title: res.msg,
-    })
-    if(res.code == 200){
-      wx.navigateTo({
-        url: '../qiye/qiye'
-      })
-    }
-  },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

+ 0 - 8
pages/qiyexqtable/qiyexqtable.json

@@ -1,8 +0,0 @@
-{
-  "usingComponents": {},
-
-
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "企业详情"
-}

+ 0 - 71
pages/qiyexqtable/qiyexqtable.wxml

@@ -1,71 +0,0 @@
-<!--pages/qiyexqtable/qiyexqtanle.wxml-->
-<!-- 企业编辑页面 -->
-<view class="container">
-  <view class="page-section">
-    <view class="input_vi input_vic">
-      <view class="input_title">坐标</view>
-      <view class="flex_c">
-       <input class="inp_txt2" value="{{enterpriseDetails.longitude}}" disabled="true"  maxlength="20"/>
-      <text>,</text><input class="inp_txt2" value="{{enterpriseDetails.latitude}}" disabled="true"  maxlength="20"/>
-      <image style="margin-left: 5rpx;" src="../images/icon_hq.png" class="icon" bindtap="getLocation" />
-      </view>
-      
-    </view>
-    
-    <!-- <view class="input_vi">
-      <view class="input_title">纬度</view>
-      <input class="inp_txt" value="{{enterpriseDetails.latitude}}" disabled="true"  maxlength="100"/>
-    </view> -->
-    <view class="input_vi">
-      <view class="input_title">企业名称</view>
-      <input class="inp_txt" bindinput="get_businessName" value="{{enterpriseDetails.businessName}}" maxlength="100" />
-    </view>
-    <view class="input_vi">
-      <view class="input_title">机构代码</view>
-      <input class="inp_txt" value="{{enterpriseDetails.orgCode}}" disabled="true"  maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">办公地址</view>
-      <input class="inp_txt" bindinput="get_officeAddress" value="{{enterpriseDetails.officeAddress}}"  maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">经营地址</view>
-      <input class="inp_txt" bindinput="get_businessAddress" value="{{enterpriseDetails.businessAddress}}"  maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">监管人员</view>
-      <input class="inp_txt" bindinput="get_supervisor" value="{{enterpriseDetails.supervisor}}"  maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">主管部门</view>
-      <input class="inp_txt" bindinput="get_tradeDept" value="{{enterpriseDetails.tradeDept}}"  maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">所属部门</view>
-      <input class="inp_txt" value="{{enterpriseDetails.deptName}}" disabled="true"  maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">主要负责人</view>
-      <input class="inp_txt" bindinput="get_mainPerson" value="{{enterpriseDetails.mainPerson}}"  maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">负责人电话</view>
-      <input type="number" maxlength="13" bindinput="get_mainPersonPhone" value="{{enterpriseDetails.mainPersonPhone}}"  maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">安全负责人</view>
-      <input class="inp_txt" bindinput="get_headSecurity" value="{{enterpriseDetails.headSecurity}}"  maxlength="100"/>
-    </view>
-    <view class="input_vi">
-      <view class="input_title">负责人电话</view>
-      <input type="number" maxlength="13" bindinput="headSecurityPhone" value="{{enterpriseDetails.headSecurityPhone}}"  maxlength="100"/>
-    </view>
-  </view>
-
-  <view class="table_btn">
-    <!-- <button type="warn" class="sc_btn" bindtap="deleteEnterprise">删除</button> -->
-
-    <button type="primary" class="tj_btn" bindtap="updateEnterprise">提交</button>
-  </view>
-
-</view>

+ 0 - 78
pages/qiyexqtable/qiyexqtable.wxss

@@ -1,78 +0,0 @@
-/* pages/qiyexqtable/qiyexqtanle.wxss */
-.container{
-  padding: 30rpx 30rpx;
-}
-.page-section{
-  display: flex;
-  flex-direction: column;
-}
-.input_vi{
-  display: block;
-  border-bottom: 1px solid #f3f3f3;
-  height: 100rpx;
-  margin-bottom: 20rpx;
-}
-.inp_txt2{
- text-align: left!important;
- font-size: 18rpx;
- width: 180rpx!important;
-}
-.input_vic{
-  display: flex;
-  flex-direction: row;
-}
-.input_vic image{
-  align-items: center;
-  display: flex;
-}
-.flex_c{
-  display: flex;
-  flex-direction: row;
-  margin-left: auto;
-  align-items: center;
-}
-.input_vic text{
-  font-size: 32rpx;
-  line-height: 100rpx;
-  color: #555;
-}
-.input_vi .input_title{
-  font-size: 34rpx;
-  height: 100rpx;
-  line-height: 100rpx;
-  color: #181818;
-  float: left;
-}
-.input_vi input{
-  border:0px;
-  height: 100rpx;
-  line-height: 100rpx;
- padding-left: 20rpx;
- border-radius: 10rpx;
- font-size: 34rpx;
- color: #555;
- text-align: right;
-}
-.input-placeholder, .input-placeholder-dark{
- color: #c5c5c5!important;
-}
-.table_btn{
-  display: flex;
-  flex-direction: row;
-}
-.sc_btn{
-  width: 30%!important;
-  font-size: 32rpx;
-  margin: 60rpx auto;
-padding: 24rpx 0px!important;
-}
-.tj_btn{
-  width: 60%!important;
-  font-size: 32rpx;
-  margin: 60rpx auto;
-  padding: 24rpx 0px!important;
-}
-.icon{
-  height: 40rpx;
-  width: 40rpx;
-}

+ 0 - 236
pages/search/search.js

@@ -1,236 +0,0 @@
-import http from '../../base/httputil'
-const app = getApp()
-Page({
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    host: app.globalData.host,
-    enterpriseList: [],
-    enterpriseCode: '',
-    keyword: '',
-    /**
-     * 控制上拉到底部时是否出现 "数据加载中..."
-     */
-    hidden: true,
-    /**
-     * 数据是否正在加载中,避免数据多次加载
-     */
-    loadingData: false,
-
-    isRefresh: true,
-    total: 0,
-    pageNum: 1 // 页码
-  },
-  onLoad() { 
-    this.loadData();
-  },
-
-  //加载数据
-  loadData: function () {
-    var obj = new Object()
-    obj.pageNum = this.data.pageNum
-    obj.pageSize = 10
-    obj.reasonable = false
-    // obj.businessName = e.detail.value
-    obj.searchValue = this.data.keyword,
-      this.list(obj)
-  },
-  onShow() {
-  },
-
-  // 企业详细页
-  bindViewDetails(e) {
-    let busEnterpriseId = e.currentTarget.dataset.enterpriseid
-    wx.navigateTo({
-      url: '../details/details?busEnterpriseId=' + busEnterpriseId
-    })
-  },
-
-  searchEnterprise(e) {
-    wx.showNavigationBarLoading();
-
-    var loadingData = this.data.loadingData
-    if (loadingData) {
-      return;
-    }
-    this.setData({
-      pageNum: 1,
-      isRefresh: true
-    })
-    var obj = new Object()
-    obj.pageNum = this.data.pageNum
-    obj.pageSize = 10
-    obj.reasonable = false
-    this.data.keyword = e.detail.value,
-      obj.searchValue = e.detail.value,
-      this.list(obj)
-  },
-
-  bindViewSearchCode() {
-    let that = this
-    wx.scanCode({
-      onlyFromCamera: true,
-      success: (res) => {
-        that.setData({
-          //['details.code']:res.result,
-          enterpriseCode: res.result
-        })
-        // var obj = new Object()
-        // obj.searchValue = that.data.enterpriseCode
-
-        wx.showNavigationBarLoading();
-
-        var loadingData = this.data.loadingData
-        if (loadingData) {
-          return;
-        }
-        that.setData({
-          pageNum: 1,
-          isRefresh: true
-        })
-        
-        var obj = new Object()
-        this.data.keyword =that.data.enterpriseCode,
-
-        obj.pageNum = this.data.pageNum
-        obj.pageSize = 10
-        obj.reasonable = false
-        obj.searchValue = that.data.enterpriseCode
-
-        that.list(obj)
-      },
-      fail: (res) => {
-        // wx.showToast({
-        //   title: '扫描失败请重试',
-        //   icon:'none'
-        // })
-      }
-    })
-  },
-  list(data) {
-    http.post("/system/AppEnterpriseController/getInitEnterpriseList", data, this.getQiyeEnterpriseListSuccess)
-  },
-
-  getQiyeEnterpriseListSuccess(res) {
-
-    if (res.code == 200) {
-      // 显示加载图标
-      wx.showLoading({
-        title: '玩命加载中',
-      })
-
-      var that = this
-
-
-      if (res.rows.length == 0) {
-        wx.showToast({
-          title: '暂无更多数据',
-          icon: "none"
-        })
-        that.setData({
-          hidden: true,
-          loadingData: false
-        });
-
-      }
-      if (this.data.isRefresh) {
-        this.setData({
-          enterpriseList: res.rows,
-          total: res.total
-        })
-
-
-
-        // 隐藏导航栏加载框
-        setTimeout(function () {
-          that.setData({
-            loadingData: false
-          });
-          wx.hideNavigationBarLoading();
-          // 停止下拉动作
-          wx.stopPullDownRefresh();
-          wx.hideLoading()
-
-        }, 1000)
-
-      } else {
-        this.setData({
-          enterpriseList: this.data.enterpriseList.concat(res.rows)
-        })
-        // 隐藏加载框
-
-        setTimeout(function () {
-          that.setData({
-            hidden: true,
-            loadingData: false
-          });
-          wx.hideLoading();
-        }, 1000)
-
-      }
-    } else {
-
-    }
-  },
-  onPullDownRefresh: function () {
-    // 显示顶部刷新图标
-    wx.showNavigationBarLoading();
-    var that = this;
-    var loadingData = this.data.loadingData
-    if (loadingData) {
-      return;
-    }
-    that.setData({
-      pageNum: 1,
-      isRefresh: true
-    })
-    this.loadData()
-  },
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-    let that = this
-    var loadingData = that.data.loadingData
-
-    var hidden = that.data.hidden
-    // 页数+1
-    that.setData({
-      pageNum: that.data.pageNum + 1,
-      isRefresh: false
-    })
-    if (hidden) {
-      that.setData({
-        hidden: false
-      });
-      console.info(that.data.hidden);
-    }
-
-    if (loadingData) {
-      return;
-    }
-    that.setData({
-      loadingData: true
-    });
-
-
-    //console.log("@@@@"+Math.ceil(this.data.total/10))
-    // if(Math.ceil(that.data.total/10)>=that.data.pageNum){
-    that.loadData();
-
-    // }else{
-
-    //   setTimeout(function () {
-    //     that.setData({
-    //       hidden: true,
-    //     });
-
-    //   }, 2000)
-    // }
-
-
-  },
-
-
-})

+ 0 - 9
pages/search/search.json

@@ -1,9 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarBackgroundColor": "#f94b0e",
-    "navigationBarTextStyle": "white",
-    "enablePullDownRefresh": true,
-    "onPullDownRefresh": true,
-    "onReachBottom": true,
-    "navigationBarTitleText": "搜索"
-}

+ 0 - 30
pages/search/search.wxml

@@ -1,30 +0,0 @@
-<view class="container">
-  <!-- 搜索 -->
-  <view class="search-container">
-    <view class="search-left">
-      <input type="text" bindinput="searchEnterprise" placeholder="请输入企业名称" value="{{enterpriseCode}}" />
-    </view>
-    <button bindtap="bindViewSearchCode" class="search-right">
-      <text class="iconfont icon-saoyisao1"></text>
-    </button>
-  </view>
-
-  <!-- 列表 -->
-  <view class="list_vi">
-    <view class="list_li" bindtap="bindViewDetails" wx:for="{{enterpriseList}}" wx:key="index"
-     data-enterpriseid="{{item.busEnterpriseId}}">
-      <i class="list_icon iconfont icon-queding" wx:if="{{item.riskCount == 0}}"></i>
-      <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.riskCount > 0}}"></i>
-      <text>{{item.businessName}}</text>
-      <i class="iconfont icon-xiangyou list_right"></i>
-    </view>
-
-    <view class='data-loading' hidden='{{hidden}}'>
-    数据加载中...
-  </view>
-  </view>
-
-
-
-
-</view>

+ 0 - 9
pages/search/search.wxss

@@ -1,9 +0,0 @@
-/* pages/search/search.wxss */
-
-.data-loading {
-  height: 100rpx;
-  line-height: 100rpx;
-  background-color: #fff;
-  text-align: center;
-  font-size: 14px;
-}

+ 0 - 112
pages/teamlist/details/team_details.js

@@ -1,112 +0,0 @@
-// pages/material/material_details.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    charger: "",
-    createBy: "",
-    createTime: "",
-
-    deptName: "",
-    emergencyPhone: "",
-    equipmentNum: "",
-    goodat: "",
-
-    remark: "",
-    searchValue: "",
-    teamCategory: "",
-
-    teamName: "",
-    teamNature: "",
-    teamPnum: "",
-    teamPos: ""
-
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-    let details = JSON.parse(options.details)
-    this.setData({
-      charger: details.charger,
-      createBy: details.createBy,
-      createTime: details.createTime,
-  
-      deptName: details.deptName,
-      emergencyPhone: details.emergencyPhone,
-      equipmentNum: details.equipmentNum,
-      goodat: details.goodat,
-  
-      remark: details.remark,
-      searchValue:details.searchValue,
-      teamCategory: details.teamCategory,
-  
-      teamName: details.teamName,
-      teamNature: details.teamNature,
-      teamPnum: details.teamPnum,
-      teamPos: details.teamPos
-  
-
-    })
-
-  },
-  //拨打电话
-  Call() {
-    
-    wx.makePhoneCall({
-      phoneNumber: this.data.connectorPhone
-    })
-  },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

+ 0 - 13
pages/teamlist/details/team_details.json

@@ -1,13 +0,0 @@
-{
-  "component": true, 
-  "usingComponents": {
-    
-  },
-
-
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "队伍详情"
-
-}
-

+ 0 - 56
pages/teamlist/details/team_details.wxml

@@ -1,56 +0,0 @@
-<!-- 队伍详情页面 -->
-<view class="container">
-  <view class="notice_tit">
-
-  <view class="tit"><i class="iconfont icon-dian"></i>队伍名称</view>
-    <view class="bor">
-  <i>{{teamName}}</i>
-  </view>
-  <view class="tit"><i class="iconfont icon-dian"></i>队伍分类</view>
-    <view class="bor">
-  <i>{{teamCategory}}</i>
-  </view>
-  <view class="tit"><i class="iconfont icon-dian"></i>队伍性质</view>
-    <view class="bor">
-  <i>{{teamNature}}</i>
-  </view>
-  <view class="tit"><i class="iconfont icon-dian"></i>队伍人数</view>
-    <view class="bor">
-  <i>{{teamPnum}}</i>
-  </view>
-  <view class="tit"><i class="iconfont icon-dian"></i>核心装备及数量</view>
-    <view class="bor">
-  <i>{{equipmentNum}}</i>
-  </view>
-  <view class="tit"><i class="iconfont icon-dian"></i>部门名称</view>
-    <view class="bor">
-  <i>{{deptName}}</i>
-  </view>
-  <view class="tit"><i class="iconfont icon-dian"></i>负责人</view>
-    <view class="bor">
-  <i>{{charger}}</i>
-  </view>
-  <view class="tit"><i class="iconfont icon-dian"></i>应急联系人及电话</view>
-    <view class="bor">
-  <i>{{emergencyPhone}}</i>
-  </view>
-  <view class="tit"><i class="iconfont icon-dian"></i>所在地点</view>
-    <view class="bor">
-  <i>{{teamPos}}</i>
-  </view>
-  <!-- <view class="tit"><i class="iconfont icon-dian"></i>备注</view>
-    <view class="bor">
-  <i>{{remark}}</i>
-  </view> -->
-
-
-</view>
-</view>
-
-
-<!-- <view class="phone" bindtap="Call">
-  <span>负责人电话:</span>
-  <i>{{enterpriseDetails.mainPersonPhone}}</i>
-</view> -->
-
-

+ 0 - 4
pages/teamlist/details/team_details.wxss

@@ -1,4 +0,0 @@
-/* pages/material/material_details.wxss */
-.container{
-  margin: 30rpx 30rpx;
-}

+ 0 - 192
pages/teamlist/serch/team_serch.js

@@ -1,192 +0,0 @@
-import http from '../../../base/httputil'
-const app = getApp()
-Page({
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    host: app.globalData.host,
-    teamList: [],
-     /**
-     * 控制上拉到底部时是否出现 "数据加载中..."
-     */
-    hidden: true,
-    /**
-     * 数据是否正在加载中,避免数据多次加载
-     */
-    loadingData: false,
-    isRefresh: true,
-    total: 0,
-    pageNum: 1, // 页码
-    serchValue: ""
-  },
-  onLoad() {
-   // this.list(null)
-  },
- 
-  // 队伍详细页
-  bindViewDetails(e) {
-    let team_details = e.currentTarget.dataset.index
-
-    wx.navigateTo({
-      url: '../details/team_details?details=' + JSON.stringify(team_details)
-    })
-  },
-
-  searchEnterprise(e) {
-    var obj = new Object()
-    this.setData({
-      serchValue: e.detail.value,
-      teamList: [],
-      hidden: true,
-      loadingData: false,
-      isRefresh: true,
-      total: 0,
-      pageNum: 1, // 页
-    })
-    obj.teamName = e.detail.value
-    obj.pageNum = this.data.pageNum
-    obj.pageSize = 10
-    obj.reasonable = false
-    this.list(obj)
-  },
-
-  list(data) {
-    http.send_get("/system/AppTeamController/getTeamList", data, this.getTeamListSuccess)
-  },
-
-  getTeamListSuccess(res) {
-
-    
-    if (res.code == 200) {
-      // 显示加载图标
-      wx.showLoading({
-        title: '玩命加载中',
-      })
-      var that = this
-
-      if (res.data.rows.length == 0) {
-        wx.showToast({
-          title: '暂无更多数据',
-          icon: "none"
-        })
-      }
-      if (this.data.isRefresh) {
-        this.setData({
-          teamList: res.data.rows,
-          total: res.data.total
-        })
-
-
-
-        // 隐藏导航栏加载框
-        setTimeout(function () {
-          that.setData({
-            loadingData: false
-          });
-          wx.hideNavigationBarLoading();
-          // 停止下拉动作
-          wx.stopPullDownRefresh();
-          wx.hideLoading()
-
-        }, 1000)
-
-      } else {
-        this.setData({
-          teamList: this.data.teamList.concat(res.data.rows)
-        })
-        // 隐藏加载框
-
-        setTimeout(function () {
-          that.setData({
-            hidden: true,
-            loadingData: false
-          });
-
-          wx.hideLoading();
-        }, 1000)
-
-      }
-    } else {
-      
-    }
-  },
-  onPullDownRefresh: function () {
-    // 显示顶部刷新图标
-    if (this.data.serchValue == "") {
-      wx.showToast({
-        title: '请输入搜索内容',
-        icon: 'error'
-      })
-      return
-    }
-    wx.showNavigationBarLoading();
-    var that = this;
-    var loadingData = this.data.loadingData
-    if (loadingData) {
-      return;
-    }
-    that.setData({
-      pageNum: 1,
-      isRefresh: true
-    })
-
-    let obj = new Object()
-    obj.pageNum = this.data.pageNum
-    obj.teamName = this.data.serchValue
-    obj.pageSize = 10
-    obj.reasonable = false
-    this.list(obj)
-  },
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-    let that = this
-    var loadingData = that.data.loadingData
-
-    var hidden = that.data.hidden
-    // 页数+1
-    that.setData({
-      pageNum: that.data.pageNum + 1,
-      isRefresh: false
-    })
-    if (hidden) {
-      that.setData({
-        hidden: false
-      });
-      console.info(that.data.hidden);
-    }
-
-    if (loadingData) {
-      return;
-    }
-    that.setData({
-      loadingData: true
-    });
-
-
-    //console.log("@@@@"+Math.ceil(this.data.total/10))
-    // if(Math.ceil(that.data.total/10)>=that.data.pageNum){
-    // that.loadData();
-    let obj = new Object()
-    obj.pageNum = that.data.pageNum
-    obj.teamName =that.data.serchValue
-    obj.pageSize = 10
-    obj.reasonable = false
-    that.list(obj)
-
-    // }else{
-
-    //   setTimeout(function () {
-    //     that.setData({
-    //       hidden: true,
-    //     });
-
-    //   }, 2000)
-    // }
-
-
-  },
-
-})

+ 0 - 9
pages/teamlist/serch/team_serch.json

@@ -1,9 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "搜索结果",
-  "enablePullDownRefresh": true,
-  "onPullDownRefresh": true,
-  "onReachBottom": true
-}

+ 0 - 35
pages/teamlist/serch/team_serch.wxml

@@ -1,35 +0,0 @@
-<view class="container">
-  <!-- 搜索 -->
-  <view class="search-container">
-    <view class="search-left">
-      <input type="text" bindinput="searchEnterprise" placeholder="搜索" />
-    </view>
-    <button bindtap="bindViewSearchEnd" class="search-right">
-      <text class="iconfont icon-sousuo"></text>
-    </button>
-  </view>
-
-  <!-- 列表 -->
-  <view class="list_vi">
-    <view class="list_li3" catchtap="bindViewDetails" wx:for="{{teamList}}" wx:key="index" data-index="{{item}}">
-      <!-- <i class="list_icon iconfont icon-queding" wx:if="{{item.riskCount == 0}}"></i>
-      <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.riskCount > 0}}"></i> -->
-      <i class="iconfont icon-dangjian_duiwujianshe"></i>
-      <view class="notice_li">
-      
-      <view class="li_tit">{{item.teamName}}</view>
-      <view class="li_time">
-      <text>负责人:{{item.charger}}</text>
-      </view>
-      </view>
-  
-      <i class="iconfont icon-xiangyou list_right"></i>
-    </view>
-</view>
-
-
-
-<view class='data-loading' hidden='{{hidden}}'>
-    数据加载中...
-  </view>
-</view>

+ 0 - 8
pages/teamlist/serch/team_serch.wxss

@@ -1,8 +0,0 @@
-/* pages/material/serch/material_serch.wxss */
-.data-loading {
-  height: 100rpx;
-  line-height: 100rpx;
-  background-color: #fff;
-  text-align: center;
-  font-size: 14px;
-}

+ 0 - 173
pages/teamlist/teamlist.js

@@ -1,173 +0,0 @@
-import http from '../../base/httputil'
-const app = getApp()
-
-Page({
-  data: {
-
-    /**
-     * 控制上拉到底部时是否出现 "数据加载中..."
-     */
-    hidden: true,
-    /**
-     * 数据是否正在加载中,避免数据多次加载
-     */
-    loadingData: false,
-    enterpriseList: [],
-    isRefresh: true,
-    total: 0,
-    pageNum: 1 // 页码
-  },
-  onLoad: function () {
-    // wx.showLoading({
-    //   title: '加载中'
-    // })
-    this.loadData()
-  },
-  //加载数据
-  loadData: function () {
-    let obj = new Object()
-    obj.pageNum = this.data.pageNum
-    obj.pageSize = 10
-    obj.reasonable= false
-    http.send_get("/system/AppTeamController/getTeamList", obj, this.getQiyeEnterpriseListSuccess)
-
-
-  },
-
-  getQiyeEnterpriseListSuccess(res) {
-
-
-if(res.code==200){
-     // 显示加载图标
-     wx.showLoading({
-      title: '玩命加载中',
-    })
-  
-    var that = this
-
-    if(res.data.rows.length==0){
-      wx.showToast({
-        title: '暂无更多数据',
-        icon:"none"
-      })
-      that.setData({
-        hidden: true,
-        loadingData: false
-      });
-    
-    }
-    if (this.data.isRefresh) {
-      this.setData({
-        enterpriseList: res.data.rows,
-        total: res.data.total
-      })
-
-
-
-      // 隐藏导航栏加载框
-      setTimeout(function () {
-        that.setData({
-          loadingData: false
-        });
-        wx.hideNavigationBarLoading();
-        // 停止下拉动作
-        wx.stopPullDownRefresh();
-        wx.hideLoading()
-
-      }, 1000)
-
-    } else {
-      this.setData({
-        enterpriseList: this.data.enterpriseList.concat(res.data.rows)
-      })
-      // 隐藏加载框
-
-      setTimeout(function () {
-        that.setData({
-          hidden: true,
-          loadingData: false
-        });
-
-        wx.hideLoading();
-      }, 1000)
-
-    }
-  }else{
- 
-  }
-  },
-  onPullDownRefresh: function () {
-    // 显示顶部刷新图标
-    wx.showNavigationBarLoading();
-    var that = this;
-    var loadingData = this.data.loadingData
-    if (loadingData) {
-      return;
-    }
-    that.setData({
-      pageNum: 1,
-      isRefresh: true
-    })
-    this.loadData()
-  },
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-    let that = this
-    var loadingData = that.data.loadingData
-   
-    var hidden = that.data.hidden
-    // 页数+1
-    that.setData({
-      pageNum: that.data.pageNum + 1,
-      isRefresh: false
-    })
-    if (hidden) {
-      that.setData({
-        hidden: false
-      });
-      console.info(that.data.hidden);
-    }
-
-    if (loadingData) {
-      return;
-    }
-    that.setData({
-      loadingData: true
-    });
-
-    
-    //console.log("@@@@"+Math.ceil(this.data.total/10))
-   // if(Math.ceil(that.data.total/10)>=that.data.pageNum){
-      that.loadData();
-  
-    // }else{
-     
-    //   setTimeout(function () {
-    //     that.setData({
-    //       hidden: true,
-    //     });
-
-    //   }, 2000)
-    // }
-
-   
-  },
-
-
-  bindViewDetails(e) {
-    let teamlist_details = e.currentTarget.dataset.index
-   
-    wx.navigateTo({
-      url: '../teamlist/details/team_details?details='+JSON.stringify(teamlist_details)
-    })
-  },
-   // 搜索结果跳页
-   bindViewSearchEnd() {
-    wx.navigateTo({
-      url:'../teamlist/serch/team_serch'
-   
-    })
-  },
-})

+ 0 - 14
pages/teamlist/teamlist.json

@@ -1,14 +0,0 @@
-{
-  "component": true, 
-  "usingComponents": {
-  },
-
-
-  "navigationBarBackgroundColor": "#f94b0e",
-  "navigationBarTextStyle": "white",
-  "enablePullDownRefresh": true,
-  "onPullDownRefresh": true,
-  "onReachBottom": true,
-  "navigationBarTitleText": "救援队伍"
-
-}

+ 0 - 41
pages/teamlist/teamlist.wxml

@@ -1,41 +0,0 @@
-<!--pages/teamlist/teamlist.wxml-->
-<!-- 队伍列表页面 -->
-<view class="container">
-  <!-- 搜索 -->
-  <view class="search-container">
-    <view class="search-left">
-      <input type="text" bindtap="bindViewSearchEnd" placeholder="搜索" />
-    </view>
-    <button bindtap="bindViewSearchEnd" class="search-right">
-      <text class="iconfont icon-sousuo"></text>
-    </button>
-  </view>
-  <!-- 列表 -->
-  <view class="list_vi">
-    <view class="list_li3" catchtap="bindViewDetails" wx:for="{{enterpriseList}}" wx:key="index" data-index="{{item}}">
-      <!-- <i class="list_icon iconfont icon-queding" wx:if="{{item.riskCount == 0}}"></i>
-      <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.riskCount > 0}}"></i> -->
-      <i class="iconfont icon-dangjian_duiwujianshe"></i>
-      <view class="notice_li">
-      
-      <view class="li_tit">{{item.teamName}}</view>
-      <view class="li_time">
-      <text>负责人:{{item.charger}}</text>
-      </view>
-      </view>
-  
-      <i class="iconfont icon-xiangyou list_right"></i>
-    </view>
-
-    <view class='data-loading' hidden='{{hidden}}'>
-    数据加载中...
-  </view>
-</view>
-    </view>
-
-
-
-
-
-
-

+ 0 - 47
pages/teamlist/teamlist.wxss

@@ -1,47 +0,0 @@
-.qy_con {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-around;
-  text-align: center;
-  margin: 30rpx 30rpx;
-}
-
-.qy_con view {
-  height: 140rpx;
-  color: #fff;
-  display: flex;
-  flex-direction: column;
-  padding: 15rpx 40rpx;
-  position: relative;
-}
-
-.qy_con view image {
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  width: 100%;
-  height: 100%;
-  z-index: -1;
-}
-
-.qy_con view h2 {
-  font-size: 58rpx;
-  font-weight: bolder;
-  padding-top: 10rpx;
-}
-
-.qy_con view p {
-  font-size: 35rpx;
-}
-
-.icon-jiahao {
-  font-size: 60rpx;
-}
-
-.data-loading {
-  height: 100rpx;
-  line-height: 100rpx;
-  background-color: #fff;
-  text-align: center;
-  font-size: 14px;
-}

+ 0 - 196
pages/update_patrol_point/update_patrol_point.js

@@ -1,196 +0,0 @@
-import http from '../../base/httputil'
-const app = getApp()
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    host: app.globalData.host,
-    enterpriseId: null,
-    pageCode: null,
-    // details: {
-    id: null,
-    longitude: Number,
-    latitude: Number,
-    name: null,
-    code: null,
-    remark: null,
-    // },
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-    this.data.pageCode = options.code
-    this.getDetails()
-  },
-  getDetails() {
-    wx.showLoading()
-    let obj = new Object();
-    obj.busPatrolstationCode = this.data.pageCode
-    http.post("/system/AppPatrolstationController/getPatrolstationDetail", obj, this.getDetailsSuccess)
-  },
-  getDetailsSuccess(res) {
-
-    wx.hideLoading()
-    if (res.data.length == 0) {
-
-      wx.showToast({
-        title: '暂无巡更点',
-        icon: 'none'
-      })
-    } else {
-      // this.data.details.name= res.data[0].busEnterpriseName,
-      // this.data.enterpriseId= res.data[0].busEnterpriseId,
-      this.data.id = res.data[0].busPatrolstationId,
-        this.data.code = res.data[0].busPatrolstationCode,
-        this.data.name = res.data[0].busPatrolstationName,
-        this.data.latitude = res.data[0].latitude,
-        this.data.longitude = res.data[0].longitude,
-        this.data.remark = res.data[0].remarks,
-        this.setData({
-          remark: res.data[0].remarks,
-          code: res.data[0].busPatrolstationCode,
-          name: res.data[0].busPatrolstationName,
-          latitude: res.data[0].latitude,
-          longitude: res.data[0].longitude,
-        })
-    }
-  },
-  //-----------------------------------------
-  bindInputName(e) {
-    this.data.name = e.detail.value
-  },
-  bindInputRemark(e) {
-    this.data.remark = e.detail.value
-  },
-  bindInputCode(e) {
-    this.data.code = e.detail.value
-  },
-  bindViewScan() {
-    wx.scanCode({
-      onlyFromCamera: true,
-      success: (res) => {
-        this.setData({
-          ['details.code']: res.result,
-        })
-      },
-      fail: (res) => {
-        wx.showToast({
-          title: '扫描失败请重试',
-          icon: 'none'
-        })
-      }
-    })
-  },
-  //------------------------------------------
-
-  updateDetails() {
-    if (this.data.name == null) {
-      wx.showToast({
-        title: '请输入巡更点名称',
-        icon: 'none'
-      })
-      return
-    }
-
-    // if(this.data.details.code==null){
-    //   wx.showToast({
-    //     title:'请扫描巡更点编码',
-    //     icon:'none'
-    //   })
-    //   return
-    // }
-
-    if (isNaN(this.data.latitude) || isNaN(this.data.longitude)) {
-      wx.showToast({
-        title: '请点击定位当前位置',
-        icon: 'none'
-      })
-      return
-    }
-
-    let obj = new Object();
-    // obj.busEnterpriseId = this.data.enterpriseId
-    obj.busPatrolstationId = this.data.id
-    obj.busPatrolstationName = this.data.name
-    obj.busPatrolstationCode = this.data.code
-    obj.longitude = this.data.longitude
-    obj.latitude = this.data.latitude
-    obj.remarks = this.data.remark
-
-    http.post("/system/AppPatrolstationController/edittPatrolstationList", obj, this.updateDetailsSuccess)
-  },
-  updateDetailsSuccess(res) {
-    wx.showToast({
-      title: res.msg,
-    })
-    if (res.code == 200) {
-      wx.navigateBack()
-    }
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  },
-
-  getLocation() {
-    let that = this
-    wx.getLocation({
-      type: 'wgs84', //返回可以用于wx.openLocation的经纬度
-      success: function (res) {
-        that.setData({
-          ['longitude']: res.longitude,
-          ['latitude']: res.latitude
-        })
-      },
-    })
-  },
-})

+ 0 - 0
pages/update_patrol_point/update_patrol_point.json


Some files were not shown because too many files changed in this diff