Merge branch 'master' of http://192.168.0.105:10010/r/jfptweb-publicSecurity

liuyg

2022-02-25 1618e7bc621d6c1b9a87dafeba9e9078804a1ca4

Merge branch 'master' of http://192.168.0.105:10010/r/jfptweb-publicSecurity

 src/views/activitys/policeTracking.vue

@@ -48,7 +48,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.time"
@@ -66,8 +66,8 @@
              </el-row>
              <el-row>
                <el-col span="12">
                  <el-form-item label="省份" class="cityClassParams">
                    <avue-form :option="itemOption" v-model="form"></avue-form>
                  <el-form-item label="集合位置">
                    <el-input disabled="true" v-model="form.gathername" autocomplete="off"></el-input>
                  </el-form-item>
                </el-col>
                <el-col span="12">
@@ -160,23 +160,8 @@
              >
              </el-table-column>
              <el-table-column
                prop="online_status"
                label="在线状态"
                width="80"
                align="center"
              >
              </el-table-column>
              <el-table-column
                prop="tenantName"
                label="所属部门"
                align="center"
              >
              </el-table-column>

              <el-table-column
                prop="status"
                label="人员状态"
                width="120"
                label="所属队伍"
                align="center"
              >
              </el-table-column>
@@ -492,7 +477,7 @@
              phone: item.phone,
              online_status: item.online_status == 1 ? "在线" : "在线",
              status: "已抵达",
              tenantName: item.tenantName,
              tenantName: item.role_name,
            });
          });
        });