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

liuyg

2021-05-21 e96d6c76904bf9cab3658606476d2429cae4ebad

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

 public/map/index.html

@@ -51,6 +51,8 @@
          _framework.onSiderContainerShow();
          _framework.resize();
          _AppEvent = AppEvent;
          //获取设备id
          window.clientID = locationObj.clientID;

          _AppEvent.addAppEventListener("mapLoad", function(map){
            if (locationObj && locationObj != null) {

 public/map/widgets/clientManagement/ClientManagement.js

@@ -162,11 +162,11 @@
    open: function () {
      var that = this;
      $.ajax({
        url: '/api/blade-jfpts/alarm/alarm/listAll?',
                url: '/api/blade-jfpts/equipment/equipment/pageDept?deviceName='+ window.clientID,
        type: 'get',
        dataType: 'JSON',
        success: function (data) {
          var datas = data.data;
                    var datas = data.data.records;
          for (var i = 0; i < datas.length; i++) {
            datas[i].x = Number(datas[i].jd);
            datas[i].y = Number(datas[i].wd);
@@ -183,8 +183,7 @@
    },

    // 鼠标点击事件
    clickHand: function () {
    },
        clickHand: function() {},

    //聚合图层事件
    flareClusterLayer: function (datas) {
@@ -218,7 +217,7 @@
      });

      //set up a class breaks renderer to render different symbols based on the cluster count. Use the required clusterCount property to break on.
      var defaultSym = new PictureMarkerSymbol("./images/jingbaored.png", 33, 48).setOffset(0, 15);
            var defaultSym = new PictureMarkerSymbol("./images/selfbaojin2.gif", 80, 80).setOffset(0, 15);
      var renderer = new ClassBreaksRenderer(defaultSym, "clusterCount");
      var xlSymbol = new SimpleMarkerSymbol(SimpleMarkerSymbol.STYLE_CIRCLE, 32, new SimpleLineSymbol(SimpleLineSymbol.STYLE_SOLID, new dojo.Color([200, 52, 59, 0.8]), 1), new dojo.Color([250, 65, 74, 0.8]));
      var lgSymbol = new SimpleMarkerSymbol(SimpleMarkerSymbol.STYLE_CIRCLE, 28, new SimpleLineSymbol(SimpleLineSymbol.STYLE_SOLID, new dojo.Color([41, 163, 41, 0.8]), 1), new dojo.Color([51, 204, 51, 0.8]));
@@ -249,8 +248,8 @@
      //var data = DataManager.getData();
      that.clusterLayer.addData(datas);

    }
    , clearLayer: function () {
        },
        clearLayer: function() {
      var that = this;
      that._map.removeLayer(that.clusterLayer);
      that.clusterLayer = null;
@@ -260,4 +259,3 @@
  });
  return Widget;
});


 src/api/system/tenant.js

@@ -103,13 +103,12 @@
    data: row
  })
}
export const instery = (dj, had, ht, ctime, content,hn) => {
export const instery = (dj, ht, ctime, content,hn) => {
  return request({
    url: '/api/blade-system/tenant/instery',
    method: 'post',
    params: {
      dj,
      had,
      ht,
      ctime,
      content,
@@ -117,7 +116,7 @@
    }
  })
}
export const insertsr = (category, attributes, developers, had, housetype, content, hn) => {
export const insertsr = (category, attributes, developers, housetype, content, hn) => {
  return request({
    url: '/api/blade-system/tenant/insertsr',
    method: 'post',
@@ -125,7 +124,6 @@
      category,
      attributes,
      developers,
      had,
      housetype,
      content,
      hn
@@ -178,7 +176,7 @@
}
export const updateInfos = (nature, had, motto, ctime, content,hn) => {
  return request({
    url: '/api/blade-system/tenant/updateInfoy',
    url: '/api/blade-system/tenant/updateInfos',
    method: 'post',
    params: {
      nature,

 src/views/attendance/attendance.vue

@@ -54,7 +54,7 @@
      </template>
      <template slot-scope="{ row }" slot="attendancetype">
        <el-tag>{{
            row.attendancetype == "0" ? "正常" : row.attendancetype == "1" ? "迟到" : "早退"
            row.attendancetype == "0" ? "正常" : row.attendancetype == "1" ? "迟到" : row.attendancetype == "2" ? "早退" : "无效"
          }}
        </el-tag>
      </template>
@@ -178,8 +178,8 @@
              label: "考勤时间",
              prop: "releaseTimeRange",
              type: "datetime",
              format: "yyyy-MM-dd hh:mm:ss",
              valueFormat: "yyyy-MM-dd hh:mm:ss",
              format: "yyyy-MM-dd HH:mm:ss",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              searchSpan: 6,
              searchRange:true,
              hide: true,
@@ -198,8 +198,8 @@
              prop: "clocktime",
              type: "date",
              width: 200,
              format: "yyyy-MM-dd hh:mm:ss",
              valueFormat: "yyyy-MM-dd hh:mm:ss",
              format: "yyyy-MM-dd HH:mm:ss",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              rules: [{
                required: true,
                message: "请输入clocktime",
@@ -215,15 +215,15 @@
                trigger: "blur"
              }]
            },
            {
              label: "天气",
              prop: "weather",
              rules: [{
                required: true,
                message: "请输入天气",
                trigger: "blur"
              }]
            },
            // {
            //   label: "天气",
            //   prop: "weather",
            //   rules: [{
            //     required: true,
            //     message: "请输入天气",
            //     trigger: "blur"
            //   }]
            // },
            {
              label: "经度",
              prop: "jd",
@@ -291,6 +291,10 @@
               {
                 label: "早退",
                   value: "2"
                },
               {
                 label: "无效",
                   value: "4"
               }
              ]
            },

 src/views/clientManagement/clientManagement.vue

@@ -447,6 +447,7 @@
              addDisplay: true,
              editDisplay: true,
              viewDisplay: true,
              searchSpan: 3,
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=manufacturers",
              props: {
                label: "dictValue",
@@ -1038,7 +1039,7 @@

          for (var i = 0; i < data.records.length; i++) {
            var date = new Date(data.records[i].heartbeat).getTime();
            if ((Dqdate - date) >= (60 * 60 * 24 * 1000)) {
            if ((Dqdate - date) >= (150 * 1000)) {
              data.records[i].dxzt = 0;
            } else if (data.records[i].heartbeat == "") {
              data.records[i].dxzt = 0;

 src/views/realTimePolice/real.vue

@@ -867,7 +867,7 @@
      this.showMap = true;
      this.$nextTick(() => {
        this.$refs.mapDiv.onload = () => {
          window.frames[1].init("ClientManagement", { x: row.jd, y: row.wd });
          window.frames[1].init("ClientManagement", { x: row.jd, y: row.wd , clientID: row.deviceNumber});
        };
      });
    },

 src/views/supervisoryConsole/data.vue

@@ -379,20 +379,21 @@
        ],
        tooltip: {
          trigger: "item",
          formatter: function (parms) {
            var str =
              parms.marker +
              "" +
              parms.data.legendname +
              "</br>" +
              "数量：" +
              parms.data.value +
              "</br>" +
              "占比：" +
              parms.percent +
              "%";
            return str;
          },
          // formatter: function (parms) {
          //   var str =
          //     parms.marker +
          //     "" +
          //     parms.data.legendname +
          //     "</br>" +
          //     "数量：" +
          //     parms.data.value +
          //     "</br>" +
          //     "占比：" +
          //     parms.percent +
          //     "%";
          //   return str;
          // },
          formatter: "{b}: {c} ({d}%)",
        },
        series: [
          {

 src/views/suser/suser.vue

@@ -222,7 +222,6 @@
        let ids = [];
          console.log(this.selectionList,111111111);
        this.selectionList.forEach(ele => {
          console.log(ele,id,2222222222);
          ids.push(ele.id);
        });
          console.log(this.selectionList,333333333333);

 src/views/system/cs.vue

@@ -785,8 +785,10 @@
  },
  methods: {
    rowSave(row, done, loading) {

      add(row).then(
        () => {
            debugger
          if (row.type == "0") {
            console.log(123);
            instery(
@@ -799,8 +801,8 @@
            );
          } else if (row.type == "1") {
            insertss(
              row.dj,
              row.nature,
                row.had,
              // row.had,
              row.motto,
              row.ctime,
@@ -809,14 +811,12 @@
            );
          } else if (row.type == "2") {
            insertsr(
              row.dj,
              row.category,
              row.attributes,
              row.developers,
              // row.had,
              row.housetype,
              row.content,
              row.hn
                row.tenantName
            );
          }
          this.onLoad(this.page);
@@ -833,6 +833,7 @@
      );
    },
    rowUpdate(row, index, done, loading) {
        debugger
      if (row.type == "0") {
        updateInfoy(
          row.dj,
@@ -844,7 +845,6 @@
        );
      } else if (row.type == "1") {
        updateInfos(
          row.dj,
          row.nature,
          row.had,
          row.motto,
@@ -854,7 +854,6 @@
        );
      } else if (row.type == "2") {
        updateInfor(
          row.dj,
          row.category,
          row.attributes,
          row.developers,
@@ -886,6 +885,7 @@
        type: "warning",
      })
        .then(() => {
            debugger
          if (row.type == "0") {
            deletey(row.tenantName);
          } else if (row.type == "1") {

 src/views/system/tenant.vue

@@ -97,7 +97,7 @@
        index: true,
        selection: true,
        viewBtn: true,
        dialogWidth: 900,
        dialogWidth: 1000,
        dialogClickModal: false,
        column: [
          {