bug修复

config/index.js

@@ -21,7 +21,7 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: '192.168.1.101', // can be overwritten by process.env.HOST
+    host: '192.168.1.102', // can be overwritten by process.env.HOST
     port: 8000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

src/components/index.vue

@@ -326,7 +326,7 @@ export default {
       this.currLeftMenuId = item.name;
       sessionStorage.setItem("currLeftMenuId", item.name);
       console.log(item)
-      if(item.path=="/operatData"){
+      if(item.path=="operatData"){
         this.$store.commit('setData',{
           name:'ele_operat_id',
           val:''

src/pages/plantGuard/disasterWarn/disasterWarnBase.vue

@@ -41,6 +41,7 @@
                         placeholder="请输入项目名称"
                         v-model="input"
                         suffix-icon="el-icon-search"
+                        @change='getEquipList'
                         clearable>
                     </el-input>
                 </div>
@@ -334,6 +335,7 @@ methods: {
         method: "POST",
         url: "/api/api_gateway?method=user.login.user_project_addr",
         data: this.qs.stringify({
+            projectname:this.input
         })
       }).then(res => {
         if (res.data.message == ""){

src/pages/plantGuard/irrigate/operatData.vue

@@ -4,7 +4,7 @@
     <el-card class="box-card">
 		<div class="seaarchBox">
 			<div class="searchLeft">
-				<el-input size="small" placeholder="请输入设备" v-model="searchVal" class="input-with-select">
+				<el-input size="small" @change="getList" clearable placeholder="请输入设备" v-model="searchVal" class="input-with-select">
 					<el-button size="small" slot="append" icon="el-icon-search"></el-button>
 				</el-input>
 				<span class="title">时间选择：</span>
@@ -14,11 +14,12 @@
 					type="daterange"
 					range-separator="至"
 					start-placeholder="开始日期"
-					end-placeholder="结束日期">
+					end-placeholder="结束日期"
+          @change="DateChange">
 				</el-date-picker>
 			</div>
 			<div class="exportRight">
-				<el-button size="small" type="blueInfo">导　出</el-button>
+				<!-- <el-button size="small" type="blueInfo">导　出</el-button> -->
 			</div>
 		</div>
        <template>
@@ -49,17 +50,18 @@ export default {
   data() {
 	  //这里存放数据
     return {
-		searchVal:this.$store.state.ele_operat_id,
-        // 
-	    value1:"",
-        role: "",
-        username: "",
-        txtInner:"筛选测试用户",
-        userList: [],
-            userGroupList: [],
-        roleList: [],
-        page: 1,
-        totalNum: 0,
+		  searchVal:this.$store.state.ele_operat_id,
+      value1:"",
+      begin:'',
+      end:'',
+      role: "",
+      username: "",
+      txtInner:"筛选测试用户",
+      userList: [],
+      userGroupList: [],
+      roleList: [],
+      page: 1,
+      totalNum: 0,
 
     };
   },
@@ -84,29 +86,45 @@ export default {
   methods: {
     //获取用户列表
     getList() {
-		this.$axios({
-        method: "post",
-        url: "/api/api_gateway?method=weather.weather.sf_control_data",
-        data: this.qs.stringify({
-          device_id: 15112501
-        })
-      }).then(res => {
-		  if(res.data.message==""){
-			  	this.userList = [];
-				this.totalNum = res.data.data.nums;
-			  	res.data.data.dat.forEach((item) => {
-					var relayName = item.relayName.split('/');
-					var relayState = item.relayState?'开启':'关闭';
-					var content = relayState+relayName[item.relayNum]
-					this.userList.push({
-						device_id:item.device_id,
-						content:content,
-						time:this.formatTime(item.uptime*1000),
-						user:item.user
-					})
-			  	});
-		  }
-	  })
+      this.$axios({
+          method: "post",
+          url: "/api/api_gateway?method=weather.weather.sf_control_data",
+          data: this.qs.stringify({
+            device_id: this.searchVal,
+            begin:this.begin,
+            end:this.end
+          })
+        }).then(res => {
+        if(res.data.message==""){
+            this.userList = [];
+          this.totalNum = res.data.data.nums;
+            res.data.data.dat.forEach((item) => {
+            var relayName = item.relayName.split('/');
+            var relayState = item.relayState?'开启':'关闭';
+            var content = relayState+relayName[item.relayNum]
+            this.userList.push({
+              device_id:item.device_id,
+              content:content,
+              time:this.formatTime(item.uptime*1000),
+              user:item.user
+            })
+            });
+        }
+      })
+    },
+    DateChange(val){
+      if(this.value1){
+        this.begin = parseInt(
+          new Date(this.value1[0]).getTime() / 1000
+        )
+        this.end = parseInt(
+          new Date(this.value1[1]).getTime() / 1000
+        )
+      }else{
+        this.begin = '';
+        this.end = '';
+      }
+      this.getList();
     },
     handleClick(tab, event) {
         console.log(tab, event);

src/pages/plantGuard/plantProtection/base.vue

@@ -1247,8 +1247,8 @@ export default {
      //载玻片、培养液更换时间展示
     setTimeDialogShow(data){
       this.setTimeDialogVisible = true;
-      this.time.time01 = data.glass
-      this.time.time02 = data.cultivate
+      this.time.time01 = data.glass*1000
+      this.time.time02 = data.cultivate*1000
       this.currbzyGlass = data.d_id
     },
     //载玻片、培养液更换时间配置提交

src/pages/plantGuard/plantProtection/baseAll.vue

@@ -41,6 +41,7 @@
                         placeholder="请输入项目名称"
                         v-model="input"
                         suffix-icon="el-icon-search"
+                        @change='getEquipList'
                         clearable>
                     </el-input>
                 </div>
@@ -330,6 +331,7 @@ methods: {
         method: "POST",
         url: "/api/api_gateway?method=user.login.user_project_addr",
         data: this.qs.stringify({
+            projectname:this.input
         })
       }).then(res => {
         if (res.data.message == ""){

src/pages/plantGuard/plantProtection/baseComponents/equipInfo.vue

@@ -179,6 +179,7 @@ export default {
               dat.device_name = dat.equip_name;
               dat.addtime = dat.uptime;
               dat.imei = dat.equip_id;
+              dat.d_id = dat.d_id;
               this.info = dat
             }
           }
@@ -208,6 +209,9 @@ export default {
           }
         });
       }
+      if(this.equipType==4){
+        this.addYx()
+      }
     },
     // 添加诱芯
     changeLure(){
@@ -220,7 +224,7 @@ export default {
         url: "/api/api_gateway?method=device.device_manage.get_spore_time",
         data: this.qs.stringify({
           device_type_id: 4,
-          d_id:this.info.d_id,
+          d_id:this.d_id,
         }),
       }).then((res) => {
         if (res.data.message == "") {