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

Administrator

2021-04-02 f7662fee14a892904e337ac049f1e70b928a356c

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

 src/router/views/index.js

@@ -188,18 +188,32 @@
        import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
    }]
  },
  // {
  //   path: '/realTimePolice',
  //   component: Layout,
  //   redirect: '/realTimePolice/index',
  //   children: [{
  //     path: 'index',
  //     name: '实时报警',
  //     meta: {
  //       i18n: 'real'
  //     },
  //     component: () =>
  //       import( /* webpackChunkName: "views" */ '@/views/realTimePolice/real')
  //   }]
  // },
  {
    path: '/realTimePolice',
    path: '/home',
    component: Layout,
    redirect: '/realTimePolice/index',
    redirect: '/home/index',
    children: [{
      path: 'index',
      name: '实时报警',
      name: '研判洞察',
      meta: {
        i18n: 'real'
        i18n: 'home'
      },
      component: () =>
        import( /* webpackChunkName: "views" */ '@/views/realTimePolice/real')
        import( /* webpackChunkName: "views" */ '@/views/home/home')
    }]
  },
  {
@@ -234,7 +248,7 @@
  {
    path: '/suser',
    component: Layout,
    redirect: '/suser/suser',
    redirect: '/suser',
    children: [{
      path: 'index',
      name: '客户管理',
@@ -242,7 +256,7 @@
        i18n: 'suser'
      },
      component: () =>
        import( /* webpackChunkName: "views" */ '@/views/suser/suser')
        import( /* webpackChunkName: "views" */ '@/views/system/cs')
    }]
  }, {
    path: '/policeTracking',

 src/views/clientManagement/clientManagement.vue

@@ -825,7 +825,7 @@
  };
</script>

<style scoped>
<style>
  .payWin {
    overflow-y: auto;
    height: 350px;
@@ -833,6 +833,51 @@

  .payWin .el-dialog__body {
    padding-top: 0px !important;
  }


  /*页面样式*/
  .el-card__body .cityClass1 {
    width: 155px;
    padding-right: 0px !important;
  }

  .el-card__body .cityClass2 {
    width: 100px;
    padding-left: 0px !important;
    padding-right: 0px !important;
  }

  .el-card__body .cityClass3 {
    width: 100px;
    padding-left: 0px !important;
    padding-right: 0px !important;
  }

  /*新增窗体样式*/
  .el-dialog .cityClass1 {
    width: 220px;
    padding-right: 0px !important;
  }

  .el-dialog .cityClass2 {
    width: 110px;
    padding-left: 5px !important;
    padding-right: 5px !important;
  }

  .el-dialog .cityClass3 {
    width: 110px;
    padding-left: 0px !important;
    padding-right: 0px !important;
  }

  .cityClass2 div label {
    display: none;
  }

  .cityClass3 div label {
    display: none;
  }

  .real-jf-dialog {
@@ -896,11 +941,11 @@
    border-radius: .25rem;
    box-shadow: 0 .5rem 1rem rgba(0,0,0,.15);
  }
  li:hover {
  .menu li:hover {
    background-color: rgba(232,237,250,.6);
    color: darkslategrey;
  }
  li{
  .menu li{
    position: relative;
    display: flex;
    font-size: 14px;

 src/views/realTimePolice/real.vue

@@ -19,6 +19,7 @@
      @row-save="rowSave"
      :before-open="beforeOpen"
      :row-style="rowStyle"
      row-class-name="tabFontSize"
      @search-change="searchChange"
      @search-reset="searchReset"
      @selection-change="selectionChange"
@@ -43,7 +44,7 @@
      <template slot="menuLeft">
        <el-button
          v-bind:class="activeClass == 0 ? 'btn-color' : ''"
          size="small"
          size="mini"
          @click="getBRdata(0)"
          >本日
        </el-button>
@@ -433,13 +434,14 @@
        calcHeight: 30,
        labelWidth: "100",
        size: "mini",
        border: false,
        stripe:true,
        menuWidth: 240,
        dialogWidth: 950,
        tip: false,
        searchShow: true,
        searchMenuSpan: 3,
        align:"center",
        border: true,
        index: true,
        viewBtn: true,
        selection: true,
@@ -450,7 +452,7 @@
            prop: "waringType",
            search: false,
            searchSpan: 3,
            width: 130,
            width: 85,
            className: "waringTypeClass",
            searchPlaceholder: "请选择",
            type: "select",
@@ -465,7 +467,7 @@
          {
            label: "报警时间",
            type: "datetime",
            width: 130,
            width: 160,
            format: "yyyy-MM-dd HH:mm:ss",
            valueFormat: "yyyy-MM-dd HH:mm:ss",
            prop: "alarmTime",
@@ -499,11 +501,12 @@
          {
            label: "负责人电话",
            prop: "onePhone",
            width: 96,
            width: 110,
          },
          {
            label: "报警人",
            prop: "galarmPeople",
            width: 90
          },
          {
            label: "报警人电话",
@@ -512,7 +515,6 @@
          },
          {
            label: "事发地址",
            width: 200,
            prop: "place",
          },
          {
@@ -562,6 +564,10 @@
            dicUrl: "/api/blade-system/region/select",
            span: 6,
            className: "cityClass1",
            hide: true,
            addDisplay: true,
            editDisplay: true,
            viewDisplay: true,
          },
          {
            label: "地市",
@@ -580,6 +586,10 @@
            span: 3,
            labelWidth: "0",
            className: "cityClass2",
            hide: true,
            addDisplay: true,
            editDisplay: true,
            viewDisplay: true,
          },
          {
            label: "区县",
@@ -598,10 +608,15 @@
            span: 3,
            labelWidth: "0",
            className: "cityClass3",
            hide: true,
            addDisplay: true,
            editDisplay: true,
            viewDisplay: true,
          },
          {
            label: "接警人",
            prop: "alarmPeople",
            width: 90
          },
          {
            label: "接警时间",
@@ -610,6 +625,10 @@
            valueFormat: "yyyy-MM-dd HH:mm:ss",
            width: 130,
            prop: "jjTime",
            hide: true,
            addDisplay: true,
            editDisplay: true,
            viewDisplay: true,
          },
        ],
      },
@@ -887,7 +906,7 @@
          return a.jtype - b.jtype;
        });

        


        this.data = data.records;

@@ -1483,4 +1502,9 @@
  background-color: rgb(64, 158, 255);
  border-color: rgb(64, 158, 255);
}

.tabFontSize{
  font-size: 15px;
}

</style>

 src/views/system/cs.vue

@@ -9,6 +9,7 @@
               :permission="permissionList"
               :before-open="beforeOpen"
               @row-del="rowDel"
               row-class-name="tabFontSize"
               @row-update="rowUpdate"
               @row-save="rowSave"
               @search-change="searchChange"
@@ -20,7 +21,7 @@
               @on-load="onLoad">
      <template slot="menuLeft">
        <el-button type="danger"
                   size="small"
                   size="mini"
                   icon="el-icon-delete"
                   v-if="permission.tenant_delete"
                   plain
@@ -92,10 +93,12 @@
      option: {
        height: 'auto',
        calcHeight: 80,
        size: "mini",
        tip: false,
        searchShow: true,
        searchMenuSpan: 6,
        border: true,
        border: false,
        stripe:true,
        index: true,
        selection: true,
        viewBtn: true,
@@ -847,4 +850,54 @@
</script>

<style>

  /*页面样式*/
  .el-card__body .cityClass1 {
    width: 155px;
    padding-right: 0px !important;
  }

  .el-card__body .cityClass2 {
    width: 100px;
    padding-left: 0px !important;
    padding-right: 0px !important;
  }

  .el-card__body .cityClass3 {
    width: 100px;
    padding-left: 0px !important;
    padding-right: 0px !important;
  }

  /*新增窗体样式*/
  .el-dialog .cityClass1 {
    width: 220px;
    padding-right: 0px !important;
  }

  .el-dialog .cityClass2 {
    width: 110px;
    padding-left: 5px !important;
    padding-right: 5px !important;
  }

  .el-dialog .cityClass3 {
    width: 110px;
    padding-left: 0px !important;
    padding-right: 0px !important;
  }

  .cityClass2 div label {
    display: none;
  }

  .cityClass3 div label {
    display: none;
  }

  .tabFontSize{
    font-size: 15px;
  }


</style>