冲突解决

Administrator

2021-04-26 e434c72ecb3d99e2bd8b4113998940034b0000be

冲突解决

 src/page/index/logo.vue

@@ -347,33 +347,14 @@
    };
  },
  created() {
    // this.getData();
    this.websocketStart();
  },
  computed: {
    ...mapGetters(["website", "keyCollapse"]),
  },
  methods: {
    // getData() {
    //   var that = this;
    //   axios({
    //     url: "/api/blade-jfpts/alarm/alarm/getLimit",
    //     method: "get",
    //   }).then(function (response) {
    //     if (response.data.data.length > 0) {
    //       that.deviceId = response.data.data[0].id;
    //     } else {
    //       that.deviceId = 0;
    //     }
    //     //获得最新ID，开启实时报警循环
    //     that.layerRealtime();
    //   });
    // },
    layerRealtime(jid) {
      var that = this;
      // window.clearTimeout(window.realTimeQuery);
      // that.deviceId = 334; // 测试用
      // window.realTimeQuery = setInterval(function () {
      axios({
        url: "/api/blade-jfpts/alarm/alarm/page",
        method: "get",
@@ -412,7 +393,6 @@
          }
        }
      });
      // }, 5000);
    },
    closeDialog() {
      //关闭窗口回调，关闭警报
@@ -757,7 +737,6 @@
              jid: that.form.id,
            },
          }).then((resdata) => {
            console.log(resdata);
          });

          newCallAxios

 src/views/alarm/alarm.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/animalHeat/animalHeat.vue

@@ -92,7 +92,7 @@
        option: {
          menu:false,
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          border: false,
          stripe:true,
          tip: false,

 src/views/clientManagement/clientManagement.vue

@@ -269,7 +269,7 @@
        option: {
          height: 'auto',
          indexLabel: '序号',
          calcHeight: 80,
          calcHeight: 54,
          labelWidth: '125',
          dialogWidth: 1150,
          menuWidth: 150,

 src/views/clientManagement/clientManagement_copy.vue

@@ -234,7 +234,7 @@
        option: {
          height: 'auto',
          indexLabel: '序号',
          calcHeight: 80,
          calcHeight: 54,
          labelWidth: '100',
          dialogWidth: 950,
          menuWidth: 250,

 src/views/deploy/deploy.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/desk/notice.vue

@@ -53,7 +53,7 @@
        selectionList: [],
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          dialogWidth: 950,
          tip: false,
          searchShow: true,

 src/views/district/district.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/dj/dj.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/duty/duty.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/enclosure/enclosure.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/equipment/equipment.vue

@@ -61,7 +61,7 @@
        option: {
          lazy: true,
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tree: true,
          tip: false,
          searchShow: true,

 src/views/feedback/feedback.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/flow/follow.vue

@@ -64,7 +64,7 @@
        deleteReason: '',
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/flow/manager.vue

@@ -141,7 +141,7 @@
        }],
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/flow/model.vue

@@ -193,7 +193,7 @@
        flowUrl: '',
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/healthcode/healthcode.vue

@@ -80,7 +80,7 @@
        option: {
          menu:false,
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          border: false,
          stripe:true,
          tip: false,

 src/views/monitor/log/api.vue

@@ -36,7 +36,7 @@
        },
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/monitor/log/error.vue

@@ -36,7 +36,7 @@
        },
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/monitor/log/usual.vue

@@ -36,7 +36,7 @@
        },
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/parcel/parcel.vue

@@ -87,7 +87,7 @@
        option: {
          menu:false,
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/parcel/parcelKind.vue

@@ -88,7 +88,7 @@
        option: {
          menu:false,
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 4,

 src/views/policeInformationDistribution/index.vue

@@ -109,7 +109,7 @@
        option: {
          height: "auto",
          indexLabel: "序号",
          calcHeight: 30,
          calcHeight: 54,
          labelWidth: "100",
          size: "mini",
          dialogWidth: 950,

 src/views/position/position.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/realTimePolice/real.vue

@@ -174,7 +174,7 @@
      option: {
        height: "auto",
        indexLabel: "序号",
        calcHeight: 30,
        calcHeight: 54,
        labelWidth: "100",
        size: "mini",
        border: false,

 src/views/realTimePolice/realHistory.vue

@@ -113,7 +113,7 @@
      option: {
        height: "auto",
        indexLabel: "序号",
        calcHeight: 30,
        calcHeight: 54,
        menuWidth: 240,
        size: "mini",
        border: false,

 src/views/regions/regions.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/report/reportlist copy.vue

@@ -66,7 +66,7 @@
      },
      option: {
        height: 'auto',
        calcHeight: 30,
        calcHeight: 54,
        tip: false,
        searchShow: true,
        searchMenuSpan: 6,

 src/views/report/reportlist.vue

@@ -66,7 +66,7 @@
      },
      option: {
        height: 'auto',
        calcHeight: 30,
        calcHeight: 54,
        tip: false,
        searchShow: true,
        searchMenuSpan: 6,

 src/views/reported/reported.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/resource/attach.vue

@@ -74,7 +74,7 @@
        selectionList: [],
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/resource/oss.vue

@@ -79,7 +79,7 @@
        selectionList: [],
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/resource/sms.vue

@@ -79,7 +79,7 @@
        selectionList: [],
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/routein/routein.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/security/security.vue

@@ -70,7 +70,7 @@
        selectionList: [],
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/street/street.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/survey/survey.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/suser/suser.vue

@@ -48,7 +48,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          border: true,

 src/views/system/client.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/system/cs.vue

@@ -248,7 +248,7 @@
      },
      option: {
        height: "auto",
        calcHeight: 80,
        calcHeight: 54,
        size: "mini",
        tip: false,
        searchShow: true,

 src/views/system/post.vue

@@ -54,7 +54,7 @@
        selectionList: [],
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/system/tenant.vue

@@ -89,7 +89,7 @@
      },
      option: {
        height: 'auto',
        calcHeight: 30,
        calcHeight: 54,
        tip: false,
        searchShow: true,
        searchMenuSpan: 6,

 src/views/system/topmenu.vue

@@ -91,7 +91,7 @@
        menuTreeObj: [],
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/system/user.vue

@@ -261,7 +261,7 @@
        },
        option: {
          height: 'auto',
          calcHeight: 80,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/task/task.vue

@@ -53,7 +53,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/taskfeedback/taskfeedback.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/tool/code.vue

@@ -64,7 +64,7 @@
        },
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          dialogWidth: 900,
          tip: false,
          searchShow: true,

 src/views/tool/datasource.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          dialogWidth: 900,
          tip: false,
          searchShow: true,

 src/views/trajectory/trajectory.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/visitrecord/visitrecord.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/wj/wj.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/work/claim.vue

@@ -87,7 +87,7 @@
        workBox: false,
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          simplePage: true,
          searchShow: true,

 src/views/work/done.vue

@@ -81,7 +81,7 @@
        workBox: false,
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/work/send.vue

@@ -85,7 +85,7 @@
        workBox: false,
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/work/start.vue

@@ -100,7 +100,7 @@
        workBox: false,
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/work/todo.vue

@@ -87,7 +87,7 @@
        workBox: false,
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          simplePage: true,
          searchShow: true,

 src/views/xlfeedback/xlfeedback.vue

@@ -49,7 +49,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 src/views/zc/zc.vue

@@ -62,7 +62,7 @@
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,