Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulator...

liuyg

2021-11-24 328cdbdc76153835a6c6047afbce71926a668391

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory_ys

 src/views/home/index.vue

@@ -601,7 +601,7 @@
            label="预警信息内容"
            :show-overflow-tooltip="true"
          ></el-table-column>
           <el-table-column
          <el-table-column
            :key="gridData.type"
            prop="znum"
            label="数量（条）"
@@ -791,7 +791,8 @@
        value: "id"
      },
      node1: {}, //选中的记录
      node2: {}
      node2: {},
      params: null
    };
  },
  computed: {
@@ -814,14 +815,15 @@
      this.value2 = data;
      this.peoWarning();
    },
    shoeDialog1(type, param) {
    shoeDialog1(type) {
      this.gridData.data = [];
      this.gridData.total = 0;
      this.gridData.current = 1;
      this.gridData.type = type;
      this.showDialogTable(type, param);
      this.showDialogTable(type);
    },
    showDialogTable(type, param) {
    showDialogTable(type) {
      let param = this.params;
      this.dialogTableVisible = true;
      this.dialogloading = true;
      if (type === "ks") {
@@ -966,7 +968,8 @@
          }
          this.echarts.left1Echart.setOption(optionJs.left1Data(securityData));
          this.echarts.left1Echart.on("click", params => {
            this.shoeDialog1("ywdx_gs", params);
            this.params = params;
            this.shoeDialog1("ywdx_gs");
          });
        } else {
          this.$message.error(res.msg);
@@ -1009,7 +1012,8 @@
          );
          this.echarts.right3Echart.on("click", param => {
            // this.gridData.title = param.name + "预警信息";
            this.shoeDialog1("yj", param);
            this.params = param;
            this.shoeDialog1("yj");
            // this.dialogTableVisible = true;
          });
        } else {
@@ -1034,7 +1038,8 @@
            );
            this.echarts.left2Echart.setOption(optionJs.left2Data(data), true);
            this.echarts.left2Echart.on("click", param => {
              this.shoeDialog1("ywdx_cz", param);
              this.params = param;
              this.shoeDialog1("ywdx_cz");
            });
          } else {
            this.$message.error(res.msg);

 src/views/securityUnitOperation/economicAnalysis.vue

@@ -36,9 +36,20 @@
              <span>较上月增加{{ socialSecurity.addNum }}人</span>
            </div>
            <div class="box-card">
              <span>社保缴纳总额(元)</span>
              <span>{{ socialSecurity.money }}</span>
              <span>较上月增加{{ socialSecurity.addMoney }}元</span>
              <template v-if="socialSecurity.money / 10000 > 1">
                <span>社保缴纳总额(万元)</span>
                <span>{{ (socialSecurity.money / 10000).toFixed(0) }}</span>
              </template>
              <template v-else>
                <span>社保缴纳总额(元)</span>
                <span>{{ Number(socialSecurity.money).toFixed(0) }}</span>
              </template>

              <span
                >较上月增加{{
                  Number(socialSecurity.addMoney).toFixed(0)
                }}元</span
              >
            </div>
            <div class="box-card">
              <span>公司派遣人数</span>

 src/views/statisticalQueryManagement/businessStatisticsDetail.vue

@@ -120,7 +120,7 @@
          {
            label: "保安公司名称",
            width: 300,
            prop: "tenantName",
            prop: "deptName",
            display: false
          },
          {
@@ -134,8 +134,8 @@
            display: false
          },
          {
            label: "保安员姓名",
            prop: "realName",
            label: "保安员人数",
            prop: "num",
            display: false
          },
          {

 src/views/statisticalQueryManagement/businessStatisticsFwdq.vue

@@ -91,7 +91,7 @@
          },
          {
            label: "所属保安公司",
            prop: "tenantName",
            prop: "deptName",
            width: 300,
            display: false
          },
@@ -106,8 +106,8 @@
            display: false
          },
          {
            label: "保安员姓名",
            prop: "realName",
            label: "保安员数量",
            prop: "num",
            display: false
          },
          {

 src/views/statisticalQueryManagement/businessStatisticsPq.vue

@@ -99,13 +99,13 @@

          {
            label: "保安公司名称",
            prop: "dispatcherCompany",
            prop: "deptName",
            width: 300,
            display: false
          },
          {
            label: "服务单位名称",
            prop: "deptName",
            prop: "dispatcherCompany",
            width: 300,
            props: {
              label: "name",

 src/views/statisticalQueryManagement/securityGuardDetail.vue

@@ -225,15 +225,15 @@
            dicData: [
              {
                label: "是",
                value: "0"
                value: '1'
              },
              {
                label: "否",
                value: "1"
                value: '2'
              },
              {
                label: "已吊销",
                value: "2"
                value: '3'
              }
            ],
            slot: true,
@@ -288,7 +288,7 @@
      param["status"] = params["status"] || "";
      param["deptId"] = this.fwdeptId;
      if (this.paramCz) {
        param["hold"] = "1";
        param["hold"] = '1';
      } else {
        param["hold"] = params["hold"] || "";
      }