各种报警数据处理

src/views/system/fallsolve/index.vue

@@ -6,8 +6,9 @@
       </el-form-item>
       <el-form-item label="处理状态" prop="solve_status">
         <el-select v-model="queryParams.solve_status">
-          <el-option label="已处理" :value="1"></el-option>
           <el-option label="未处理" :value="0"></el-option>
+          <el-option label="处理中" :value="2"></el-option>
+          <el-option label="已处理" :value="1"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -66,7 +67,7 @@
           跌倒告警
         </template>
       </el-table-column>
-      <el-table-column label="告警时间" align="center" prop="createtime" />
+      <el-table-column label="告警时间" align="center" prop="createTime" />
       <el-table-column label="告警内容" align="center" prop="alarmMsg" />
       <el-table-column label="处理状态" align="center" prop="solveStatus" />
       <!-- <el-table-column label="服务人员用户ID" align="center" prop="serviceUserid" />
@@ -136,7 +137,7 @@
         </el-col>
         <el-col :span="8" class="user-table">
           <div class="label">告警时间：</div>
-          <div>{{ form.createtime }}</div>
+          <div>{{ form.createTime }}</div>
         </el-col>
       </el-row>
       <!-- <el-row>
@@ -275,7 +276,7 @@ export default {
         info.push(`<p>姓名 : ${this.form.name}</p>`)
         info.push(`<p>电话 : ${this.form.tel_one}</p>`);
         info.push(`<p>地址 : ${this.form.address_desc}</p>`);
-        info.push(`<p>预警时间 : ${this.form.createtime}</p>`);
+        info.push(`<p>预警时间 : ${this.form.createTime}</p>`);
         let infoWindow = new AMap.InfoWindow({
           offset: new AMap.Pixel(0, -35),
           content: info.join(""),  //使用默认信息窗体框样式，显示信息内容
@@ -334,6 +335,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.name=null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -360,24 +362,24 @@ export default {
       //   this.title = "修改SOS预警处理";
       //   this.createMap()
       // });
-      this.fallsolveList.map(item => {
-        if (item.aid == id) {
-          this.form = item
+      // this.fallsolveList.map(item => {
+      //   if (item.aid == id) {
+          this.form = row;
           this.open = true;
-        }
-      })
+      //   }
+      // })
       this.createMap()
     },
     handleSee(row) {
       this.reset();
       const id = row.aid
-      this.fallsolveList.map(item => {
-        if (item.aid == id) {
-          this.form = item
+      // this.fallsolveList.map(item => {
+      //   if (item.aid == id) {
+          this.form = row
           this.open = true;
           this.deal_flag = false
-        }
-      })
+      //   }
+      // })
       this.createMap()
     },
     submit() {
@@ -387,7 +389,7 @@ export default {
       data.alarmMsg = this.form.alarmMsg
       data.solve_status = this.form.solve_status
       data.msg = this.form.msg
-      data.aid = this.form.aid
+      data.id = this.form.id
       addFallsolve(data).then(response => {
         this.$modal.msgSuccess("提交成功");
         this.open = false;

src/views/system/healthsolve/index.vue

@@ -6,8 +6,9 @@
       </el-form-item>
       <el-form-item label="处理状态" prop="solve_status">
         <el-select v-model="queryParams.solve_status">
-          <el-option label="已处理" :value="1"></el-option>
           <el-option label="未处理" :value="0"></el-option>
+          <el-option label="处理中" :value="2"></el-option>
+          <el-option label="已处理" :value="1"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -66,7 +67,7 @@
           健康告警
         </template>
       </el-table-column>
-      <el-table-column label="告警时间" align="center" prop="createtime" />
+      <el-table-column label="告警时间" align="center" prop="createTime" />
       <el-table-column label="告警内容" align="center" prop="alarmMsg" />
       <el-table-column label="处理状态" align="center" prop="solveStatus" />
       <!-- <el-table-column label="服务人员用户ID" align="center" prop="serviceUserid" />
@@ -136,7 +137,7 @@
         </el-col>
         <el-col :span="8" class="user-table">
           <div class="label">告警时间：</div>
-          <div>{{ form.createtime }}</div>
+          <div>{{ form.createTime }}</div>
         </el-col>
       </el-row>
       <!-- <el-row>
@@ -275,7 +276,7 @@ export default {
         info.push(`<p>姓名 : ${this.form.name}</p>`)
         info.push(`<p>电话 : ${this.form.tel_one}</p>`);
         info.push(`<p>地址 : ${this.form.address_desc}</p>`);
-        info.push(`<p>预警时间 : ${this.form.createtime}</p>`);
+        info.push(`<p>预警时间 : ${this.form.createTime}</p>`);
         let infoWindow = new AMap.InfoWindow({
           offset: new AMap.Pixel(0, -35),
           content: info.join(""),  //使用默认信息窗体框样式，显示信息内容
@@ -334,6 +335,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.name = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -360,12 +362,12 @@ export default {
       //   this.title = "修改SOS预警处理";
       //   this.createMap()
       // });
-      this.healthsolveList.map(item => {
-        if (item.aid == id) {
-          this.form = item
+      // this.healthsolveList.map(item => {
+      //   if (item.aid == id) {
+          this.form = row
           this.open = true;
-        }
-      })
+      //   }
+      // })
       this.createMap()
     },
     handleSee(row) {
@@ -387,7 +389,7 @@ export default {
       data.alarmMsg = this.form.alarmMsg
       data.solve_status = this.form.solve_status
       data.msg = this.form.msg
-      data.aid = this.form.aid
+      data.id = this.form.id
       addHealthsolve(data).then(response => {
         this.$modal.msgSuccess("提交成功");
         this.open = false;

src/views/system/othersolve/index.vue

@@ -6,8 +6,9 @@
       </el-form-item>
       <el-form-item label="处理状态" prop="solve_status">
         <el-select v-model="queryParams.solve_status">
-          <el-option label="已处理" :value="1"></el-option>
           <el-option label="未处理" :value="0"></el-option>
+          <el-option label="处理中" :value="2"></el-option>
+          <el-option label="已处理" :value="1"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -66,7 +67,7 @@
           其他告警
         </template>
       </el-table-column>
-      <el-table-column label="告警时间" align="center" prop="createtime" />
+      <el-table-column label="告警时间" align="center" prop="createTime" />
       <el-table-column label="告警内容" align="center" prop="alarmMsg" />
       <el-table-column label="处理状态" align="center" prop="solveStatus" />
       <!-- <el-table-column label="服务人员用户ID" align="center" prop="serviceUserid" />
@@ -136,7 +137,7 @@
         </el-col>
         <el-col :span="8" class="user-table">
           <div class="label">告警时间：</div>
-          <div>{{ form.createtime }}</div>
+          <div>{{ form.createTime }}</div>
         </el-col>
       </el-row>
       <!-- <el-row>
@@ -275,7 +276,7 @@ export default {
         info.push(`<p>姓名 : ${this.form.name}</p>`)
         info.push(`<p>电话 : ${this.form.tel_one}</p>`);
         info.push(`<p>地址 : ${this.form.address_desc}</p>`);
-        info.push(`<p>预警时间 : ${this.form.createtime}</p>`);
+        info.push(`<p>预警时间 : ${this.form.createTime}</p>`);
         let infoWindow = new AMap.InfoWindow({
           offset: new AMap.Pixel(0, -35),
           content: info.join(""),  //使用默认信息窗体框样式，显示信息内容
@@ -334,6 +335,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.name = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -360,24 +362,24 @@ export default {
       //   this.title = "修改SOS预警处理";
       //   this.createMap()
       // });
-      this.othersolveList.map(item => {
-        if (item.aid == id) {
-          this.form = item
+      // this.othersolveList.map(item => {
+      //   if (item.aid == id) {
+          this.form = row
           this.open = true;
-        }
-      })
+      //   }
+      // })
       this.createMap()
     },
     handleSee(row) {
       this.reset();
       const id = row.aid
-      this.othersolveList.map(item => {
-        if (item.aid == id) {
-          this.form = item
+      // this.othersolveList.map(item => {
+      //   if (item.aid == id) {
+          this.form = row
           this.open = true;
           this.deal_flag = false
-        }
-      })
+      //   }
+      // })
       this.createMap()
     },
     submit() {
@@ -387,7 +389,7 @@ export default {
       data.alarmMsg = this.form.alarmMsg
       data.solve_status = this.form.solve_status
       data.msg = this.form.msg
-      data.aid = this.form.aid
+      data.id = this.form.id
       addOthersolve(data).then(response => {
         this.$modal.msgSuccess("提交成功");
         this.open = false;

src/views/system/solve/index.vue

@@ -6,8 +6,10 @@
       </el-form-item>
       <el-form-item label="处理状态" prop="solve_status">
         <el-select v-model="queryParams.solve_status">
-          <el-option label="已处理" :value="1"></el-option>
           <el-option label="未处理" :value="0"></el-option>
+          <el-option label="处理中" :value="2"></el-option>
+          <el-option label="已处理" :value="1"></el-option>
+
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -66,7 +68,7 @@
           SOS告警
         </template>
       </el-table-column>
-      <el-table-column label="告警时间" align="center" prop="createtime" />
+      <el-table-column label="告警时间" align="center" prop="createTime" />
       <el-table-column label="告警内容" align="center" prop="alarmMsg" />
       <el-table-column label="处理状态" align="center" prop="solveStatus" />
       <!-- <el-table-column label="服务人员用户ID" align="center" prop="serviceUserid" />
@@ -136,7 +138,7 @@
         </el-col>
         <el-col :span="8" class="user-table">
           <div class="label">告警时间：</div>
-          <div>{{ form.createtime }}</div>
+          <div>{{ form.createTime }}</div>
         </el-col>
       </el-row>
       <!-- <el-row>
@@ -275,7 +277,7 @@ export default {
         info.push(`<p>姓名 : ${this.form.name}</p>`)
         info.push(`<p>电话 : ${this.form.tel_one}</p>`);
         info.push(`<p>地址 : ${this.form.address_desc}</p>`);
-        info.push(`<p>预警时间 : ${this.form.createtime}</p>`);
+        info.push(`<p>预警时间 : ${this.form.createTime}</p>`);
         let infoWindow = new AMap.InfoWindow({
           offset: new AMap.Pixel(0, -35),
           content: info.join(""),  //使用默认信息窗体框样式，显示信息内容
@@ -335,6 +337,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.name = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -361,24 +364,28 @@ export default {
       //   this.title = "修改SOS预警处理";
       //   this.createMap()
       // });
-      this.solveList.map(item => {
-        if (item.aid == id) {
-          this.form = item
+      // this.solveList.map(item => {
+      //   if (item.aid == id) {
+          this.form = row
           this.open = true;
-        }
-      })
+      //   }
+      // })
       this.createMap()
     },
     handleSee(row) {
       this.reset();
       const id = row.aid
-      this.solveList.map(item => {
-        if (item.aid == id) {
-          this.form = item
+      this.form = row
+      // this.solveList.map(item => {
+      //   if (item.aid == id) {
+      //     console.log(item,888);
+      //     console.log(item.address_desc,777);
+      //     this.form = item
+
           this.open = true;
           this.deal_flag = false
-        }
-      })
+      //   }
+      // })
       this.createMap()
     },
     submit() {
@@ -388,7 +395,7 @@ export default {
       data.alarmMsg = this.form.alarmMsg
       data.solve_status = this.form.solve_status
       data.msg = this.form.msg
-      data.aid = this.form.aid
+      data.id = this.form.id
       addSolve(data).then(response => {
         this.$modal.msgSuccess("提交成功");
         this.open = false;