Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfptweb-public...

shuishen

2021-07-16 9135b7afb074e1480e04afdee560ec7d38d66e07

 src/views/policeTracking/policeTracking.vue

@@ -17,7 +17,7 @@
            >
              <div class="avue-group__header avue-group">
                <i class="el-icon-message-solid avue-group__icon"></i>
                <h1 class="avue-group__title">警情信息</h1>
                <h1 class="avue-group__title">任务信息</h1>
              </div>
            </div>
          </div>
@@ -40,7 +40,7 @@
            >
              <el-row>
                <el-col span="12">
                  <el-form-item label="警情类型">
                  <el-form-item label="任务类型">
                    <el-input
                      disabled="true"
                      v-model="form.alarmType"
@@ -49,7 +49,7 @@
                  </el-form-item>
                </el-col>
                <el-col span="12">
                  <el-form-item label="报警时间">
                  <el-form-item label="下发时间">
                    <el-input
                      disabled="true"
                      v-model="form.alarmTime"
@@ -87,15 +87,15 @@
                <el-col span="12">
                  <avue-form :option="securityArritem" v-model="form"></avue-form>
                </el-col>
                <el-col span="12">
                  <el-form-item label="派发人">
                    <el-input
                      disabled="true"
                      v-model="form.alarmPeople"
                      autocomplete="off"
                    ></el-input>
                  </el-form-item>
                </el-col>
<!--                <el-col span="12">-->
<!--                  <el-form-item label="派发人">-->
<!--                    <el-input-->
<!--                      disabled="true"-->
<!--                      v-model="form.alarmPeople"-->
<!--                      autocomplete="off"-->
<!--                    ></el-input>-->
<!--                  </el-form-item>-->
<!--                </el-col>-->
              </el-row>
            </el-form>

@@ -187,7 +187,7 @@
            >
              <div class="avue-group__header avue-group">
                <i class="el-icon-s-order avue-group__icon"></i>
                <h1 class="avue-group__title">警情反馈</h1>
                <h1 class="avue-group__title">任务反馈</h1>
              </div>
            </div>
          </div>