system-clients 3.2.6-1 → 3.2.6-aodeToV4

package/src/styles/less/aofeng/themeOne/BinaryTemplate.less

@@ -137,8 +137,8 @@
 @media screen and (max-width: 1920px) {
 
   .basic-main {
-    padding: 0.4%;
-    margin: 0.4% 0.4%;
+    padding: 0.6%;
+    margin: 0.6% 0.6%;
     width: 98.8%;
     height: auto;
     background-color: #ffffff;
@@ -213,8 +213,8 @@
   //  background-color: #ffffff!important;
   //}
   .binary-left {
-    padding: 0.4%;
-    margin: 0.4% 0.4%;
+    padding: 0.6%;
+    margin: 0.6% 0.6%;
     width: 58%;
     height: auto;
     background-color: #ffffff;
@@ -223,8 +223,8 @@
   }
 
   .binary-right {
-    padding: 0.4%;
-    margin: 0.4% 0.4% 0.4% 0;
+    padding: 0.6%;
+    margin: 0.6% 0.6% 0.6% 0;
     width: 40%;
     height: auto;
     background-color: #ffffff;
@@ -255,12 +255,12 @@
 }
 
 
-/*分辨率@1600*1080*/
+/*分辨率@1920*1080*/
 @media screen and (max-width: 1600px) {
 
   .basic-main {
-    padding: 0.4%;
-    margin: 0.4% 0.4%;
+    padding: 0.6%;
+    margin: 0.6% 0.6%;
     width: 98.8%;
     height: auto;
     background-color: #ffffff;
@@ -335,8 +335,8 @@
   //  background-color: #ffffff!important;
   //}
   .binary-left {
-    padding: 0.4%;
-    margin: 0.4% 0.4%;
+    padding: 0.6%;
+    margin: 0.6% 0.6%;
     width: 58%;
     height: auto;
     background-color: #ffffff;
@@ -345,8 +345,8 @@
   }
 
   .binary-right {
-    padding: 0.4%;
-    margin: 0.4% 0.4% 0.4% 0;
+    padding: 0.6%;
+    margin: 0.6% 0.6% 0.6% 0;
     width: 40%;
     height: auto;
     background-color: #ffffff;

package/src/styles/less/aofeng/themeOne/systemStyle.less

@@ -201,9 +201,9 @@ input{outline:none;}
 
   .login-operator {
     position: fixed;
-    right: 0px;
+    right: 30px;
     font-size: 1.6rem;
-    line-height: 36px;
+    line-height: 40px;
     color: #333;
   }
 
@@ -333,7 +333,7 @@ input{outline:none;}
   //system左侧树列表
   .system-left {
     float: left;
-    width: 8%;
+    width: 9%;
     height: 100%;
 
     .system-left-chi {
@@ -552,9 +552,9 @@ input{outline:none;}
 
   .login-operator {
     position: fixed;
-    right: 0px;
+    right: 30px;
     font-size: 1.6rem;
-    line-height: 34.5px;
+    line-height: 36px;
     color: #333;
   }
 
@@ -760,7 +760,7 @@ input{outline:none;}
   //system左侧树列表
   .system-left{
     float: left;
-    width: 9%;
+    width: 10%;
 
     height: 100%;
 
@@ -986,9 +986,9 @@ input{outline:none;}
 
   .login-operator {
     position: fixed;
-    right: 0px;
+    right: 30px;
     font-size: 1.6rem;
-    line-height: 27px;
+    line-height: 36px;
     color: #333;
   }
 
@@ -1193,7 +1193,7 @@ input{outline:none;}
   //system左侧树列表
   .system-left{
     float: left;
-    width: 10%;
+    width: 11%;
     height: 100%;
     .system-left-chi{
       height: 96%;
@@ -1403,9 +1403,9 @@ input{outline:none;}
 
   .login-operator {
     position: fixed;
-    right: 0px;
+    right: 30px;
     font-size: 1.6rem;
-    line-height: 27px;
+    line-height: 30px;
     color: #333;
   }
 
@@ -1610,7 +1610,7 @@ input{outline:none;}
   //system左侧树列表
   .system-left{
     float: left;
-    width: 10%;
+    width: 11%;
     height:100%;
     .system-left-chi{
       height: 96%;
@@ -1826,9 +1826,9 @@ input{outline:none;}
 
   .login-operator {
     position: fixed;
-    right: 0px;
+    right: 30px;
     font-size: 1.6rem;
-    line-height: 27px;
+    line-height: 30px;
     color: #333;
   }
 
@@ -2033,7 +2033,7 @@ input{outline:none;}
   //system左侧树列表
   .system-left{
     float: left;
-    width: 10%;
+    width: 11%;
     height: 100%;
     .system-left-chi{
       height: 96%;
@@ -2241,9 +2241,9 @@ input{outline:none;}
 
   .login-operator {
     position: fixed;
-    right: 0px;
+    right: 30px;
     font-size: 1.6rem;
-    line-height: 27px;
+    line-height: 30px;
     color: #333;
   }
 
@@ -2448,7 +2448,7 @@ input{outline:none;}
   //system左侧树列表
   .system-left{
     float: left;
-    width: 12%;
+    width: 13%;
     height: 100%;
     .system-left-chi{
       height: 96%;

package/src/styles/less/fonts-list.less

@@ -8,18 +8,18 @@
 
 @font-face {
   font-family: 'PINGFANG-MEDIUM';  //重命名字体名
-  src: url('../fonts/pingfang-medium.ttf');  //引入字体
+  //src: url('../fonts/pingfang-medium.ttf');  //引入字体
 }
 @font-face {
   font-family: 'PINGFANG-BOLD';  //重命名字体名
-  src: url('../fonts/pingfang-bold.ttf');  //引入字体
+  //src: url('../fonts/pingfang-bold.ttf');  //引入字体
 }
 @font-face {
   font-family: 'PINGFANG-REGULAR';  //重命名字体名
-  src: url('../fonts/pingfang-regular.ttf');  //引入字体
+  //src: url('../fonts/pingfang-regular.ttf');  //引入字体
 }
 
 @font-face {
   font-family: PingFang;
-  src:url('../fonts/PingFangSC-Regular.ttf');
+  //src:url('../fonts/PingFangSC-Regular.ttf');
 }

package/src/styles/less/stand.less

@@ -1,7 +1,7 @@
 /*=========================通用样式表=========================*/
 @font-face {
   font-family: PingFang;
-  src:url('../fonts/PingFangSC-Regular.ttf');
+  //src:url('../fonts/PingFangSC-Regular.ttf');
 }
 
 

package/src/styles/less/tables.less

@@ -71,57 +71,7 @@ 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,20 +140,7 @@ 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
 // -------------------------
@@ -245,7 +232,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,10 +19,7 @@
 @brand-info:            #5bc0de;
 @brand-warning:         #f0ad4e;
 @brand-danger:          #d9534f;
-@report-bg:             #dfedfb;
-@report-success:        #ffffff;
-@border:                #adacac;
-@report-title:          #80add9;
+
 
 //== Scaffolding
 //
@@ -51,14 +48,14 @@
 @font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
 @font-family-base:        @font-family-sans-serif;
 
-@font-size-base:          14px;
+@font-size-base:          16px;
 @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.06)); // ~18px
+@font-size-h4:            ceil((@font-size-base * 1.25)); // ~18px
 @font-size-h5:            @font-size-base;
 @font-size-h6:            ceil((@font-size-base * 0.85)); // ~12px
 

package/src/system.js

@@ -26,20 +26,12 @@ import ResSelectGroup from './components/server/ResSelectGroup'
 //资源选择测试
 import TestResSelect from './components/server/TestResSelect'
 import RoleSelector from "./components/server/RoleSelector";
-
-// BAinformation备案信息展示(空不展示, 传入什么展示什么,可以传标签)
-export default function (val,filiale, {showLogin = false, show_daiBan = false, BAinformation = null} = {}) {
-  console.log(val,filiale,showLogin)
+import NewResSelectGroup from "./components/server/NewResSelectGroup.vue";
+export default function (val) {
   //验证码开关赋值
   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)
@@ -59,6 +51,7 @@ export default function (val,filiale, {showLogin = false, show_daiBan = false, B
   //资源选择
   Vue.component('res-select', ResSelect)
   Vue.component('res-select-group', ResSelectGroup)
+  Vue.component('new-select-group', NewResSelectGroup)
  //资源选择测试
   Vue.component('test-res-select', TestResSelect)
 
@@ -84,26 +77,9 @@ export default function (val,filiale, {showLogin = false, show_daiBan = false, B
   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/.npmignore

@@ -1,10 +0,0 @@
-src/bootstrap
-.idea/
-.DS_Store
-node_modules/
-dist/static/*.map
-npm-debug.log
-selenium-debug.log
-test/unit/coverage
-test/e2e/reports
-yarn.lock

package/build/.npmignore

@@ -1 +0,0 @@
-/dev-server.js