yf_zd vor 4 Jahren
Ursprung
Commit
c0c3babe14

+ 1 - 1
index.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no">
-    <title>大数据平台</title>
+    <title>高标准农田管理系统</title>
     <!-- 可隐藏地址栏,仅针对IOS的Safari(注:IOS7.0版本以后,safari上已看不到效果) -->
     <meta name="apple-mobile-web-app-capable" content="yes"/>
     <!-- 仅针对IOS的Safari顶端状态条的样式(可选default/black/black-translucent ) -->

+ 257 - 10
src/components/Indexold.vue

@@ -28,10 +28,10 @@
         <div class="userInfoBtns">
           <!-- 更换首页 -->
           <div class="iconFont">
-            <i
+            <!-- <i
               @click="changeHomedialogVisible = true"
               class="iconfont icon-BAI-wuzi"
-            ></i>
+            ></i> -->
           </div>
           <!-- 更换皮肤 -->
           <!-- <div class="iconFont">
@@ -112,15 +112,15 @@
             <el-dropdown trigger="click" @command="dropdownHandle">
               <span class="el-dropdown-link" style="cursor: pointer">
                 <span>{{ username }}</span>
-                <i class="el-icon-arrow-down el-icon--right"></i>
+                <!-- <i class="el-icon-arrow-down el-icon--right"></i> -->
               </span>
-              <el-dropdown-menu slot="dropdown">
+              <!-- <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="personMsg"
                   >个人中心</el-dropdown-item
                 >
                 <el-dropdown-item command="editPwd">修改密码</el-dropdown-item>
                 <el-dropdown-item command="outSys">退出</el-dropdown-item>
-              </el-dropdown-menu>
+              </el-dropdown-menu> -->
             </el-dropdown>
           </div>
         </div>
@@ -182,7 +182,7 @@
       </span>
     </el-dialog>
     <!-- 气泡提示框 -->
-    <div class="reminderBox" v-if="reminderShow">
+    <!-- <div class="reminderBox" v-if="reminderShow">
       <img src="../assets/images/newImg/13.png" alt="" srcset="" />
       <div class="reminderBox-div">
         <div class="reminderBox-div-txt">点击此处进入投屏界面</div>
@@ -195,7 +195,7 @@
           >
         </div>
       </div>
-    </div>
+    </div> -->
     <!-- 气泡提示框 -->
     <el-container style="overflow: auto">
       <!-- 菜单 -->
@@ -335,8 +335,255 @@ export default {
         // 	url: '/index/home02'
         // }
       ],
-      menuList1: [], //首页菜单
-      menuList2: [], //出首页的其他菜单
+      menuList1: [
+        // {
+        //     "menu": "bSy",
+        //     "parent_perm_id": 0,
+        //     "pur_id": 30,
+        //     "purview_name": "农产品溯源系统"
+        //   },
+      ], //首页菜单
+      menuList2: [
+          {
+            "menu": "",
+            "children": [
+            {
+                "menu": "farmBaseManger",
+                "parent_perm_id": 46,
+                "pur_id": 80,
+                "purview_name": "\u57fa\u5730\u5217\u8868"
+              },
+             {
+              "menu": "farmFieldsManger",
+              "parent_perm_id": 46,
+              "pur_id": 47,
+              "purview_name": "\u5730\u5757\u7ba1\u7406"
+            }
+            ],
+            "parent_perm_id": 0,
+            "pur_id": 46,
+            "purview_name": "\u519c\u573a\u7ba1\u7406"
+          },
+          {
+            "menu": "",
+            "children": [
+            {
+              "menu": "farmThingPlant",
+              "children": [
+              {
+                "menu": "",
+                "parent_perm_id": 49,
+                "pur_id": 84,
+                "purview_name": "\u7f16\u8f91"
+              },
+              {
+                "menu": "",
+                "parent_perm_id": 49,
+                "pur_id": 85,
+                "purview_name": "\u5220\u9664"
+              },
+              {
+                "menu": "",
+                "parent_perm_id": 49,
+                "pur_id": 86,
+                "purview_name": "\u65b0\u589e"
+              }
+              ],
+              "parent_perm_id": 48,
+              "pur_id": 49,
+              "purview_name": "\u79cd\u690d"
+            },
+            {
+              "menu": "farmThingApplyFerti",
+              "children": [
+              {
+                "menu": "",
+                "parent_perm_id": 50,
+                "pur_id": 87,
+                "purview_name": "\u7f16\u8f91"
+              },
+              {
+                "menu": "",
+                "parent_perm_id": 50,
+                "pur_id": 88,
+                "purview_name": "\u5220\u9664"
+              },
+              {
+                "menu": "",
+                "parent_perm_id": 50,
+                "pur_id": 89,
+                "purview_name": "\u65b0\u589e"
+              }
+              ],
+              "parent_perm_id": 48,
+              "pur_id": 50,
+              "purview_name": "\u65bd\u80a5"
+            },
+            {
+              "menu": "farmThingspray",
+              "children": [
+              {
+                "menu": "",
+                "parent_perm_id": 51,
+                "pur_id": 90,
+                "purview_name": "\u65b0\u589e"
+              },
+              {
+                "menu": "",
+                "parent_perm_id": 51,
+                "pur_id": 91,
+                "purview_name": "\u7f16\u8f91"
+              },
+              {
+                "menu": "",
+                "parent_perm_id": 51,
+                "pur_id": 92,
+                "purview_name": "\u5220\u9664"
+              }
+              ],
+              "parent_perm_id": 48,
+              "pur_id": 51,
+              "purview_name": "\u55b7\u836f"
+            },
+            {
+              "menu": "farmThingWatering",
+              "children": [
+              {
+                "menu": "",
+                "parent_perm_id": 52,
+                "pur_id": 93,
+                "purview_name": "\u5220\u9664"
+              },
+              {
+                "menu": "",
+                "parent_perm_id": 52,
+                "pur_id": 94,
+                "purview_name": "\u7f16\u8f91"
+              },
+              {
+                "menu": "",
+                "parent_perm_id": 52,
+                "pur_id": 95,
+                "purview_name": "\u65b0\u589e"
+              }
+              ],
+              "parent_perm_id": 48,
+              "pur_id": 52,
+              "purview_name": "\u704c\u6e89"
+            },
+            {
+              "menu": "farmThingHarvest",
+              "children": [
+              {
+                "menu": "",
+                "parent_perm_id": 53,
+                "pur_id": 97,
+                "purview_name": "\u65b0\u589e"
+              },
+              {
+                "menu": "",
+                "parent_perm_id": 53,
+                "pur_id": 98,
+                "purview_name": "\u7f16\u8f91"
+              },
+              {
+                "menu": "",
+                "parent_perm_id": 53,
+                "pur_id": 99,
+                "purview_name": "\u4e8c\u7ef4\u7801"
+              }
+              ],
+              "parent_perm_id": 48,
+              "pur_id": 53,
+              "purview_name": "\u91c7\u6536"
+            },
+            {
+              "menu": "farmThingMore",
+              "parent_perm_id": 48,
+              "pur_id": 57,
+              "purview_name": "仓储"
+            },
+            {
+              "menu": "farmThingSale",
+              "children": [
+              {
+                "menu": "",
+                "parent_perm_id": 141,
+                "pur_id": 148,
+                "purview_name": "\u65b0\u589e"
+              }
+              ],
+              "parent_perm_id": 48,
+              "pur_id": 141,
+              "purview_name": "\u9500\u552e"
+            },
+            {
+              "menu": "farmThingTransport",
+              "children": [
+              {
+                "menu": "",
+                "parent_perm_id": 142,
+                "pur_id": 149,
+                "purview_name": "\u65b0\u589e"
+              }
+              ],
+              "parent_perm_id": 48,
+              "pur_id": 142,
+              "purview_name": "\u8fd0\u8f93"
+            }
+            ],
+            "parent_perm_id": 0,
+            "pur_id": 48,
+            "purview_name": "\u519c\u4e8b\u7ba1\u7406"
+          },
+          {
+            "menu": "",
+            "children": [
+            {
+              "menu": "resultInfoList",
+              "children": [
+              {
+                "menu": "",
+                "parent_perm_id": 59,
+                "pur_id": 103,
+                "purview_name": "\u8be6\u60c5"
+              },
+              {
+                "menu": "",
+                "parent_perm_id": 59,
+                "pur_id": 104,
+                "purview_name": "\u7f16\u8f91"
+              },
+              {
+                "menu": "",
+                "parent_perm_id": 59,
+                "pur_id": 105,
+                "purview_name": "\u5220\u9664"
+              },
+              {
+                "menu": "",
+                "parent_perm_id": 59,
+                "pur_id": 106,
+                "purview_name": "\u4e8c\u7ef4\u7801"
+              },
+              {
+                "menu": "",
+                "parent_perm_id": 59,
+                "pur_id": 107,
+                "purview_name": "\u65b0\u589e"
+              }
+              ],
+              "parent_perm_id": 58,
+              "pur_id": 59,
+              "purview_name": "\u6eaf\u6e90\u4fe1\u606f"
+            }
+            ],
+            "parent_perm_id": 0,
+            "pur_id": 58,
+            "purview_name": "\u6eaf\u6e90\u7cfb\u7edf"
+          },
+          
+      ], //出首页的其他菜单
       username: "",
       resetPassDialogVisible: false,
       resetPassForm: {
@@ -374,7 +621,7 @@ export default {
   },
   mounted() {
     this.username = localStorage.getItem("cUsername");
-    this.getNavList();
+    // this.getNavList();
     this.getUserInfo();
     if (localStorage.getItem("popUpShow")) {
       this.reminderShow = false;

+ 2 - 2
src/components/highStand/sidebarSJ.vue

@@ -4,8 +4,8 @@
     <div class="legend-detail">
       <div class="content">
         <slot>
-          <img src="../../../static/images/slider1.png" v-if="sidebarSJIndex" alt="">
-          <img src="../../../static/images/slider2.png" v-else alt="">
+          <img width="100%" src="../../../static/images/slider1.png" v-if="sidebarSJIndex" alt="">
+          <img width="100%" src="../../../static/images/slider2.png" v-else alt="">
         </slot>
       </div>
     </div>

+ 36 - 23
src/components/index.vue

@@ -290,10 +290,23 @@ export default {
   //方法集合
   methods: {
     topMenuClick(item, index) {
-      this.currTopMenuId = item.name;
-      this.leftMenuList = item.children;
-      this.currLeftMenuId = item.children[0].name;
-      this.$router.push({ path: '/plantGuard'+item.children[0].path });
+      if(item.children.length){
+        this.currTopMenuId = item.name;
+        this.leftMenuList = item.children;
+        this.currLeftMenuId = item.children[0].name;
+        this.$router.push({ path: '/plantGuard'+item.children[0].path });
+      }else if(item.name == '产品溯源'){
+        var routeUrl = this.$router.resolve({
+          path: '/index/farmBaseManger'
+        })
+        window.open(routeUrl.href, '_blank')
+      }else{
+        this.$message({
+          message: '系统开发中',
+          type: 'warning'
+        });
+      }
+      
     },
     leftMenuClick(item, index) {
       this.currLeftMenuId = item.name;
@@ -392,11 +405,11 @@ export default {
                   "name": "智能灌溉",
                   "id": "5",
                   "children": [
-                     {
-                     "name": "系统管理",
-                     "path": "/page3",
-                     "id": "6"
-                     }
+                    //  {
+                    //  "name": "系统管理",
+                    //  "path": "/page3",
+                    //  "id": "6"
+                    //  }
                   ]
                },
                {
@@ -409,37 +422,37 @@ export default {
                      "id": "20"
                     },
                     {
-                     "name": "水井信息",
+                     "name": "消费记录",
                      "path": "/page10",
                      "id": "21"
                     },
                     {
-                     "name": "用户信息",
+                     "name": "充值记录",
                      "path": "/page11",
                      "id": "22"
                     },
                   ]
                },
                {
-                  "name": "农业地理信息",
+                  "name": "地理信息",
                   "id": "9",
                   "children": [
-                     {
-                     "name": "设备列表",
-                     "path": "/page1",
-                     "id": "10"
-                    }
+                    //  {
+                    //  "name": "设备列表",
+                    //  "path": "/page1",
+                    //  "id": "10"
+                    // }
                   ]
                },
                {
-                  "name": "产品溯",
+                  "name": "产品溯",
                   "id": "11",
                   "children": [
-                     {
-                     "name": "设备列表",
-                     "path": "/page1",
-                     "id": "12"
-                    }
+                    // {
+                    //  "name": "农场管理1",
+                    //  "path": "/farmFieldsManger",
+                    //  "id": "23"
+                    // }
                   ]
                },
                {

+ 3 - 3
src/pages/plantGuard/cbdPestStats.vue

@@ -744,8 +744,8 @@ Viewer.setDefaults({
 export default {
   data() {
     return {
-      id:this.$store.state.cbd_photo_id,
-      d_id:this.$store.state.cbd_photo_did,
+      id:this.$store.state.cbd_pest_id,
+      d_id:this.$store.state.cbd_pest_did,
       btnSelected: "2",
       allPest: [],
       options: {},
@@ -883,7 +883,7 @@ export default {
     },
     discernVisibleA(val) {
       if (val == false) {
-        this.tagName = "";
+        // this.tagName = "";
         this.setdataNum = {};
         this.$refs["aiPanel-editor"].getMarker().clearData();
       }

+ 2 - 2
src/pages/plantGuard/cbdTabPestStat.vue

@@ -405,8 +405,8 @@ export default {
     },
     // 查看害虫信息
     lookPestInfo(){
-		  this.$store.state.cbd_photo_id = equipId
-		  this.$store.state.cbd_photo_did = d_id
+		  this.$store.state.cbd_pest_id = this.equipId
+		  this.$store.state.cbd_pest_did = this.d_id
       this.$router.push('cbdPestStats')
     },
    

+ 6 - 1
src/pages/plantGuard/equipInfo.vue

@@ -2,7 +2,12 @@
 <template>
   <div class="equipInfo">
     <div class="equipImg">
-      <img src="@/assets/images/newImg/12.jpg" alt="">
+      <img v-if="equipType==2" src="../../../static/images/equipImg2.png" alt="">
+      <img v-if="equipType==3" src="../../../static/images/equipImg3.png" alt="">
+      <img v-if="equipType==4" src="../../../static/images/equipImg4.jpg" alt="">
+      <img v-if="equipType==5" src="../../../static/images/equipImg5.png" alt="">
+      <img v-if="equipType==7" src="../../../static/images/equipImg7.png" alt="">
+      <img v-if="equipType==8" src="../../../static/images/equipImg8.jpg" alt="">
       <p>设备类型:{{equipType|equipType}}</p>
     </div>
     <div class="equipMsg">

+ 104 - 13
src/pages/plantGuard/page1.vue

@@ -216,21 +216,56 @@
         leave-active-class="animate__animated animate__zoomOut"
     >
       <div v-if="detailsShow==6" class="jkDialog">
-            <el-button type="blueInfo" size="small" @click="jkClose2()" >停止</el-button>
-            <el-button type="blueInfo" size="small" @click="jkClose()" >刷新</el-button>
         <div id="videoCon"></div>
+        <div class="direc">
+          <div
+            @mousedown="configCamera(id, 'move', 0)"
+            @mouseup="stopConfigCamera(id)"
+            class="upCtr"
+          >
+            <img src="../../../static/images/jkctrl1.png" alt="">
+          </div>
+          <div
+            @mousedown="configCamera(id, 'move', 1)"
+            @mouseup="stopConfigCamera(id)"
+            class="downCtr"
+          >
+            <img src="../../../static/images/jkctrl2.png" alt="">
+          </div>
+          <div
+            @mousedown="configCamera(id, 'move', 2)"
+            @mouseup="stopConfigCamera(id)"
+            class="leftCtr"
+          >
+            <img src="../../../static/images/jkctrl3.png" alt="">
+          </div>
+          <div
+            @mousedown="configCamera(id, 'move', 3)"
+            @mouseup="stopConfigCamera(id)"
+            class="rightCtr"
+          >
+            <img src="../../../static/images/jkctrl4.png" alt="">
+          </div>
+        </div>
+        <div>
+            <div>
+              <img src="../../../static/images/icon1.png" alt="">
+            </div>
+            <div>
+              <img src="../../../static/images/icon1.png" alt="">
+            </div>
+            <div>
+              <img src="../../../static/images/icon1.png" alt="">
+            </div>
+            <div>
+              <img src="../../../static/images/icon1.png" alt="">
+            </div>
+            <el-button type="blueInfo" size="small" @click="jkClose2()" >
+              <img src="../../../static/images/icon1.png" alt="">
+            </el-button>
+            <el-button type="blueInfo" size="small" @click="jkClose()" >刷新</el-button>
+        </div>
       </div>
-      <!-- <dialog-box v-if="detailsShow==6" width='800'>
-          <template v-slot:header>
-            <span class="dialog-title">监控</span>
-            <button type="button" @click="detailsShow=''" class="dialog-headerbtn">
-              <i class="el-icon el-icon-close"></i>
-            </button>
-          </template>
-          <template v-slot:inner>
-            <div id="videoCon"></div>
-          </template>
-      </dialog-box> -->
     </transition>
     <!-- 孢子仪数据框 -->
     <transition
@@ -807,6 +842,61 @@ export default {
         });
       }
     },
+    //关闭方向
+    stopConfigCamera(id) {
+      if (id != "") {
+        this.$axios({
+          method: "POST",
+          url: "/api/api_gateway?method=camera.camera_manage.ctrl_camera",
+          data: this.qs.stringify({
+            device_id: id,
+            ctrl: "stop",
+          }),
+        });
+      }
+    },
+    //上下左右和拍照
+    configCamera(id, ctrl, movenum) {
+      if (id != "") {
+        if (ctrl == "takephoto") {
+          this.$axios({
+            method: "POST",
+            url: "/api/api_gateway?method=camera.camera_manage.camera_takephoto",
+            data: this.qs.stringify({
+              device_id: id,
+              ctrl: ctrl,
+            }),
+          }).then((res) => {
+            if (res.data.code == 200) {
+              let data = res.data.data;
+              this.picUrl = data.picUrl;
+              this.takePhotoDialogVisible = true;
+            } else {
+              this.$message.error("设备网络异常!");
+            }
+          });
+        } else {
+          //上下左右、放大、缩小
+          this.$axios({
+            method: "POST",
+            url: "/api/api_gateway?method=camera.camera_manage.ctrl_camera",
+            data: this.qs.stringify({
+              device_id: id,
+              ctrl: ctrl,
+              movenum: movenum,
+            }),
+          }).then((res) => {
+            if (res.data == 1) {
+              this.$message.success("操作成功");
+            } else {
+              this.$message.error("操作失败");
+            }
+          });
+        }
+      } else {
+        this.$message.error("请选中监控");
+      }
+    },
     jkClose(){
       this.player.stop()
       this.detailsShow='';
@@ -977,6 +1067,7 @@ export default {
   background: #323a47;
   top: 200px;
   left: 30%;
+  z-index: 180;
 }
 // 设备列表
 .searchEquipBox{

+ 128 - 794
src/pages/plantGuard/page10.vue

@@ -2,113 +2,32 @@
 <template>
   <div class="innerMargin">
     <el-card class="box-card">
-      <search-bar>
-        <template v-slot:left-search>
-          <div class="search-box">
-            <el-select 
-              v-model="role" 
-              clearable 
-              class="select02" 
-              @change="checkList()" 
-              size="small" 
-              placeholder="请选择角色类型"
-            >
-              <el-option
-                v-for="item in roleList"
-                :label="item.role_name"
-                :value="item.role_id"
-                :key="item.role_id"
-              ></el-option>
-            </el-select>
-            <el-select
-              v-model="userTypeCheck"
-              clearable
-              class="select02"
-              size="small"
-              @change="checkList()"
-              placeholder="请选择用户类型"
-            >
-              <el-option label="超级管理员" :value="1"></el-option>
-              <el-option label="经销商" :value="2"></el-option>
-              <el-option label="农林政府单位" :value="3"></el-option>
-              <el-option label="普通用户" :value="4"></el-option>
-            </el-select>
-            <el-input
-              style="cursor: pointer"
-              placeholder="请输入用户名"
-              size="small"
-              clearable
-              @change="checkList()"
-              v-model="username"
-              suffix-icon="el-icon-search"
-              class="input-with-select"
-            ></el-input>
-            <!-- 管理员权限 -->
-            <el-button type="blueInfo" size="small" @click="selUserTest()">{{txtInner}}</el-button>
-          </div>
-        </template>
-        <template v-slot:right-search>
-          <el-button type="blueInfo" size="small" @click="addUser()">添加新用户</el-button>
-        </template>
-      </search-bar>
+		<div class="seaarchBox">
+			<div>消费记录</div>
+			<div>时间选择:
+				<el-date-picker
+					size="small"
+					v-model="value1"
+					type="daterange"
+					range-separator="至"
+					start-placeholder="开始日期"
+					end-placeholder="结束日期">
+				</el-date-picker>
+			</div>
+		</div>
        <template>
         <el-table :data="userList" stripe style="width: 100%">
-          <el-table-column prop="username" width="150" fixed label="用户名称"></el-table-column>
-          <el-table-column prop="role_name" label="用户角色">
-          </el-table-column>
-          <el-table-column prop="user_type" width="150" label="用户类型">
-            <template slot-scope="scope">{{ scope.row.user_type | formatUserType }}</template>
-          </el-table-column>
-          <el-table-column prop="regiest_source_name" width="150" label="用户所属">
-            <template slot-scope="scope">{{ scope.row.regiest_source_name || '--' }}</template>
-          </el-table-column>
-          <el-table-column prop="addtime" width="200" label="创建时间">
-              <template slot-scope="scope">{{ ( scope.row.addtime * 1000) | formatTime }}</template>
-          </el-table-column>
-          <el-table-column prop="mobile" width="120" label="联系方式"></el-table-column>
-          <el-table-column prop="state" label="账号状态">
-              <template slot-scope="scope"><div :class="[scope.row.state==1?'greenState':'redState']">{{ scope.row.state==1?'正常':'禁用' }}</div></template>
-          </el-table-column>
-          <el-table-column prop="login_time" width="200" label="上次登录">
-              <template slot-scope="scope">{{ ( scope.row.login_time * 1000) | formatTime }}</template>
-          </el-table-column>
-          <el-table-column prop="expire_time" width="200" label="到期时间">
-              <template slot-scope="scope">{{ ( scope.row.expire_time * 1000) | formatTime }}</template>
-          </el-table-column>
-          <el-table-column prop label="操作" fixed="right" width="450">
-            <template slot-scope="scope">
-              <el-button type="blueInfo" size="mini" title="一键登录" plain @click="login(scope.row.uid, scope.row.username)">
-                一键登录
-              </el-button>
-              <el-button type="greenInfo" v-if="scope.row.user_type!=3" size="mini" title="分配设备" plain @click="distribute(scope.row.uid, scope.row.username)">
-                分配设备
-              </el-button>
-              <el-button type="redInfo" size="mini" title="充值" plain @click="recharge(scope.row.uid)">
-                充值
-              </el-button>
-              <el-button type="blueInfo" size="mini" title="编辑" plain @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <template v-if="scope.row.state == 1">
-                <el-button type="greenInfo" size="mini" title="禁用" plain @click="forbidUse(scope.row.uid,4, '确认禁用该用户?')">
-                  禁用
-                </el-button>
-              </template>
-              <template v-else>
-                <el-button type="redInfo" size="mini" title="恢复" plain @click="forbidUse(scope.row.uid, 1, '确认恢复该用户?')">
-                  恢复
-                </el-button>
-              </template>
-              <el-button type="blueInfo" size="mini" title="重置密码" plain @click="resetPassword(scope.row.uid, scope.row.username)">
-                重置密码
-              </el-button>
-            </template>
-            
-          </el-table-column>
+          <el-table-column prop="date"   fixed label="日期"></el-table-column>
+          <el-table-column prop="order" label="订单号"></el-table-column>
+          <el-table-column prop="equipId" label="设备ID"></el-table-column>
+          <el-table-column prop="startTime"  label="起始时间"></el-table-column>
+          <el-table-column prop="endTime" label="结束时间"></el-table-column>
+          <el-table-column prop="electricity"  label="用电量(KW.h)"></el-table-column>
+          <el-table-column prop="water" label="用水量(m³)"> </el-table-column>
+          <el-table-column prop="money" label="消费金额"></el-table-column>
         </el-table>
       </template>
       <el-pagination
-        v-if="userList.length > 0"
         background
         :page-size="8"
         layout="prev, pager, next, jumper"
@@ -117,303 +36,18 @@
         @current-change="changePage"
       ></el-pagination>
     </el-card>
-    <!-- 添加新用户 -->
-		<el-dialog
-			title="添加新用户"
-			:visible.sync="addUserDialogVisible"
-			width="30%"
-			top="180px"
-			@close="addUserDialogClosed"
-		>
-			<el-form
-				ref="addUserFormRef"
-				:model="addUserForm"
-				label-width="100px"
-				:rules="addUserFormRules"
-			>
-				<el-form-item label="用户名 : " prop="username">
-					<el-input v-model="addUserForm.username"></el-input>
-				</el-form-item>
-				<el-form-item label="电话 : " prop="mobile">
-					<el-input v-model="addUserForm.mobile"></el-input>
-				</el-form-item>
-				<el-form-item label="密码  : " prop="pass">
-					<el-input type="password" v-model="addUserForm.pass"></el-input>
-				</el-form-item>
-				<el-form-item label="项目名称 : " prop="projectname">
-					<el-input v-model="addUserForm.projectname"></el-input>
-				</el-form-item>
-				<el-form-item label="角色类型 : " prop="role_id">
-					<el-select
-						style="width: 100%"
-						size="small"
-						v-model="addUserForm.role_id"
-						placeholder="请选择角色类型"
-					>
-						<el-option
-							v-for="item in roleList"
-							:label="item.role_name"
-							:value="item.role_id"
-							:key="item.role_id"
-						></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="主题 : " prop="user_group_id">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="addUserForm.user_group_id"
-						placeholder="请选择主题"
-					>
-						<el-option
-							v-for="(item, index) in userGroupList"
-							:label="item.role_describe"
-							:value="item.id"
-							:key="index"
-						></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="用户类型 : " prop="user_type" v-if="userType == 1">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="addUserForm.user_type"
-						@change="userTypeChange"
-						placeholder="请选择角色类型"
-					>
-						<el-option label="超级管理员" :value="1"></el-option>
-						<el-option label="经销商" :value="2"></el-option>
-						<el-option label="农林政府单位" :value="3"></el-option>
-						<el-option label="普通用户" :value="4"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="用户类型 : " prop="user_type" v-if="userType != 1">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="addUserForm.user_type"
-						@change="userTypeChange"
-						placeholder="请选择角色类型"
-					>
-						<el-option label="普通用户" :value="4"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="省/市/区 : " v-show="editIsShow" prop="pcd">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="addUserForm.pcd"
-						placeholder="请选择省、市、县"
-						@change="pcdChange"
-					>
-						<el-option label="省" value="1"></el-option>
-						<el-option label="市" value="2"></el-option>
-						<el-option label="县" value="3"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="省/市/区 : " v-show="editIsShow" prop="user_area">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="addUserForm.user_area"
-						placeholder="请选择省、市、县"
-						@change="pcdChange"
-					>
-						<el-option
-							:label="item"
-							:value="item"
-							v-for="item in areaList"
-							:key="item"
-						></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="测试用户" prop="cs_user">
-					<el-switch active-color="#0295ff" inactive-color="#b4b4b4" v-model="addUserForm.cs_user"></el-switch>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button type="blueInfo" @click="addUserSubm">保 存</el-button>
-				<el-button type="grayInfo" plain @click="addUserDialogVisible = false">取 消</el-button>
-			</span>
-		</el-dialog>
-    <!-- 用户编辑 -->
-		<el-dialog
-			title="用户信息编辑"
-			:visible.sync="editUserDialogVisible"
-			width="500px"
-			top="180px"
-			@close="editUserDialogClosed"
-		>
-			<el-form
-				ref="editUserFormRef"
-				:model="editUserForm"
-				label-width="100px"
-				:rules="editUserFormRules"
-			>
-				<el-form-item label="用户名 : ">
-					<el-input v-model="editUserForm.username" disabled></el-input>
-				</el-form-item>
-				<el-form-item label="电话 : " prop="mobile">
-					<el-input v-model="editUserForm.mobile"></el-input>
-				</el-form-item>
-				<el-form-item label="项目名称 : ">
-					<el-input v-model="editUserForm.projectname"></el-input>
-				</el-form-item>
-				<el-form-item label="角色类型 : " prop="role_id">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="editUserForm.role_id"
-						placeholder="请选择角色类型"
-					>
-						<el-option
-							v-for="item in roleList"
-							:label="item.role_name"
-							:value="item.role_id"
-							:key="item.role_id"
-						></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="主题 : " prop="user_group_id">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="editUserForm.user_group_id"
-						placeholder="请选择主题"
-					>
-						<el-option
-							v-for="(item, index) in userGroupList"
-							:label="item.role_describe"
-							:value="item.id"
-							:key="index"
-						></el-option>
-					</el-select>
-				</el-form-item>
-				<!-- 当用户为超级管理员 -->
-				<el-form-item label="用户类型 : " prop="user_type" v-if="userType == 1">
-					<el-select
-						disabled
-						style="width: 100%"
-						clearable
-						v-model="editUserForm.user_type"
-						@change="userTypeChange"
-						placeholder="请选择角色类型"
-					>
-						<el-option label="超级管理员" :value="1"></el-option>
-						<el-option label="经销商" :value="2"></el-option>
-						<el-option label="农林政府单位" :value="3"></el-option>
-						<el-option label="普通用户" :value="4"></el-option>
-					</el-select>
-				</el-form-item>
-				<!-- 当用户不是超级管理员 -->
-				<el-form-item label="用户类型 : " prop="user_type" v-if="userType != 1">
-					<el-select
-						disabled
-						style="width: 100%"
-						clearable
-						v-model="editUserForm.user_type"
-						@change="userTypeChange"
-						placeholder="请选择角色类型"
-					>
-						<el-option label="普通用户" :value="4"></el-option>
-					</el-select>
-				</el-form-item>
-				<!-- 用户类型为经销商时,显示子账户数量 -->
-				<!-- <el-form-item
-					label="子账户数量 : "
-					prop="sub_account_num"
-					v-if="editUserForm.user_type == 2"
-				>
-					<el-input v-model="editUserForm.sub_account_num"></el-input>
-				</el-form-item> -->
-				<el-form-item
-					label="省/市/区 : "
-					v-show="editIsShow || editUserForm.user_type == 3"
-					prop="pcd"
-				>
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="editUserForm.pcd"
-						placeholder="请选择省、市、县"
-						@change="pcdChange"
-					>
-						<el-option label="省" value="1"></el-option>
-						<el-option label="市" value="2"></el-option>
-						<el-option label="县" value="3"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item
-					label="省/市/区 : "
-					v-show="editIsShow || editUserForm.user_type == 3"
-					prop="user_area"
-				>
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="editUserForm.user_area"
-						placeholder="请选择省、市、县"
-						@change="pcdChange"
-					>
-						<el-option
-							:label="item"
-							:value="item"
-							v-for="item in areaList"
-							:key="item"
-						></el-option>
-					</el-select>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="editUserDialogVisible = false">取 消</el-button>
-				<el-button type="primary" >确认</el-button>
-			</span>
-		</el-dialog>
   </div>
 </template>
 
 <script>
 //这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
 //例如:import 《组件名称》 from '《组件路径》';
-import searchBar from "@/components/highStand/searchBar";
-import cityData from './citydata'
 export default {
   //import引入的组件需要注入到对象中才能使用
-  components: {
-    searchBar
-  },
-  inject: ['reload'],
   data() {
-    var checkMobile = (rule, value, callback) => {
-			const regMobile = /^1\d{10}$/
-			if (regMobile.test(value)) {
-				callback()
-			} else {
-				// 返回一个错误提示
-				callback(new Error('请输入合法的手机号码'))
-			}
-		}
-		var validatePass = (rule, value, callback) => {
-			if (value === '') {
-				callback(new Error('请输入新密码'))
-			} else {
-				if (this.resetPassForm.checkPass !== '') {
-					this.$refs.resetPassFormRef.validateField('checkPass')
-				}
-				callback()
-			}
-		}
-		var validatePass2 = (rule, value, callback) => {
-			if (value === '') {
-				callback(new Error('请再次输入密码'))
-			} else if (value !== this.resetPassForm.pass) {
-				callback(new Error('两次输入密码不一致!'))
-			} else {
-				callback()
-			}
-		}
-    //这里存放数据
+	  //这里存放数据
     return {
+		value1:"",
       role: "",
       username: "",
       txtInner:"筛选测试用户",
@@ -422,65 +56,7 @@ export default {
       roleList: [],
       page: 1,
       totalNum: 0,
-      userTypeCheck: '', //筛选项 用户类型
-      tets_user: '', //测试用户筛选
-      addUserDialogVisible: false,
-      addUserForm: {
-			username: '',
-			mobile: '',
-			pass: '',
-			role_id: '',
-			user_type: '',
-			pcd: '',
-			user_area: '',
-			projectname:'',
-			cs_user: false, //1为普通用户
-			user_group_id: '' //用户组id
-      },
-      cityData,
-      areaList: [],//省市县
-      //控制省/市/区显示
-      editIsShow: false,
-      editUserForm: {},
-      editUserDialogVisible:false,
-			//编辑用户规则
-			editUserFormRules: {
-				user_phone: [{ validator: checkMobile, trigger: 'blur' }]
-			},
-			//添加用户规则
-			addUserFormRules: {
-				username: [
-					{ required: true, message: '请填写用户名', trigger: 'blur' }
-				],
-				mobile: [
-					{ required: true, trigger: 'blur', message: '手机号不能为空' },
-					{ validator: checkMobile, trigger: 'blur' }
-				],
-				pass: [{ required: true, message: '请填写用户密码', trigger: 'blur' }],
-				projectname: [
-					{ required: true, message: '请填写项目名称', trigger: 'blur' }
-				],
-				role_id:[
-					{ required: true, message: '请选择角色类型', trigger: 'blur' }
-				]
-			},
-			//重置密码格规则
-			resetPassFormRules: {
-				oldPass: [{ required: true, message: '请填原始密码', trigger: 'blur' }],
-				pass: [
-					{ validator: validatePass, trigger: 'blur' },
-					{ required: true, message: '请填写新密码', trigger: 'blur' }
-				],
-				checkPass: [
-					{ validator: validatePass2, trigger: 'blur' },
-					{ required: true, message: '请确认新密码', trigger: 'blur' }
-				]
-      },
-      // 筛选
-      checkList() {
-        this.page = 1
-        this.getList()
-      },
+
     };
   },
   //监听属性 类似于data概念
@@ -499,363 +75,116 @@ export default {
   //生命周期 - 挂载完成(可以访问DOM元素)
   mounted() {
     this.getList();
-    this.getUserGroup(); //获取用户组
   },
   //方法集合
   methods: {
     //获取用户列表
     getList() {
-      this.$axios({
-        method: "POST",
-        url: "/api/api_gateway?method=user.login.users_info",
-        data: this.qs.stringify({
-          role_id: this.role,
-          page_size: 8,
-          user_type: this.userTypeCheck,
-          page: this.page,
-          username: this.username,
-          tets_user: this.tets_user
-        })
-      }).then(res => {
-        if (res.data.message == "") {
-          this.userList = res.data.data.data;
-          this.totalNum = res.data.data.count;
-        }
-      });
-    },
-    getUserGroup() {
-      this.$axios({
-        method: "POST",
-        url: "/api/api_gateway?method=pest.warning_record.rolemanage_view",
-        data: this.qs.stringify({
-          add_role: "all"
-        })
-      }).then(res => {
-        if (res.data.message == "") {
-          this.userGroupList = res.data.data.data;
-        }
-      });
-    },
-    getRoleList() {
-      this.$axios({
-        method: "POST",
-        url: "/api/api_gateway?method=user.perms.role_list"
-      }).then(res => {
-        if (res.data.message == "") {
-          this.roleList = res.data.data.map(item => {
-            return {
-              role_id: item.role_id,
-              role_name: item.role_name
-            };
-          });
-        }
-      });
-    },
-    selUserTest() {
-			this.tets_user = this.tets_user == '' ? 1 : ''
-			this.getList()
-			this.txtInner = this.txtInner == '筛选测试用户' ? '全部用户' : '筛选测试用户'
-    },
-    //添加用户
-		addUser() {
-			this.addUserDialogVisible = true
-    },
-    //监听省/市/区
-		pcdChange(val) {
-      let addr_type = ''
-      var _this = this
-			switch (val) {
-				case '1':
-          addr_type = 'province'
-					break
-				case '2':
-					addr_type = 'city'
-					break
-				case '3':
-					addr_type = 'district'
-					break
-			}
-			this.$axios({
-				method: 'POST',
-				url: '/api/api_gateway?method=device.device_manage.device_addr',
-				data: this.qs.stringify({
-					addr_type
-				})
-			}).then((res) => {
-				if (res.data.message == '') {
-					_this.areaList = res.data.data
-          _this.addUserForm.user_area = ''
-          _this.editUserForm.user_area = ''
-				}
-			})
-    },
-    //监听用户类型改变
-		userTypeChange(val) {
-			if (val == 3) {
-				this.editIsShow = true
-			} else {
-				this.editIsShow = false
+          this.userList = [
+			{
+				date:'2021-3-21',
+				order:'112544412577455',
+				equipId:'845521475322545522',
+				startTime:'2021-3-21 12:30:25',
+				endTime:'2021-3-21 12:36:25',
+				electricity:44,
+				water:38,
+				money:28
+			},
+			{
+				date:'2021-3-19',
+				order:'112544412577455',
+				equipId:'845556987322545522',
+				startTime:'2021-3-19 11:30:25',
+				endTime:'2021-3-19 11:36:25',
+				electricity:36,
+				water:21,
+				money:18
+			},
+			{
+				date:'2021-3-21',
+				order:'112544412577455',
+				equipId:'845521475322545522',
+				startTime:'2021-3-21 12:30:25',
+				endTime:'2021-3-21 12:36:25',
+				electricity:44,
+				water:38,
+				money:28
+			},
+			{
+				date:'2021-3-21',
+				order:'112544412577455',
+				equipId:'845521475322545522',
+				startTime:'2021-3-21 12:30:25',
+				endTime:'2021-3-21 12:36:25',
+				electricity:44,
+				water:38,
+				money:28
+			},{
+				date:'2021-3-21',
+				order:'112544412577455',
+				equipId:'845521475322545522',
+				startTime:'2021-3-21 12:30:25',
+				endTime:'2021-3-21 12:36:25',
+				electricity:44,
+				water:38,
+				money:28
+			},{
+				date:'2021-3-21',
+				order:'112544412577455',
+				equipId:'845521475322545522',
+				startTime:'2021-3-21 12:30:25',
+				endTime:'2021-3-21 12:36:25',
+				electricity:44,
+				water:38,
+				money:28
+			},{
+				date:'2021-3-21',
+				order:'112544412577455',
+				equipId:'845521475322545522',
+				startTime:'2021-3-21 12:30:25',
+				endTime:'2021-3-21 12:36:25',
+				electricity:44,
+				water:38,
+				money:28
+			},{
+				date:'2021-3-21',
+				order:'112544412577455',
+				equipId:'845521475322545522',
+				startTime:'2021-3-21 12:30:25',
+				endTime:'2021-3-21 12:36:25',
+				electricity:44,
+				water:38,
+				money:28
+			},{
+				date:'2021-3-21',
+				order:'112544412577455',
+				equipId:'845521475322545522',
+				startTime:'2021-3-21 12:30:25',
+				endTime:'2021-3-21 12:36:25',
+				electricity:44,
+				water:38,
+				money:28
+			},{
+				date:'2021-3-21',
+				order:'112544412577455',
+				equipId:'845521475322545522',
+				startTime:'2021-3-21 12:30:25',
+				endTime:'2021-3-21 12:36:25',
+				electricity:44,
+				water:38,
+				money:28
 			}
+		];
+          this.totalNum = 33;
     },
-    addUserDialogClosed() {
-      this.$refs.addUserFormRef.resetFields()
-      this.editIsShow = false
-      this.addUserForm.role_id = ''
-    },
+
     changePage(value) {
-			this.page = value
-			this.getList()
+		this.page = value
     },
-    //添加用户提交
-		addUserSubm() {
-			this.$refs.addUserFormRef.validate((valid) => {
-				if (!valid) return
-				let cs_user = this.addUserForm.cs_user ? '1' : ''
-				this.$axios({
-					method: 'POST',
-					url: '/api/api_gateway?method=user.login.regiest',
-					data: this.qs.stringify({
-						username: this.addUserForm.username,
-						mobile: this.addUserForm.mobile,
-						password: this.addUserForm.pass,
-						role_id: this.addUserForm.role_id,
-						user_type: this.addUserForm.user_type,
-						pcd: this.addUserForm.pcd,
-						user_area: this.addUserForm.user_area,
-						user_group_id: this.addUserForm.user_group_id,
-						projectname:this.addUserForm.projectname,
-						cs_user
-					})
-				}).then((res) => {
-					if (res.data.message == '') {
-						this.$message.success('添加用户成功!')
-						this.addUserDialogVisible = false
-						this.getList()
-					} else {
-						this.$message.error(res.data.message)
-					}
-				})
-			})
-    },
-    // 编辑用户信息
-		edit(role) {
-			console.log(role)
-			let data = JSON.stringify(role)
-			this.editUserForm = JSON.parse(data)
-			if (role.role_id == 0) {
-				//把0转换成""
-				this.editUserForm.role_id = ''
-      }
-      if (role.user_group_id=='0') {
-				//把0转换成""
-				this.editUserForm.user_group_id = ''
-			}
-			this.editUserDialogVisible = true
-    },
-    editUserDialogClosed() {
-			this.$refs.editUserFormRef.resetFields()
-			this.areaList = [] //清空省/市/区
-			this.editIsShow = false
-    },
-    //修改用户信息提交
-	editUserSubm() {
-		this.$refs.editUserFormRef.validate((valid) => {
-			if (!valid) return
-			console.log(this.editUserForm.user_group_id)
-			this.$axios({
-				method: 'POST',
-				url: '/api/api_gateway?method=user.login.users_info_updata',
-				data: this.qs.stringify({
-					uid: this.editUserForm.uid,
-					username: this.editUserForm.username,
-					mobile: this.editUserForm.mobile,
-					role_id: this.editUserForm.role_id,
-					user_type: this.editUserForm.user_type,
-					pcd: this.editUserForm.pcd,
-					user_area: this.editUserForm.user_area,
-					projectname:this.editUserForm.projectname,
-					user_group_id: this.editUserForm.user_group_id=='0'?'':this.editUserForm.user_group_id
-				})
-			}).then((res) => {
-				if (res.data.message == '') {
-					this.editUserDialogVisible = false
-					this.getList()
-				}
-			})
-		})
-	},
-	login(uid, username) {
-		//一键登录
-		this.$confirm('一键登录将登录此用户,是否继续?', '提示', {
-			confirmButtonText: '确定',
-			cancelButtonText: '取消',
-			type: 'warning'
-		})
-			.then(() => {
-				this.$axios({
-					method: 'POST',
-					url: '/api/api_gateway?method=user.login.auto_login',
-					data: this.qs.stringify({
-						uid
-					})
-				}).then((res) => {
-					if (res.data.message == '') {
-						this.$message({
-							type: 'success',
-							message: '操作成功!'
-						})
-						localStorage.setItem('cUsername',username) //修改当前登录的用户名
-						this.reload() //整体刷新
-						this.$EventBus.$on('firstPage', (data) => {
-							//默认显示菜单第一项
-							this.$router.push(`${data}`)
-						})
-					} else {
-						this.$message({
-							type: 'warning',
-							message: res.data.message
-						})
-					}
-				})
-			})
-			.catch(() => {
-				this.$message({
-					type: 'info',
-					message: '取消一键登录!'
-				})
-			})
-	},
-	//用户禁用
-	forbidUse(id, state, txt) {
-		this.$confirm(txt, '提示', {
-			confirmButtonText: '确定',
-			cancelButtonText: '取消',
-			type: 'warning'
-		})
-			.then(() => {
-				this.$axios({
-					method: 'POST',
-					url: '/api/api_gateway?method=user.login.users_statu_updata',
-					data: this.qs.stringify({
-						uid: id,
-						state: state
-					})
-				}).then((res) => {
-					if (res.data.message == '') {
-						this.$message({
-							type: 'success',
-							message: '操作成功!'
-						})
-						this.getList()
-					}
-				})
-			})
-			.catch(() => {
-				this.$message({
-					type: 'info',
-					message: '禁用取消!'
-				})
-			})
-	},
-	distribute(id, username) {
-		this.$store.state.allo_equip_user_id = id
-		this.$store.state.allo_equip_usename = username
-		this.$router.push('page5')
-	},
-	recharge(id) {
-			this.$confirm('是否向该用户充值一年费用?', '信息', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			})
-				.then(() => {
-					this.$axios({
-						method: 'POST',
-						url: '/api/api_gateway?method=user.login.user_add_package_time',
-						data: this.qs.stringify({
-							uid: id
-						})
-					}).then((res) => {
-						if (res.data.message == '') {
-							this.$message({
-								type: 'success',
-								message: '充值成功!'
-							})
-							this.getList()
-						} else {
-							this.$message({
-								type: 'error',
-								message: '充值失败!'
-							})
-						}
-					})
-				})
-				.catch(() => {
-					this.$message({
-						type: 'info',
-						message: '充值取消!'
-					})
-				})
-	},
-	//密码重置
-	resetPassword(id, name) {
-		// this.resetPassForm.uid = id
-		// this.resetPassForm.username = name
-		// this.resetPassDialogVisible = true
-		this.$confirm('是否重置密码 ? 重置后的密码为 yf_123456', '提示', {
-			confirmButtonText: '确定',
-			cancelButtonText: '取消',
-			type: 'warning'
-		})
-			.then(() => {
-				this.$axios({
-					method: 'POST',
-					url: '/api/api_gateway?method=user.login.admin_changepwd',
-					data: this.qs.stringify({
-						uid: id
-					})
-				}).then((res) => {
-					if (res.data.message == '') {
-						this.$message({
-							type: 'success',
-							message: '操作成功!'
-						})
-						this.getList()
-					} else {
-						this.$message({
-							type: 'warning',
-							message: res.data.message
-						})
-					}
-				})
-			})
-			.catch(() => {
-				this.$message({
-					type: 'info',
-					message: '取消重置密码!'
-				})
-			})
-	},
+
     
   },
-  filters: {
-      formatUserType(value) {
-			switch (value) {
-				case 1:
-					return '超级管理员'
-					break
-				case 2:
-					return '经销商'
-					break
-				case 3:
-					return '农林政府单位'
-					break
-				case 4:
-					return '普通用户'
-					break
-			}
-		}
-  },
   beforeCreate() {}, //生命周期 - 创建之前
   beforeMount() {}, //生命周期 - 挂载之前
   beforeUpdate() {}, //生命周期 - 更新之前
@@ -866,6 +195,11 @@ export default {
 };
 </script>
 <style lang='less' scoped>
+.seaarchBox{
+	margin-bottom: 10px;
+	display: flex;
+	justify-content: space-between;
+}
 .search-box {
   text-align: right;
   .el-input {

+ 125 - 795
src/pages/plantGuard/page11.vue

@@ -1,114 +1,29 @@
-<!-- 用户信息 -->
+<!-- 水井信息 -->
 <template>
   <div class="innerMargin">
     <el-card class="box-card">
-      <search-bar>
-        <template v-slot:left-search>
-          <div class="search-box">
-            <el-select 
-              v-model="role" 
-              clearable 
-              class="select02" 
-              @change="checkList()" 
-              size="small" 
-              placeholder="请选择角色类型"
-            >
-              <el-option
-                v-for="item in roleList"
-                :label="item.role_name"
-                :value="item.role_id"
-                :key="item.role_id"
-              ></el-option>
-            </el-select>
-            <el-select
-              v-model="userTypeCheck"
-              clearable
-              class="select02"
-              size="small"
-              @change="checkList()"
-              placeholder="请选择用户类型"
-            >
-              <el-option label="超级管理员" :value="1"></el-option>
-              <el-option label="经销商" :value="2"></el-option>
-              <el-option label="农林政府单位" :value="3"></el-option>
-              <el-option label="普通用户" :value="4"></el-option>
-            </el-select>
-            <el-input
-              style="cursor: pointer"
-              placeholder="请输入用户名"
-              size="small"
-              clearable
-              @change="checkList()"
-              v-model="username"
-              suffix-icon="el-icon-search"
-              class="input-with-select"
-            ></el-input>
-            <!-- 管理员权限 -->
-            <el-button type="blueInfo" size="small" @click="selUserTest()">{{txtInner}}</el-button>
-          </div>
-        </template>
-        <template v-slot:right-search>
-          <el-button type="blueInfo" size="small" @click="addUser()">添加新用户</el-button>
-        </template>
-      </search-bar>
+		<div class="seaarchBox">
+			<div>消费记录</div>
+			<div>时间选择:
+				<el-date-picker
+					size="small"
+					v-model="value1"
+					type="daterange"
+					range-separator="至"
+					start-placeholder="开始日期"
+					end-placeholder="结束日期">
+				</el-date-picker>
+			</div>
+		</div>
        <template>
         <el-table :data="userList" stripe style="width: 100%">
-          <el-table-column prop="username" width="150" fixed label="用户名称"></el-table-column>
-          <el-table-column prop="role_name" label="用户角色">
-          </el-table-column>
-          <el-table-column prop="user_type" width="150" label="用户类型">
-            <template slot-scope="scope">{{ scope.row.user_type | formatUserType }}</template>
-          </el-table-column>
-          <el-table-column prop="regiest_source_name" width="150" label="用户所属">
-            <template slot-scope="scope">{{ scope.row.regiest_source_name || '--' }}</template>
-          </el-table-column>
-          <el-table-column prop="addtime" width="200" label="创建时间">
-              <template slot-scope="scope">{{ ( scope.row.addtime * 1000) | formatTime }}</template>
-          </el-table-column>
-          <el-table-column prop="mobile" width="120" label="联系方式"></el-table-column>
-          <el-table-column prop="state" label="账号状态">
-              <template slot-scope="scope"><div :class="[scope.row.state==1?'greenState':'redState']">{{ scope.row.state==1?'正常':'禁用' }}</div></template>
-          </el-table-column>
-          <el-table-column prop="login_time" width="200" label="上次登录">
-              <template slot-scope="scope">{{ ( scope.row.login_time * 1000) | formatTime }}</template>
-          </el-table-column>
-          <el-table-column prop="expire_time" width="200" label="到期时间">
-              <template slot-scope="scope">{{ ( scope.row.expire_time * 1000) | formatTime }}</template>
-          </el-table-column>
-          <el-table-column prop label="操作" fixed="right" width="450">
-            <template slot-scope="scope">
-              <el-button type="blueInfo" size="mini" title="一键登录" plain @click="login(scope.row.uid, scope.row.username)">
-                一键登录
-              </el-button>
-              <el-button type="greenInfo" v-if="scope.row.user_type!=3" size="mini" title="分配设备" plain @click="distribute(scope.row.uid, scope.row.username)">
-                分配设备
-              </el-button>
-              <el-button type="redInfo" size="mini" title="充值" plain @click="recharge(scope.row.uid)">
-                充值
-              </el-button>
-              <el-button type="blueInfo" size="mini" title="编辑" plain @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <template v-if="scope.row.state == 1">
-                <el-button type="greenInfo" size="mini" title="禁用" plain @click="forbidUse(scope.row.uid,4, '确认禁用该用户?')">
-                  禁用
-                </el-button>
-              </template>
-              <template v-else>
-                <el-button type="redInfo" size="mini" title="恢复" plain @click="forbidUse(scope.row.uid, 1, '确认恢复该用户?')">
-                  恢复
-                </el-button>
-              </template>
-              <el-button type="blueInfo" size="mini" title="重置密码" plain @click="resetPassword(scope.row.uid, scope.row.username)">
-                重置密码
-              </el-button>
-            </template>
-            
-          </el-table-column>
+          <el-table-column prop="date"   fixed label="日期"></el-table-column>
+          <el-table-column prop="order" label="订单号"></el-table-column>
+          <el-table-column prop="startTime"  label="支付完成时间"></el-table-column>
+          <el-table-column prop="money" label="充值金额"></el-table-column>
         </el-table>
       </template>
       <el-pagination
-        v-if="userList.length > 0"
         background
         :page-size="8"
         layout="prev, pager, next, jumper"
@@ -117,303 +32,18 @@
         @current-change="changePage"
       ></el-pagination>
     </el-card>
-    <!-- 添加新用户 -->
-		<el-dialog
-			title="添加新用户"
-			:visible.sync="addUserDialogVisible"
-			width="30%"
-			top="180px"
-			@close="addUserDialogClosed"
-		>
-			<el-form
-				ref="addUserFormRef"
-				:model="addUserForm"
-				label-width="100px"
-				:rules="addUserFormRules"
-			>
-				<el-form-item label="用户名 : " prop="username">
-					<el-input v-model="addUserForm.username"></el-input>
-				</el-form-item>
-				<el-form-item label="电话 : " prop="mobile">
-					<el-input v-model="addUserForm.mobile"></el-input>
-				</el-form-item>
-				<el-form-item label="密码  : " prop="pass">
-					<el-input type="password" v-model="addUserForm.pass"></el-input>
-				</el-form-item>
-				<el-form-item label="项目名称 : " prop="projectname">
-					<el-input v-model="addUserForm.projectname"></el-input>
-				</el-form-item>
-				<el-form-item label="角色类型 : " prop="role_id">
-					<el-select
-						style="width: 100%"
-						size="small"
-						v-model="addUserForm.role_id"
-						placeholder="请选择角色类型"
-					>
-						<el-option
-							v-for="item in roleList"
-							:label="item.role_name"
-							:value="item.role_id"
-							:key="item.role_id"
-						></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="主题 : " prop="user_group_id">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="addUserForm.user_group_id"
-						placeholder="请选择主题"
-					>
-						<el-option
-							v-for="(item, index) in userGroupList"
-							:label="item.role_describe"
-							:value="item.id"
-							:key="index"
-						></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="用户类型 : " prop="user_type" v-if="userType == 1">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="addUserForm.user_type"
-						@change="userTypeChange"
-						placeholder="请选择角色类型"
-					>
-						<el-option label="超级管理员" :value="1"></el-option>
-						<el-option label="经销商" :value="2"></el-option>
-						<el-option label="农林政府单位" :value="3"></el-option>
-						<el-option label="普通用户" :value="4"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="用户类型 : " prop="user_type" v-if="userType != 1">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="addUserForm.user_type"
-						@change="userTypeChange"
-						placeholder="请选择角色类型"
-					>
-						<el-option label="普通用户" :value="4"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="省/市/区 : " v-show="editIsShow" prop="pcd">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="addUserForm.pcd"
-						placeholder="请选择省、市、县"
-						@change="pcdChange"
-					>
-						<el-option label="省" value="1"></el-option>
-						<el-option label="市" value="2"></el-option>
-						<el-option label="县" value="3"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="省/市/区 : " v-show="editIsShow" prop="user_area">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="addUserForm.user_area"
-						placeholder="请选择省、市、县"
-						@change="pcdChange"
-					>
-						<el-option
-							:label="item"
-							:value="item"
-							v-for="item in areaList"
-							:key="item"
-						></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="测试用户" prop="cs_user">
-					<el-switch active-color="#0295ff" inactive-color="#b4b4b4" v-model="addUserForm.cs_user"></el-switch>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button type="blueInfo" @click="addUserSubm">保 存</el-button>
-				<el-button type="grayInfo" plain @click="addUserDialogVisible = false">取 消</el-button>
-			</span>
-		</el-dialog>
-    <!-- 用户编辑 -->
-		<el-dialog
-			title="用户信息编辑"
-			:visible.sync="editUserDialogVisible"
-			width="500px"
-			top="180px"
-			@close="editUserDialogClosed"
-		>
-			<el-form
-				ref="editUserFormRef"
-				:model="editUserForm"
-				label-width="100px"
-				:rules="editUserFormRules"
-			>
-				<el-form-item label="用户名 : ">
-					<el-input v-model="editUserForm.username" disabled></el-input>
-				</el-form-item>
-				<el-form-item label="电话 : " prop="mobile">
-					<el-input v-model="editUserForm.mobile"></el-input>
-				</el-form-item>
-				<el-form-item label="项目名称 : ">
-					<el-input v-model="editUserForm.projectname"></el-input>
-				</el-form-item>
-				<el-form-item label="角色类型 : " prop="role_id">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="editUserForm.role_id"
-						placeholder="请选择角色类型"
-					>
-						<el-option
-							v-for="item in roleList"
-							:label="item.role_name"
-							:value="item.role_id"
-							:key="item.role_id"
-						></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="主题 : " prop="user_group_id">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="editUserForm.user_group_id"
-						placeholder="请选择主题"
-					>
-						<el-option
-							v-for="(item, index) in userGroupList"
-							:label="item.role_describe"
-							:value="item.id"
-							:key="index"
-						></el-option>
-					</el-select>
-				</el-form-item>
-				<!-- 当用户为超级管理员 -->
-				<el-form-item label="用户类型 : " prop="user_type" v-if="userType == 1">
-					<el-select
-						disabled
-						style="width: 100%"
-						clearable
-						v-model="editUserForm.user_type"
-						@change="userTypeChange"
-						placeholder="请选择角色类型"
-					>
-						<el-option label="超级管理员" :value="1"></el-option>
-						<el-option label="经销商" :value="2"></el-option>
-						<el-option label="农林政府单位" :value="3"></el-option>
-						<el-option label="普通用户" :value="4"></el-option>
-					</el-select>
-				</el-form-item>
-				<!-- 当用户不是超级管理员 -->
-				<el-form-item label="用户类型 : " prop="user_type" v-if="userType != 1">
-					<el-select
-						disabled
-						style="width: 100%"
-						clearable
-						v-model="editUserForm.user_type"
-						@change="userTypeChange"
-						placeholder="请选择角色类型"
-					>
-						<el-option label="普通用户" :value="4"></el-option>
-					</el-select>
-				</el-form-item>
-				<!-- 用户类型为经销商时,显示子账户数量 -->
-				<!-- <el-form-item
-					label="子账户数量 : "
-					prop="sub_account_num"
-					v-if="editUserForm.user_type == 2"
-				>
-					<el-input v-model="editUserForm.sub_account_num"></el-input>
-				</el-form-item> -->
-				<el-form-item
-					label="省/市/区 : "
-					v-show="editIsShow || editUserForm.user_type == 3"
-					prop="pcd"
-				>
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="editUserForm.pcd"
-						placeholder="请选择省、市、县"
-						@change="pcdChange"
-					>
-						<el-option label="省" value="1"></el-option>
-						<el-option label="市" value="2"></el-option>
-						<el-option label="县" value="3"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item
-					label="省/市/区 : "
-					v-show="editIsShow || editUserForm.user_type == 3"
-					prop="user_area"
-				>
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="editUserForm.user_area"
-						placeholder="请选择省、市、县"
-						@change="pcdChange"
-					>
-						<el-option
-							:label="item"
-							:value="item"
-							v-for="item in areaList"
-							:key="item"
-						></el-option>
-					</el-select>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="editUserDialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="editUserSubm">确认</el-button>
-			</span>
-		</el-dialog>
   </div>
 </template>
 
 <script>
 //这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
 //例如:import 《组件名称》 from '《组件路径》';
-import searchBar from "@/components/highStand/searchBar";
-import cityData from './citydata'
 export default {
   //import引入的组件需要注入到对象中才能使用
-  components: {
-    searchBar
-  },
-  inject: ['reload'],
   data() {
-    var checkMobile = (rule, value, callback) => {
-			const regMobile = /^1\d{10}$/
-			if (regMobile.test(value)) {
-				callback()
-			} else {
-				// 返回一个错误提示
-				callback(new Error('请输入合法的手机号码'))
-			}
-		}
-		var validatePass = (rule, value, callback) => {
-			if (value === '') {
-				callback(new Error('请输入新密码'))
-			} else {
-				if (this.resetPassForm.checkPass !== '') {
-					this.$refs.resetPassFormRef.validateField('checkPass')
-				}
-				callback()
-			}
-		}
-		var validatePass2 = (rule, value, callback) => {
-			if (value === '') {
-				callback(new Error('请再次输入密码'))
-			} else if (value !== this.resetPassForm.pass) {
-				callback(new Error('两次输入密码不一致!'))
-			} else {
-				callback()
-			}
-		}
-    //这里存放数据
+	  //这里存放数据
     return {
+		value1:"",
       role: "",
       username: "",
       txtInner:"筛选测试用户",
@@ -422,65 +52,7 @@ export default {
       roleList: [],
       page: 1,
       totalNum: 0,
-      userTypeCheck: '', //筛选项 用户类型
-      tets_user: '', //测试用户筛选
-      addUserDialogVisible: false,
-      addUserForm: {
-			username: '',
-			mobile: '',
-			pass: '',
-			role_id: '',
-			user_type: '',
-			pcd: '',
-			user_area: '',
-			projectname:'',
-			cs_user: false, //1为普通用户
-			user_group_id: '' //用户组id
-      },
-      cityData,
-      areaList: [],//省市县
-      //控制省/市/区显示
-      editIsShow: false,
-      editUserForm: {},
-      editUserDialogVisible:false,
-			//编辑用户规则
-			editUserFormRules: {
-				user_phone: [{ validator: checkMobile, trigger: 'blur' }]
-			},
-			//添加用户规则
-			addUserFormRules: {
-				username: [
-					{ required: true, message: '请填写用户名', trigger: 'blur' }
-				],
-				mobile: [
-					{ required: true, trigger: 'blur', message: '手机号不能为空' },
-					{ validator: checkMobile, trigger: 'blur' }
-				],
-				pass: [{ required: true, message: '请填写用户密码', trigger: 'blur' }],
-				projectname: [
-					{ required: true, message: '请填写项目名称', trigger: 'blur' }
-				],
-				role_id:[
-					{ required: true, message: '请选择角色类型', trigger: 'blur' }
-				]
-			},
-			//重置密码格规则
-			resetPassFormRules: {
-				oldPass: [{ required: true, message: '请填原始密码', trigger: 'blur' }],
-				pass: [
-					{ validator: validatePass, trigger: 'blur' },
-					{ required: true, message: '请填写新密码', trigger: 'blur' }
-				],
-				checkPass: [
-					{ validator: validatePass2, trigger: 'blur' },
-					{ required: true, message: '请确认新密码', trigger: 'blur' }
-				]
-      },
-      // 筛选
-      checkList() {
-        this.page = 1
-        this.getList()
-      },
+
     };
   },
   //监听属性 类似于data概念
@@ -499,363 +71,116 @@ export default {
   //生命周期 - 挂载完成(可以访问DOM元素)
   mounted() {
     this.getList();
-    this.getUserGroup(); //获取用户组
   },
   //方法集合
   methods: {
     //获取用户列表
     getList() {
-      this.$axios({
-        method: "POST",
-        url: "/api/api_gateway?method=user.login.users_info",
-        data: this.qs.stringify({
-          role_id: this.role,
-          page_size: 8,
-          user_type: this.userTypeCheck,
-          page: this.page,
-          username: this.username,
-          tets_user: this.tets_user
-        })
-      }).then(res => {
-        if (res.data.message == "") {
-          this.userList = res.data.data.data;
-          this.totalNum = res.data.data.count;
-        }
-      });
-    },
-    getUserGroup() {
-      this.$axios({
-        method: "POST",
-        url: "/api/api_gateway?method=pest.warning_record.rolemanage_view",
-        data: this.qs.stringify({
-          add_role: "all"
-        })
-      }).then(res => {
-        if (res.data.message == "") {
-          this.userGroupList = res.data.data.data;
-        }
-      });
-    },
-    getRoleList() {
-      this.$axios({
-        method: "POST",
-        url: "/api/api_gateway?method=user.perms.role_list"
-      }).then(res => {
-        if (res.data.message == "") {
-          this.roleList = res.data.data.map(item => {
-            return {
-              role_id: item.role_id,
-              role_name: item.role_name
-            };
-          });
-        }
-      });
-    },
-    selUserTest() {
-			this.tets_user = this.tets_user == '' ? 1 : ''
-			this.getList()
-			this.txtInner = this.txtInner == '筛选测试用户' ? '全部用户' : '筛选测试用户'
-    },
-    //添加用户
-		addUser() {
-			this.addUserDialogVisible = true
-    },
-    //监听省/市/区
-		pcdChange(val) {
-      let addr_type = ''
-      var _this = this
-			switch (val) {
-				case '1':
-          addr_type = 'province'
-					break
-				case '2':
-					addr_type = 'city'
-					break
-				case '3':
-					addr_type = 'district'
-					break
-			}
-			this.$axios({
-				method: 'POST',
-				url: '/api/api_gateway?method=device.device_manage.device_addr',
-				data: this.qs.stringify({
-					addr_type
-				})
-			}).then((res) => {
-				if (res.data.message == '') {
-					_this.areaList = res.data.data
-          _this.addUserForm.user_area = ''
-          _this.editUserForm.user_area = ''
-				}
-			})
-    },
-    //监听用户类型改变
-		userTypeChange(val) {
-			if (val == 3) {
-				this.editIsShow = true
-			} else {
-				this.editIsShow = false
+          this.userList = [
+			{
+				date:'2021-3-21',
+				order:'112544412577455',
+				equipId:'845521475322545522',
+				startTime:'2021-3-21 12:30:25',
+				endTime:'2021-3-21 12:36:25',
+				electricity:44,
+				water:38,
+				money:28
+			},
+			{
+				date:'2021-3-19',
+				order:'112544412577455',
+				equipId:'845556987322545522',
+				startTime:'2021-3-19 11:30:25',
+				endTime:'2021-3-19 11:36:25',
+				electricity:36,
+				water:21,
+				money:18
+			},
+			{
+				date:'2021-3-21',
+				order:'112544412577455',
+				equipId:'845521475322545522',
+				startTime:'2021-3-21 12:30:25',
+				endTime:'2021-3-21 12:36:25',
+				electricity:44,
+				water:38,
+				money:28
+			},
+			{
+				date:'2021-3-21',
+				order:'112544412577455',
+				equipId:'845521475322545522',
+				startTime:'2021-3-21 12:30:25',
+				endTime:'2021-3-21 12:36:25',
+				electricity:44,
+				water:38,
+				money:28
+			},{
+				date:'2021-3-21',
+				order:'112544412577455',
+				equipId:'845521475322545522',
+				startTime:'2021-3-21 12:30:25',
+				endTime:'2021-3-21 12:36:25',
+				electricity:44,
+				water:38,
+				money:28
+			},{
+				date:'2021-3-21',
+				order:'112544412577455',
+				equipId:'845521475322545522',
+				startTime:'2021-3-21 12:30:25',
+				endTime:'2021-3-21 12:36:25',
+				electricity:44,
+				water:38,
+				money:28
+			},{
+				date:'2021-3-21',
+				order:'112544412577455',
+				equipId:'845521475322545522',
+				startTime:'2021-3-21 12:30:25',
+				endTime:'2021-3-21 12:36:25',
+				electricity:44,
+				water:38,
+				money:28
+			},{
+				date:'2021-3-21',
+				order:'112544412577455',
+				equipId:'845521475322545522',
+				startTime:'2021-3-21 12:30:25',
+				endTime:'2021-3-21 12:36:25',
+				electricity:44,
+				water:38,
+				money:28
+			},{
+				date:'2021-3-21',
+				order:'112544412577455',
+				equipId:'845521475322545522',
+				startTime:'2021-3-21 12:30:25',
+				endTime:'2021-3-21 12:36:25',
+				electricity:44,
+				water:38,
+				money:28
+			},{
+				date:'2021-3-21',
+				order:'112544412577455',
+				equipId:'845521475322545522',
+				startTime:'2021-3-21 12:30:25',
+				endTime:'2021-3-21 12:36:25',
+				electricity:44,
+				water:38,
+				money:28
 			}
+		];
+          this.totalNum = 33;
     },
-    addUserDialogClosed() {
-      this.$refs.addUserFormRef.resetFields()
-      this.editIsShow = false
-      this.addUserForm.role_id = ''
-    },
+
     changePage(value) {
-			this.page = value
-			this.getList()
+		this.page = value
     },
-    //添加用户提交
-		addUserSubm() {
-			this.$refs.addUserFormRef.validate((valid) => {
-				if (!valid) return
-				let cs_user = this.addUserForm.cs_user ? '1' : ''
-				this.$axios({
-					method: 'POST',
-					url: '/api/api_gateway?method=user.login.regiest',
-					data: this.qs.stringify({
-						username: this.addUserForm.username,
-						mobile: this.addUserForm.mobile,
-						password: this.addUserForm.pass,
-						role_id: this.addUserForm.role_id,
-						user_type: this.addUserForm.user_type,
-						pcd: this.addUserForm.pcd,
-						user_area: this.addUserForm.user_area,
-						user_group_id: this.addUserForm.user_group_id,
-						projectname:this.addUserForm.projectname,
-						cs_user
-					})
-				}).then((res) => {
-					if (res.data.message == '') {
-						this.$message.success('添加用户成功!')
-						this.addUserDialogVisible = false
-						this.getList()
-					} else {
-						this.$message.error(res.data.message)
-					}
-				})
-			})
-    },
-    // 编辑用户信息
-		edit(role) {
-			console.log(role)
-			let data = JSON.stringify(role)
-			this.editUserForm = JSON.parse(data)
-			if (role.role_id == 0) {
-				//把0转换成""
-				this.editUserForm.role_id = ''
-      }
-      if (role.user_group_id=='0') {
-				//把0转换成""
-				this.editUserForm.user_group_id = ''
-			}
-			this.editUserDialogVisible = true
-    },
-    editUserDialogClosed() {
-			this.$refs.editUserFormRef.resetFields()
-			this.areaList = [] //清空省/市/区
-			this.editIsShow = false
-    },
-    //修改用户信息提交
-	editUserSubm() {
-		this.$refs.editUserFormRef.validate((valid) => {
-			if (!valid) return
-			console.log(this.editUserForm.user_group_id)
-			this.$axios({
-				method: 'POST',
-				url: '/api/api_gateway?method=user.login.users_info_updata',
-				data: this.qs.stringify({
-					uid: this.editUserForm.uid,
-					username: this.editUserForm.username,
-					mobile: this.editUserForm.mobile,
-					role_id: this.editUserForm.role_id,
-					user_type: this.editUserForm.user_type,
-					pcd: this.editUserForm.pcd,
-					user_area: this.editUserForm.user_area,
-					projectname:this.editUserForm.projectname,
-					user_group_id: this.editUserForm.user_group_id=='0'?'':this.editUserForm.user_group_id
-				})
-			}).then((res) => {
-				if (res.data.message == '') {
-					this.editUserDialogVisible = false
-					this.getList()
-				}
-			})
-		})
-	},
-	login(uid, username) {
-		//一键登录
-		this.$confirm('一键登录将登录此用户,是否继续?', '提示', {
-			confirmButtonText: '确定',
-			cancelButtonText: '取消',
-			type: 'warning'
-		})
-			.then(() => {
-				this.$axios({
-					method: 'POST',
-					url: '/api/api_gateway?method=user.login.auto_login',
-					data: this.qs.stringify({
-						uid
-					})
-				}).then((res) => {
-					if (res.data.message == '') {
-						this.$message({
-							type: 'success',
-							message: '操作成功!'
-						})
-						localStorage.setItem('cUsername',username) //修改当前登录的用户名
-						this.reload() //整体刷新
-						this.$EventBus.$on('firstPage', (data) => {
-							//默认显示菜单第一项
-							this.$router.push(`${data}`)
-						})
-					} else {
-						this.$message({
-							type: 'warning',
-							message: res.data.message
-						})
-					}
-				})
-			})
-			.catch(() => {
-				this.$message({
-					type: 'info',
-					message: '取消一键登录!'
-				})
-			})
-	},
-	//用户禁用
-	forbidUse(id, state, txt) {
-		this.$confirm(txt, '提示', {
-			confirmButtonText: '确定',
-			cancelButtonText: '取消',
-			type: 'warning'
-		})
-			.then(() => {
-				this.$axios({
-					method: 'POST',
-					url: '/api/api_gateway?method=user.login.users_statu_updata',
-					data: this.qs.stringify({
-						uid: id,
-						state: state
-					})
-				}).then((res) => {
-					if (res.data.message == '') {
-						this.$message({
-							type: 'success',
-							message: '操作成功!'
-						})
-						this.getList()
-					}
-				})
-			})
-			.catch(() => {
-				this.$message({
-					type: 'info',
-					message: '禁用取消!'
-				})
-			})
-	},
-	distribute(id, username) {
-		this.$store.state.allo_equip_user_id = id
-		this.$store.state.allo_equip_usename = username
-		this.$router.push('page5')
-	},
-	recharge(id) {
-			this.$confirm('是否向该用户充值一年费用?', '信息', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			})
-				.then(() => {
-					this.$axios({
-						method: 'POST',
-						url: '/api/api_gateway?method=user.login.user_add_package_time',
-						data: this.qs.stringify({
-							uid: id
-						})
-					}).then((res) => {
-						if (res.data.message == '') {
-							this.$message({
-								type: 'success',
-								message: '充值成功!'
-							})
-							this.getList()
-						} else {
-							this.$message({
-								type: 'error',
-								message: '充值失败!'
-							})
-						}
-					})
-				})
-				.catch(() => {
-					this.$message({
-						type: 'info',
-						message: '充值取消!'
-					})
-				})
-	},
-	//密码重置
-	resetPassword(id, name) {
-		// this.resetPassForm.uid = id
-		// this.resetPassForm.username = name
-		// this.resetPassDialogVisible = true
-		this.$confirm('是否重置密码 ? 重置后的密码为 yf_123456', '提示', {
-			confirmButtonText: '确定',
-			cancelButtonText: '取消',
-			type: 'warning'
-		})
-			.then(() => {
-				this.$axios({
-					method: 'POST',
-					url: '/api/api_gateway?method=user.login.admin_changepwd',
-					data: this.qs.stringify({
-						uid: id
-					})
-				}).then((res) => {
-					if (res.data.message == '') {
-						this.$message({
-							type: 'success',
-							message: '操作成功!'
-						})
-						this.getList()
-					} else {
-						this.$message({
-							type: 'warning',
-							message: res.data.message
-						})
-					}
-				})
-			})
-			.catch(() => {
-				this.$message({
-					type: 'info',
-					message: '取消重置密码!'
-				})
-			})
-	},
+
     
   },
-  filters: {
-      formatUserType(value) {
-			switch (value) {
-				case 1:
-					return '超级管理员'
-					break
-				case 2:
-					return '经销商'
-					break
-				case 3:
-					return '农林政府单位'
-					break
-				case 4:
-					return '普通用户'
-					break
-			}
-		}
-  },
   beforeCreate() {}, //生命周期 - 创建之前
   beforeMount() {}, //生命周期 - 挂载之前
   beforeUpdate() {}, //生命周期 - 更新之前
@@ -866,6 +191,11 @@ export default {
 };
 </script>
 <style lang='less' scoped>
+.seaarchBox{
+	margin-bottom: 10px;
+	display: flex;
+	justify-content: space-between;
+}
 .search-box {
   text-align: right;
   .el-input {

+ 2 - 2
src/pages/plantGuard/page5.vue

@@ -18,8 +18,8 @@
                 <el-option label="气象站" value="5"></el-option>
                 <el-option label="监控设备" value="6"></el-option>
                 <el-option label="孢子仪" value="7"></el-option>
-                <el-option label="性诱设备" value="8"></el-option>
-                <el-option label="糖醋测报" value="9"></el-option>
+                <!-- <el-option label="性诱设备" value="8"></el-option>
+                <el-option label="糖醋测报" value="9"></el-option> -->
               </el-select>
               <el-input
                 style="cursor: pointer"

+ 0 - 1
src/pages/plantGuard/twentyFourHistoryDate.vue

@@ -2,7 +2,6 @@
 <template>
   <div class="equipInfo">
     <div>
-		{{equipId}}
       <el-table :data="data24" stripe style="width: 100%" :header-cell-style="{background:'#52b6ff',color:'#fff'}" >
 				<el-table-column prop="e" label="传感器通道"></el-table-column>
 				<el-table-column prop="name" label="通道名称"></el-table-column>

+ 2 - 2
src/router/index.js

@@ -250,13 +250,13 @@ export default new Router({
           path: 'page10',
           name: 'page10',
           component: Page10,
-          meta: { title: '水价管理',order:3,navname: '水井信息', }
+          meta: { title: '水价管理',order:3,navname: '消费记录', }
         },
         {
           path: 'page11',
           name: 'page11',
           component: Page11,
-          meta: { title: '水价管理',order:3,navname: '用户信息', }
+          meta: { title: '水价管理',order:3,navname: '充值记录', }
         },
         
       ]

+ 2 - 0
src/store/store.js

@@ -11,6 +11,8 @@ const store = new Vuex.Store({
         allo_equip_usename:'',//分配设备传的用户名称
         cbd_photo_id:'',//测报灯查看图片设备id
         cbd_photo_did:'',//测报灯查看图片设备did
+        cbd_pest_id:'',//测报灯害虫统计设备id
+        cbd_pest_did:'',//测报灯害虫统计设备did
         
     },
     mutations: {

BIN
static/images/equipImg2.png


BIN
static/images/equipImg3.png


BIN
static/images/equipImg4.jpg


BIN
static/images/equipImg5.png


BIN
static/images/equipImg6.png


BIN
static/images/equipImg7.png


BIN
static/images/equipImg8.jpg


BIN
static/images/jkctrl1.png


BIN
static/images/jkctrl2.png


BIN
static/images/jkctrl3.png


BIN
static/images/jkctrl4.png


BIN
static/images/监控.rar


BIN
static/images/监控/2.png


BIN
static/images/监控/5.png


BIN
static/images/监控/6.png


BIN
static/images/监控/7.png


BIN
static/images/监控/8.png