Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

zhanghua

2023-11-10 67cc1463320874211a09fee5c1b3b1fecf6d5a7c

 src/views/intelligentPatrol/studyJudge/index.vue

@@ -102,7 +102,7 @@
              >
            </div>
            <div class="card-header">
              <span>报警记录--{{ currentEvent.algoName }}</span>
              <span>报警记录--{{ currentEvent.alarmName }}</span>
            </div>
            <el-form
              ref="currentEvent"
@@ -308,7 +308,7 @@
      currentEvent: {},
      stateList: [
        {
          id: 2,
          id: 10,
          label: "上报",
        },
        {