冲突

liuyg

2021-09-03 ffc31835fb765229c420db4a651abce3f8c832fc

冲突

 src/api/index/index.js

@@ -142,3 +142,11 @@
    params: params
  });
};

// 获取树形辖区
export const lazyTrees = () => {
  return request({
    url: "/api/jurisdiction/lazy-trees",
    method: "get"
  });
};

 src/views/desk/notice.vue

@@ -236,6 +236,7 @@
    rowSave(row, done, loading) {
      row.category = 2;
      row.deptId = this.deptId;
      row['type'] = 1;
      add(row).then(
        () => {
          this.onLoad(this.page);
@@ -354,6 +355,7 @@
      if (this.deptId != 1123598813738675201) {
        params["deptId"] = this.deptId;
      }
      params["type"] = 1;
      const { releaseTimeRange } = this.query;

      let values = {

 src/views/home/index.vue

@@ -235,13 +235,29 @@
          <div class="title-pane1">
            <img src="../../../public/img/bajgxt/icon2.png" />
            <span>保安员预警统计</span>
            <el-select v-model="value1" @change="companyWarning">
            <!-- <el-select v-model="value1" @change="companyWarning">
              <el-option
                v-for="item in options1"
                :key="item.id"
                :label="item.title"
                :value="item.value"
              ></el-option>
            </el-select> -->
            <el-select
              ref="treeForm1"
              v-model="node1.title"
              placeholder="请选择"
            >
              <el-option style="height: auto" :value="node1">
                <el-tree
                  :data="options1"
                  default-expand-all
                  node-key="id"
                  @node-click="handleNodeClick1"
                  :props="props"
                >
                </el-tree>
              </el-option>
            </el-select>
          </div>
          <div class="right-content" v-loading="right1loading">
@@ -292,7 +308,7 @@
          <div class="title-pane1">
            <img src="../../../public/img/bajgxt/icon2.png" />
            <span>保安公司预警统计</span>
            <el-select
            <!-- <el-select
              v-model="value2"
              placeholder="请选择"
              @change="peoWarning"
@@ -303,6 +319,22 @@
                :label="item.title"
                :value="item.value"
              ></el-option>
            </el-select> -->
            <el-select
              ref="treeForm2"
              v-model="node2.title"
              placeholder="请选择"
            >
              <el-option style="height: auto" :value="node2">
                <el-tree
                  :data="options2"
                  default-expand-all
                  node-key="id"
                  @node-click="handleNodeClick2"
                  :props="props"
                >
                </el-tree>
              </el-option>
            </el-select>
          </div>
          <div class="right-content" v-loading="right2loading">
@@ -667,6 +699,7 @@
  selectJy,
  selectWg,
  punishList,
  lazyTrees,
} from "../../api/index/index";

import car from "@/assets/img/car.png";
@@ -739,6 +772,13 @@
        jyTable: [],
        ymTable: [],
      },
      props: {
        children: "children",
        label: "title",
        value: "id",
      },
      node1: {}, //选中的记录
      node2: {},
    };
  },
  computed: {
@@ -750,6 +790,21 @@
    },
  },
  methods: {
    //点击节点
    handleNodeClick1(data) {
      this.node1 = data;
      this.value1 = data.id;
      this.$refs.treeForm1.blur();
      this.right1loading = true;
      this.getPoorPerformance(3);
    },
    //点击节点
    handleNodeClick2(data) {
      this.node2 = data;
      this.value2 = data.id;
      this.$refs.treeForm2.blur();
      this.peoWarning();
    },
    sexFormatter(row, column) {
      if (row.sex === 1) {
        return "男";
@@ -1040,12 +1095,14 @@
    },
    // 获取辖区列表
    getOfficeData() {
      lazyTreeJu().then((res) => {
      lazyTrees().then((res) => {
        if (res.data.code === 200) {
          this.options1 = res.data.data;
          this.options2 = res.data.data;
          this.value1 = this.options1[0].value || "";
          this.value2 = this.options2[0].value || "";
          this.node1 = this.options1[0];
          this.node2 = this.options1[0];
          // 获取完辖区列表之后再获取具体数据
          this.peoWarning();
          // this.getQualification();

 src/views/qualificationExamination/registrationTrainingQuery.vue

@@ -286,9 +286,32 @@
            // search: true,
            // searchSpan: 4,
          },
          // {
          //   label: "保安公司",
          //   prop: "deptId",
          //   // width: 70,
          //   // search: true,
          //   // searchSpan: 4,
          //   dicUrl:
          //     "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
          //   props: {
          //     label: "title",
          //     value: "id",
          //   },
          //   // search: true,
          //   // type: "tree",
          //   rules: [
          //     {
          //       required: true,
          //       message: "请输入组织机构",
          //       trigger: "blur",
          //     },
          //   ],
          //   overHidden: true,
          // },
          {
            label: "保安公司",
            prop: "deptId",
            prop: "deptName",
            // width: 70,
            // search: true,
            // searchSpan: 4,

 src/views/qualificationExamination/signQualificationExamination.vue

@@ -70,7 +70,7 @@
        column: [
          {
            label: "保安姓名",
            prop: "name",
            prop: "realName",
          },
          {
            label: "保安公司",

 src/views/securityUnitOperation/economicAnalysis.vue

@@ -17,16 +17,19 @@
            </el-select> -->
            <el-select
              class="select1"
              v-model="value1"
              ref="treeForm"
              v-model="node.title"
              placeholder="请选择"
              @change="fenjuChange"
            >
              <el-option
                v-for="item in options1"
                :key="item.id"
                :label="item.title"
                :value="item.id"
              >
              <el-option style="height: auto;" :value="node">
                <el-tree
                  :data="options1"
                  default-expand-all
                  node-key="id"
                  @node-click="handleNodeClick"
                  :props="props"
                >
                </el-tree>
              </el-option>
            </el-select>
            <el-select
@@ -99,7 +102,7 @@
<script>
import * as echarts from "echarts";
import echartJs from "./securityEchart.js";
import { lazyTreeJu } from "../../api/index/index";
import { lazyTreeJu, lazyTrees } from "../../api/index/index";
import {
  getCompanys,
  selectPCount,
@@ -156,10 +159,23 @@
      loading1: true,
      loading2: true,
      loading3: true,
      enterpriseName: ""
      enterpriseName: "",
      props: {
        children: "children",
        label: "title",
        value: "id"
      },
      node: {} //选中的记录
    };
  },
  methods: {
    //点击节点
    handleNodeClick(data) {
      this.node = data;
      this.value1 = data.id;
      this.$refs.treeForm.blur();
      this.getCompanys();
    },
    toEconomicTable() {
      this.$router.push({
        path:
@@ -172,18 +188,19 @@
      });
    },
    getFenju() {
      lazyTreeJu().then(res => {
      this.options1 = [];
      this.value1 = "";
      this.node = {};
      lazyTrees().then(res => {
        if (res.data.code === 200) {
          this.options1 = res.data.data;
          this.value1 = this.options1[0] ? this.options1[0].id : "";
          this.node = this.options1[0];
          this.getCompanys();
        } else {
          this.$message.error(res.msg);
        }
      });
    },
    fenjuChange() {
      this.getCompanys();
    },
    pieChange() {
      this.loading2 = true;

 src/views/securityUnitOperation/economicTable.vue

@@ -23,7 +23,7 @@
import XLSX from "xlsx";
import { mapGetters } from "vuex";
import { selectJj } from "../../api/securityUnitOperation/securityUnitOperation";
import { lazyTreeJu } from "../../api/index/index";
import { lazyTreeJu,lazyTrees } from "../../api/index/index";
export default {
  name: "公司经济情况智能分析详情表",
  data() {
@@ -229,28 +229,6 @@
        }
      ],
      subofficeValue: "0",
      subofficeOptions: [
        {
          value: "0",
          label: "南昌市公安局"
        },
        {
          value: "2",
          label: "东湖分局"
        },
        {
          value: "3",
          label: "西湖分局"
        },
        {
          value: "4",
          label: "青云谱分局"
        },
        {
          value: "5",
          label: "青山湖分局"
        }
      ],
      companyName: "",
      loading: true
    };
@@ -336,7 +314,7 @@
      });
    },
    getSubOfficeData() {
      lazyTreeJu().then(res => {
      lazyTrees().then(res => {
        if (res.data.code === 200) {
          this.tableOption.column.forEach(item => {
            if (item.label == "所属辖区") {

 src/views/securityUnitOperation/operationAnalysis.vue

@@ -17,16 +17,20 @@
            </el-select> -->
            <el-select
              class="select1"
              v-model="value1"
              ref="treeForm"
              v-model="node.title"
              placeholder="请选择"
              @change="fenjuChange"
            >
              <el-option
                v-for="item in options1"
                :key="item.id"
                :label="item.title"
                :value="item.id"
              ></el-option>
              <el-option style="height: auto;" :value="node">
                <el-tree
                  :data="options1"
                  default-expand-all
                  node-key="id"
                  @node-click="handleNodeClick"
                  :props="props"
                >
                </el-tree>
              </el-option>
            </el-select>
            <el-select
              class="select2"
@@ -136,7 +140,7 @@
<script>
import * as echarts from "echarts";
import echartJs from "./securityEchart.js";
import { lazyTreeJu } from "../../api/index/index";
import { lazyTreeJu, lazyTrees } from "../../api/index/index";
import {
  queryCounts,
  getCompanys,
@@ -209,10 +213,23 @@
        qing: 0,
        zhong: 0,
        lao: 0
      }
      },
      props: {
        children: "children",
        label: "title",
        value: "id"
      },
      node: {} //选中的记录
    };
  },
  methods: {
    //点击节点
    handleNodeClick(data) {
      this.node = data;
      this.value1 = data.id;
      this.$refs.treeForm.blur();
      this.getCompanys();
    },
    setAgeEchart() {
      this.loading4 = true;
      let params = {
@@ -252,19 +269,19 @@
    getFenju() {
      this.options1 = [];
      this.value1 = "";
      lazyTreeJu().then(res => {
      this.node = {};
      lazyTrees().then(res => {
        if (res.data.code === 200) {
          this.options1 = res.data.data;
          this.value1 = this.options1[0] ? this.options1[0].id : "";
          this.node = this.options1[0];
          this.getCompanys();
        } else {
          this.$message.error(res.msg);
        }
      });
    },
    fenjuChange() {
      this.getCompanys();
    },

    getCompanys() {
      getCompanys({ jurisdiction: this.value1 }).then(res => {
        if (res.data.code === 200) {

 src/views/securityUnitOperation/operationTable.vue

@@ -19,7 +19,7 @@
</template>
<script>
import { selectTb } from "../../api/securityUnitOperation/securityUnitOperation";
import { lazyTreeJu } from "../../api/index/index";
import { lazyTreeJu,lazyTrees } from "../../api/index/index";
export default {
  name: "公司运营情况智能分析详情表",
  data() {
@@ -278,7 +278,7 @@
      });
    },
    getSubOfficeData() {
      lazyTreeJu().then(res => {
      lazyTrees().then(res => {
        if (res.data.code === 200) {
          this.tableOption.column.forEach(item => {
            if (item.label == "所属辖区") {

 src/views/statisticalQueryManagement/businessStatistics.vue

@@ -30,7 +30,7 @@
  selectYw,
  dictionaryList
} from "../../api/statisticalQueryManagement/statisticalQueryManagement";
import { lazyTreeJu } from "../../api/index/index";
import { lazyTreeJu,lazyTrees } from "../../api/index/index";
export default {
  name: "业务情况统计",
  data() {
@@ -105,7 +105,7 @@
            label: "所属辖区",
            prop: "jurname",
            searchSpan: 4,
            type: "select",
            type: "tree",
            props: {
              label: "title",
              value: "id"
@@ -148,7 +148,7 @@
  },
  methods: {
    getSubOfficeData() {
      lazyTreeJu().then(res => {
      lazyTrees().then(res => {
        if (res.data.code === 200) {
          this.tableOption.column.forEach(item => {
            if (item.label == "所属辖区") {

 src/views/statisticalQueryManagement/businessStatisticsDetail.vue

@@ -25,7 +25,7 @@
  selectFw,
  fwList
} from "../../api/statisticalQueryManagement/statisticalQueryManagement";
import { lazyTreeJu } from "../../api/index/index";
import { lazyTreeJu,lazyTrees } from "../../api/index/index";
export default {
  name: "业务情况统计明细",
  data() {
@@ -290,7 +290,7 @@
      });
    },
    getSubOfficeData() {
      lazyTreeJu().then(res => {
      lazyTrees().then(res => {
        if (res.data.code === 200) {
          this.tableOption.column.forEach(item => {
            if (item.label == "所属辖区") {

 src/views/statisticalQueryManagement/securityGuardStatistics.vue

@@ -27,7 +27,7 @@
  selectLi,
  dictionaryList
} from "../../api/statisticalQueryManagement/statisticalQueryManagement";
import { lazyTreeJu } from "../../api/index/index";
import { lazyTreeJu ,lazyTrees} from "../../api/index/index";
export default {
  name: "业务情况统计",
  data() {
@@ -220,7 +220,7 @@
  },
  methods: {
    getSubOfficeData() {
      lazyTreeJu().then(res => {
      lazyTrees().then(res => {
        if (res.data.code === 200) {
          this.tableOption.column.forEach(item => {
            if (item.label == "所属辖区") {