system-clients 3.2.5 → 3.2.6

package/src/styles/less/manageStyle/manageStyle/safeStyle.less

@@ -0,0 +1,498 @@
+
+
+/*分辨率@1920*1080*/
+@media screen and (max-width: 1920px) {
+  /*经营管控全局页面样式*/
+  .home-div {
+    font-family: PingFangSC-Regular;
+    background-image: url('/static/ManageHomePic/图层0.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    /*width: 2304px;*/
+    /*height: 775px;*/
+    width: 100%;
+    height: 100%;
+    position: relative;
+    overflow: hidden;
+  }
+
+  .safe-navigation{
+    position: absolute;
+    width: 100%;
+    height: 10%;
+  }
+  .safe-title-div{
+    margin-top: 1%;
+    margin-left: 3%;
+    padding-top: 1%;
+    float: left;
+    min-width: 13%;
+    max-height: 65px;
+    text-align: center;
+    background-image: url('/static/ManageHomePic/图层519.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+  }
+
+
+  /*菜单全局样式*/
+  .safe-navigation>.safe-menucol {
+    padding-left: 4%;
+    float: left;
+    width: 40%;
+    height: 100%;
+  }
+
+  /*菜单列样式*/
+  .safe-navigation>.safe-menucol>.safe-colname {
+    width: 100%;
+    height: 90%;
+    font-family: HanYi;
+    padding-top: 2%;
+    color: #00f7ff;
+    float: left;
+  }
+
+  /*单个菜单样式*/
+  .safe-navigation>.safe-menucol>.safe-colname div {
+    text-align: center;
+    padding-top: 3%;
+    width: 14%;
+    float: left;
+    height: 80%;
+    max-height: 60px;
+    letter-spacing: 0px;
+    font-family: HanYi;
+  }
+
+  .filiale{
+    font-family: PingFangSC-Regular;
+    float: right;
+    padding-top: 2%;
+    width: 11%;
+    font-size: 2rem;
+    color: white;
+    font-weight: bolder;
+  }
+  .filiale img{
+    margin-right: 5%;
+    width: 9%;
+  }
+  /*鼠标移入时菜单样式*/
+  .safe-navigation>.safe-menucol>.safe-colname div:hover {
+    font-size: 2rem;
+    background-image: url('/static/ManageHomePic/椭圆2.png');
+    background-repeat: no-repeat;
+    background-position: bottom;
+    background-size: 100% 6%;
+  }
+
+  /*未选中菜单的字体大小*/
+  .safe-navigation>.safe-menucol>.safe-colname .noclick {
+    font-size: 1.8rem;
+  }
+
+  /*已选中菜单样式*/
+  .safe-navigation>.safe-menucol>.safe-colname .click {
+    font-size: 2.2rem;
+    background-image: url('/static/ManageHomePic/椭圆2.png');
+    background-repeat: no-repeat;
+    background-position: bottom;
+    background-size: 100% 6%;
+  }
+
+  .new-manage{
+    float: right;
+    letter-spacing: 2px;
+    color: #ffffff;
+    font-size: 2.5rem;
+    height: 55%;
+    margin: 1% 2%;
+    padding: 10px 2%;
+    background-color: rgba(6, 84, 97, 0.22);
+    border: solid 1px rgba(105, 206, 210, 0.22);
+  }
+
+  /*正文内容样式*/
+  .safe-text {
+    position: absolute;
+    top: 10%;
+    width: 100%;
+    height: 92%;
+    background-color: rgba(1, 207, 242, 0.03);
+  }
+
+  /*分页面全局样式*/
+  .d3 {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    /*background-color: #880000;*/
+  }
+
+  /*安全服务标题样式*/
+  .mfont {
+    margin-top: 2%;
+    float: left;
+    font-size: 3rem;
+    letter-spacing: 4px;
+    color: #ffffff;
+  }
+
+  /*主题字体样式*/
+  .safe-gradient-text {
+    width: 100%;
+    height: 100%;
+    font-size: 2.5rem;
+    font-family: HanYi;
+  }
+
+  /*主题字体颜色渐变样式*/
+  .safe-gradient-text-one {
+    background-image: -webkit-linear-gradient(bottom, #009ef1, #00f2fe, #00f7ff);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+  }
+
+  /*安全服务天数样式*/
+  .span-date {
+    color: #f7cb32;
+  }
+
+
+  //==========主页
+  /*小模块边框*/
+  .safe-border {
+    padding-top: 0.4%;
+    background: linear-gradient(#6fd9d0, #6fd9d0) left top,
+    linear-gradient(#6fd9d0, #6fd9d0) left top,
+    linear-gradient(#6fd9d0, #6fd9d0) right top,
+    linear-gradient(#6fd9d0, #6fd9d0) right top,
+    linear-gradient(#6fd9d0, #6fd9d0) left bottom,
+    linear-gradient(#6fd9d0, #6fd9d0) left bottom,
+    linear-gradient(#6fd9d0, #6fd9d0) right bottom,
+    linear-gradient(#6fd9d0, #6fd9d0) right bottom;
+    background-repeat: no-repeat;
+    background-size: 1.5px 11px, 11px 1.5px;
+    background-color: rgba(1, 207, 242, 0.05);
+  }
+
+  /*用户模块样式*/
+  .safe-user {
+    position: absolute;
+    float: left;
+    width: 33%;
+    height: 30%;
+    left: 2%;
+  }
+
+  /*陕西地图*/
+  .safe-shanximap {
+    position: absolute;
+    top:-5%;
+    left: 36%;
+    width: 28%;
+    height: 57%;
+  }
+
+  /*供销气量模块样式*/
+  .safe-gasvalue {
+    position: absolute;
+    left: 65%;
+    width: 33%;
+    height: 50%;
+  }
+
+  /*客服模块样式*/
+  .safe-callcenter {
+    position: absolute;
+    top: 32%;
+    width: 33%;
+    height: 25%;
+    left: 2%;
+  }
+
+  /*安检模块样式*/
+  .safe-safe {
+    position: absolute;
+    top: 59%;
+    width: 33%;
+    height: 35%;
+    left: 2%;
+  }
+
+  /*管网模块样式*/
+  .safe-network {
+    position: absolute;
+    top: 52%;
+    left: 65%;
+    width: 33%;
+    height: 42%;
+  }
+
+
+  /*监控模块样式*/
+  .safe-monitor {
+    position: absolute;
+    top: 59%;
+    height: 35%;
+    left: 36%;
+    width: 28%;
+  }
+   .label{
+     padding-top: 1%;
+     margin-left: 4%!important;
+     font-size: 1.5rem !important;
+   }
+
+}
+
+
+
+
+/*分辨率@1366*768*/
+@media screen and (max-width: 1366px) {
+  /*经营管控全局页面样式*/
+  .home-div {
+    font-family: PingFangSC-Regular;
+    background-image: url('/static/ManageHomePic/图层0.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    /*width: 2304px;*/
+    /*height: 775px;*/
+    width: 100%;
+    height: 100%;
+    position: relative;
+    overflow: hidden;
+  }
+
+  .safe-navigation{
+    position: absolute;
+    width: 100%;
+    height: 10%;
+  }
+  .safe-title-div{
+    margin-top: 1%;
+    margin-left: 3%;
+    padding-top: 1%;
+    float: left;
+    min-width: 13%;
+    max-height: 46px;
+    text-align: center;
+    background-image: url('/static/ManageHomePic/图层519.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+  }
+
+
+  /*菜单全局样式*/
+  .safe-navigation>.safe-menucol {
+    padding-left: 4%;
+    float: left;
+    width: 40%;
+    height: 100%;
+  }
+
+  /*菜单列样式*/
+  .safe-navigation>.safe-menucol>.safe-colname {
+    width: 100%;
+    height: 90%;
+    font-family: HanYi;
+    padding-top: 2%;
+    color: #00f7ff;
+    float: left;
+  }
+
+  /*单个菜单样式*/
+  .safe-navigation>.safe-menucol>.safe-colname div {
+    text-align: center;
+    padding-top: 3%;
+    width: 14%;
+    float: left;
+    height: 80%;
+    max-height: 50px;
+    letter-spacing: 0px;
+    font-family: HanYi;
+  }
+
+  .filiale{
+    font-family: PingFangSC-Regular;
+    float: right;
+    padding-top: 2%;
+    width: 11%;
+    font-size: 1.8rem;
+    color: white;
+    font-weight: bolder;
+  }
+  .filiale img{
+    margin-right: 5%;
+    width: 9%;
+  }
+  /*鼠标移入时菜单样式*/
+  .safe-navigation>.safe-menucol>.safe-colname div:hover {
+    font-size: 1.8rem;
+    background-image: url('/static/ManageHomePic/椭圆2.png');
+    background-repeat: no-repeat;
+    background-position: bottom;
+    background-size: 100% 6%;
+  }
+
+  /*未选中菜单的字体大小*/
+  .safe-navigation>.safe-menucol>.safe-colname .noclick {
+    font-size: 1.6rem;
+  }
+
+  /*已选中菜单样式*/
+  .safe-navigation>.safe-menucol>.safe-colname .click {
+    font-size: 1.8rem;
+    background-image: url('/static/ManageHomePic/椭圆2.png');
+    background-repeat: no-repeat;
+    background-position: bottom;
+    background-size: 100% 6%;
+  }
+
+  .new-manage{
+    float: right;
+    letter-spacing: 2px;
+    color: #ffffff;
+    font-size: 1.6rem;
+    height: 55%;
+    margin: 1% 2%;
+    padding: 5px 2%;
+    background-color: rgba(6, 84, 97, 0.22);
+    border: solid 1px rgba(105, 206, 210, 0.22);
+  }
+
+  /*正文内容样式*/
+  .safe-text {
+    position: absolute;
+    top: 10%;
+    width: 100%;
+    height: 92%;
+    background-color: rgba(1, 207, 242, 0.03);
+  }
+
+  /*分页面全局样式*/
+  .d3 {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    /*background-color: #880000;*/
+  }
+
+  /*安全服务标题样式*/
+  .mfont {
+    margin-top: 2%;
+    float: left;
+    font-size: 2rem;
+    letter-spacing: 4px;
+    color: #ffffff;
+  }
+
+  /*主题字体样式*/
+  .safe-gradient-text {
+    width: 100%;
+    height: 100%;
+    font-size: 1.9rem;
+    font-family: HanYi;
+  }
+
+  /*主题字体颜色渐变样式*/
+  .safe-gradient-text-one {
+    background-image: -webkit-linear-gradient(bottom, #009ef1, #00f2fe, #00f7ff);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+  }
+
+  /*安全服务天数样式*/
+  .span-date {
+    color: #f7cb32;
+  }
+
+
+  //==========主页
+  /*小模块边框*/
+  .safe-border {
+    padding-top: 0.4%;
+    background: linear-gradient(#6fd9d0, #6fd9d0) left top,
+    linear-gradient(#6fd9d0, #6fd9d0) left top,
+    linear-gradient(#6fd9d0, #6fd9d0) right top,
+    linear-gradient(#6fd9d0, #6fd9d0) right top,
+    linear-gradient(#6fd9d0, #6fd9d0) left bottom,
+    linear-gradient(#6fd9d0, #6fd9d0) left bottom,
+    linear-gradient(#6fd9d0, #6fd9d0) right bottom,
+    linear-gradient(#6fd9d0, #6fd9d0) right bottom;
+    background-repeat: no-repeat;
+    background-size: 1.5px 11px, 11px 1.5px;
+    background-color: rgba(1, 207, 242, 0.05);
+  }
+
+  /*用户模块样式*/
+  .safe-user {
+    position: absolute;
+    float: left;
+    width: 33%;
+    height: 30%;
+    left: 2%;
+  }
+
+  /*陕西地图*/
+  .safe-shanximap {
+    position: absolute;
+    top:-5%;
+    left: 36%;
+    width: 28%;
+    height: 57%;
+  }
+
+  /*供销气量模块样式*/
+  .safe-gasvalue {
+    position: absolute;
+    left: 65%;
+    width: 33%;
+    height: 50%;
+  }
+
+  /*客服模块样式*/
+  .safe-callcenter {
+    position: absolute;
+    top: 32%;
+    width: 33%;
+    height: 25%;
+    left: 2%;
+  }
+
+  /*安检模块样式*/
+  .safe-safe {
+    position: absolute;
+    top: 59%;
+    width: 33%;
+    height: 35%;
+    left: 2%;
+  }
+
+  /*管网模块样式*/
+  .safe-network {
+    position: absolute;
+    top: 52%;
+    left: 65%;
+    width: 33%;
+    height: 42%;
+  }
+
+
+  /*监控模块样式*/
+  .safe-monitor {
+    position: absolute;
+    top: 59%;
+    height: 35%;
+    left: 36%;
+    width: 28%;
+  }
+  .label{
+    padding-top: 1%;
+    margin-left: 4%!important;
+    font-size: 1rem !important;
+  }
+
+}

package/src/styles/less/tables.less

@@ -71,7 +71,57 @@ th {
   }
 }
 
+.tablenew {
+  width: 100%;
+  max-width: 100%;
+  margin-bottom: @line-height-computed;
+  // Cells
+  > thead,
+  > tbody,
+  > tfoot {
+    > tr {
+      > th,
+      > td {
+        padding: 4px !important;
+        line-height: @line-height-base;
+        vertical-align: middle; // 原本为top
+        border-top: 0px solid @table-border-color; // 原本为0px
+        text-align: left;// 原本没有
+        color: #304A66;
+        // 原本没有，自己添加
+        font-family: 微软雅黑;
+
+      }
+    }
+  }
+  // Bottom align for column headings
+  > thead > tr > th {
+    text-align: center;
+    vertical-align: middle; // 原本为bottom
+    border-bottom: 2px solid @table-border-color;
+    font-weight: 600;
+  }
+  // Remove top border from thead by default
+  > caption + thead,
+  > colgroup + thead,
+  > thead:first-child {
+    > tr:first-child {
+      > th,
+      > td {
+        border-top: 0;
+      }
+    }
+  }
+  // Account for multiple tbody instances
+  > tbody + tbody {
+    border-top: 2px solid @table-border-color;
+  }
 
+  // Nesting
+  .table {
+    background-color: @body-bg;
+  }
+}
 // Condensed table w/ half padding
 
 .table-condensed {

package/src/styles/less/type.less

@@ -131,7 +131,7 @@ mark,
   .bg-variant(@state-success-bg);
 }
 .bg-info {
-  .bg-variant(@state-info-bg);
+  //.bg-variant(@state-info-bg);
   font-weight: 600;
 }
 .bg-warning {
@@ -140,7 +140,20 @@ mark,
 .bg-danger {
   .bg-variant(@state-danger-bg);
 }
-
+//----------------------------报表样式
+.report-primary {
+  color: #000809;
+  .bg-variant(@report-bg);
+  border-color: darken(@border, 25%);
+}
+.report-title{
+  color: #000809;
+  .bg-variant(@report-title);
+  border-color: darken(@border, 25%);
+}
+.report-success {
+  .bg-variant(@report-success);
+}
 
 // Page header
 // -------------------------
@@ -232,7 +245,7 @@ dd {
 
 // Abbreviations and acronyms
 abbr[title],
-// Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
+  // Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
 abbr[data-original-title] {
   cursor: help;
   border-bottom: 1px dotted @abbr-border-color;

package/src/styles/less/variables.less

@@ -19,7 +19,10 @@
 @brand-info:            #5bc0de;
 @brand-warning:         #f0ad4e;
 @brand-danger:          #d9534f;
-
+@report-bg:             #dfedfb;
+@report-success:        #ffffff;
+@border:                #adacac;
+@report-title:          #80add9;
 
 //== Scaffolding
 //
@@ -48,14 +51,14 @@
 @font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
 @font-family-base:        @font-family-sans-serif;
 
-@font-size-base:          16px;
+@font-size-base:          14px;
 @font-size-large:         ceil((@font-size-base * 1.25)); // ~18px
 @font-size-small:         ceil((@font-size-base * 0.85)); // ~12px
 
 @font-size-h1:            floor((@font-size-base * 2.6)); // ~36px
 @font-size-h2:            floor((@font-size-base * 2.15)); // ~30px
 @font-size-h3:            ceil((@font-size-base * 1.7)); // ~24px
-@font-size-h4:            ceil((@font-size-base * 1.25)); // ~18px
+@font-size-h4:            ceil((@font-size-base * 1.06)); // ~18px
 @font-size-h5:            @font-size-base;
 @font-size-h6:            ceil((@font-size-base * 0.85)); // ~12px
 

package/src/system.js

@@ -1,6 +1,11 @@
 import Vue from 'vue'
 import GetLoginInfoService from './plugins/GetLoginInfoService'
 import GetAppDataService from './stores/AppData'
+// 热力
+import HeatGetLoginInfoService from './plugins/HeatGetLoginInfoService'
+import HeatGetAppDataService from './stores/HeatAppData'
+// 热力登陆控制
+Vue.$heatCompatibility  = Vue.prototype.$heatCompatibility = false
 
 // /** **************************登录与主界面相关******************************/
 
@@ -21,13 +26,24 @@ import ResSelectGroup from './components/server/ResSelectGroup'
 //资源选择测试
 import TestResSelect from './components/server/TestResSelect'
 import RoleSelector from "./components/server/RoleSelector";
-export default function (val) {
+
+// BAinformation备案信息展示(空不展示, 传入什么展示什么,可以传标签)
+export default function (val,filiale, {showLogin = false, show_daiBan = false, BAinformation = null} = {}) {
+  console.log(val,filiale,showLogin)
   //验证码开关赋值
   if(val!=null){
     GetLoginInfoService.Verification=val
   }
+  //登录提示赋值
+  GetLoginInfoService.depPrompt=showLogin
+  //展示待办赋值
+  GetLoginInfoService.showDaiBan=show_daiBan
+  // 备案信息复制
+  GetLoginInfoService.BAinformation = BAinformation
   Vue.use(GetLoginInfoService)
   Vue.use(GetAppDataService)
+  Vue.use(HeatGetLoginInfoService)
+  Vue.use(HeatGetAppDataService)
 
   Vue.component('login', login)
   Vue.component('change-declare', changeDeclare)
@@ -68,9 +84,26 @@ export default function (val) {
   Vue.component('phone-manage', (resolve) => { require(['./components/equipment/PhoneManage'], resolve) })
   // pos端控制
   Vue.component('pos-manage', (resolve) => { require(['./components/equipment/PosManage'], resolve) })
+  // pos管理
+  Vue.component('pos-manage-both', (resolve) => { require(['./components/equipment/PosManageBoth'], resolve) })
+  // pos参数管理
+  Vue.component('pos-param-manage', (resolve) => { require(['./components/equipment/PosParamManage'], resolve) })
 
   // 材料字典
   Vue.component('material-data', (resolve) => { require(['./components/materialManage/materialData.vue'], resolve) })
   Vue.component('material-data-list', (resolve) => { require(['./components/materialManage/materialList.vue'], resolve) })
+  // 图片查看器
+  Vue.component('image-viewer', (resolve) => { require(['./components/server/ImageViewer'], resolve) })
+  // 测试图片查看器
+  Vue.component('image-viewer-test', (resolve) => { require(['./components/server/ImageVieweTest'], resolve) })
+
+  //省市区、街道、小区、楼栋级联查询
+  Vue.component('pcd-building-select', (resolve) => { require(['./components/server/PcdBuildingSelect'], resolve) })
 
+  if (filiale) {
+    let filialeComp = require(`./filiale/${filiale}/system`).specialComp
+    for (let key in filialeComp) {
+      Vue.component(key, filialeComp[key])
+    }
+  }
 }

package/src/util/Daiban.json

@@ -0,0 +1,12 @@
+{
+  "enable" : true,
+  "daiban": [
+      {
+        "title":"超期未安检通知",
+        "url": "/rs/sql/UpcomingSafecheckdata",
+        "data": {},
+        "text": "\t `到期未下发小区为：${item.f_residential_area},未检户数为:${item.user_count}` \t",
+        "enable": true
+      }
+  ]
+}