Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

Administrator

2021-05-07 e0a7020e28229ff041405a5d0f552308a5cbf5fb

Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

 src/views/dataL/dataL.vue

@@ -326,7 +326,7 @@
                      </el-row>
                      <el-row>
                        <el-col span="12">
                          <el-form-item label="负责人">
                          <el-form-item label="主要负责人">
                            <el-input
                              disabled="true"
                              v-model="detailsData.person"

 src/views/policeTracking/policeTracking.vue

@@ -60,7 +60,7 @@
              </el-row>
              <el-row>
                <el-col span="12">
                  <el-form-item label="负责人">
                  <el-form-item label="主要负责人">
                    <el-input
                      disabled="true"
                      v-model="form.oneContacts"

 src/views/supervisoryConsole/card.vue

@@ -174,12 +174,12 @@
          f = [];
        if (this.radio == "全部") {
          res.data.data.forEach((item) => {
            if (item.dtype == 1) {
            if (item.dtype == 2) {
              f.push(item);
            } else {
              if (item.dtype == 0) a.push(item);
              if (item.dtype == 2) c.push(item);
              if (item.dtype == 3) b.push(item);
              if (item.dtype == 3) a.push(item);
              if (item.dtype == 1) c.push(item);
              if (item.dtype == 0) b.push(item);
            }
          });
        } else if (this.radio == "仅显示预警设备") {