Merge branch 'develop' into single-develop

src/views/ems/dzjk/gzgj/index.vue

@@ -90,7 +90,7 @@
           >
             <template slot-scope="scope">
               <el-button type="text" size="mini"  v-if="scope.row.ticketNo" @click="toTicket">已生成工单(工单号:{{scope.row.ticketNo}})</el-button>
-              <el-button type="primary" size="mini" v-else @click="toTicket">生成工单</el-button>
+              <el-button type="primary" size="mini" v-else @click="createTicket(scope.row.id)">生成工单</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -113,7 +113,7 @@
 
 
 <script>
-import {getAlarmDetailList} from'@/api/ems/dzjk'
+import {getAlarmDetailList,createTicketNo} from'@/api/ems/dzjk'
 import {getDeviceList} from'@/api/ems/site'
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import { formatDate } from '@/filters/ems'
@@ -149,6 +149,13 @@ export default {
     toTicket(){
       this.$router.push({path:'/ticket'})
     },
+    //生成工单
+    createTicket(id){
+      this.loading = true
+      createTicketNo({id}).then(response=>{
+        response?.data && this.toTicket()
+      }).finally(()=>{this.loading = false})
+    },
     // 判断是否是同一天
     isSameDay(day1, day2) {
       const date1 = new Date(day1),date2 = new Date(day2)
@@ -172,7 +179,6 @@ export default {
     // 搜索
     onSearch(){
       this.pageNum =1//每次搜索从1开始搜索
-      const [alarmStartTime='',alarmEndTime='']=(this.dateRange || [])
       this.getData()
     },
     // 重置
@@ -192,6 +198,7 @@ export default {
     },
     // 获取数据
     getData(){
+      this.$store.dispatch('getSiteAlarmNum',this.siteId)
       this.loading=true
       const {deviceId,alarmLevel} = this.search
       const {siteId,pageNum,pageSize,activeBtn} =this