Browse Source

头部下拉菜单修改

wuhongbo 1 year ago
parent
commit
8c2e24857f

+ 96 - 62
BJYSYBZ_C/src/App.vue

@@ -9,20 +9,18 @@
 <script>
 <script>
 export default {
 export default {
   name: 'App',
   name: 'App',
-  data(){
-    return {
-    }
-  },
-  mounted(){
+  data() {
+    return {};
   },
   },
-  methods: {
-  }
-}
+  mounted() {},
+  methods: {},
+};
 </script>
 </script>
 
 
 <style lang="scss">
 <style lang="scss">
-@import "style/app.scss";
-html,body {
+@import 'style/app.scss';
+html,
+body {
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;
   margin: 0px;
   margin: 0px;
@@ -30,7 +28,8 @@ html,body {
   font-family: Alibaba PuHuiTi;
   font-family: Alibaba PuHuiTi;
   line-height: normal !important;
   line-height: normal !important;
 }
 }
-ul,li {
+ul,
+li {
   margin: 0px;
   margin: 0px;
   list-style: none;
   list-style: none;
   padding: 0px;
   padding: 0px;
@@ -39,74 +38,78 @@ ul,li {
   height: 100%;
   height: 100%;
   background: url('./assets/images/bg.png') no-repeat;
   background: url('./assets/images/bg.png') no-repeat;
   background-size: 100% 100%;
   background-size: 100% 100%;
-  >.container {
+  > .container {
     height: 100%;
     height: 100%;
   }
   }
 }
 }
 
 
-.el-loading-mask{
-  .el-loading-spinner{
-    .el-icon-loading{
+.el-loading-mask {
+  .el-loading-spinner {
+    .el-icon-loading {
       font-size: 40px;
       font-size: 40px;
     }
     }
-    .el-loading-text{
+    .el-loading-text {
       font-size: 20px;
       font-size: 20px;
     }
     }
   }
   }
 }
 }
 
 
-.leaflet-control-attribution{
+.leaflet-control-attribution {
   display: none;
   display: none;
 }
 }
-.esri-truncated-attribution{
+.esri-truncated-attribution {
   display: none;
   display: none;
 }
 }
-.my-div-icon{
-    width:100px;margin-top: 5px;
+.my-div-icon {
+  width: 100px;
+  margin-top: 5px;
 }
 }
-::-webkit-scrollbar {/*滚动条整体样式*/
-        width:4px;/*高宽分别对应横竖滚动条的尺寸*/
-        height:4px;
+::-webkit-scrollbar {
+  /*滚动条整体样式*/
+  width: 4px; /*高宽分别对应横竖滚动条的尺寸*/
+  height: 4px;
 }
 }
-::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-        border-radius:5px;
-        -webkit-box-shadow: inset005pxrgba(0,0,0,0.2);
-        background:rgba(0,0,0,0.2);
+::-webkit-scrollbar-thumb {
+  /*滚动条里面小方块*/
+  border-radius: 5px;
+  -webkit-box-shadow: inset005pxrgba(0, 0, 0, 0.2);
+  background: rgba(0, 0, 0, 0.2);
 }
 }
-::-webkit-scrollbar-track {/*滚动条里面轨道*/
-        -webkit-box-shadow: inset005pxrgba(0,0,0,0.2);
-        border-radius:0;
-        background:rgba(0,0,0,0.1);
+::-webkit-scrollbar-track {
+  /*滚动条里面轨道*/
+  -webkit-box-shadow: inset005pxrgba(0, 0, 0, 0.2);
+  border-radius: 0;
+  background: rgba(0, 0, 0, 0.1);
 }
 }
 .el-cascader__dropdown {
 .el-cascader__dropdown {
   background: none !important;
   background: none !important;
   border: 0px !important;
   border: 0px !important;
   .popper__arrow {
   .popper__arrow {
-    border-bottom-color: #468EC0 !important;
+    border-bottom-color: #468ec0 !important;
     &::after {
     &::after {
-      border-bottom-color: #468EC0 !important;
+      border-bottom-color: #468ec0 !important;
     }
     }
   }
   }
 }
 }
 .el-cascader-menu {
 .el-cascader-menu {
-  border-right-color: #468EC0 !important;
+  border-right-color: #468ec0 !important;
 }
 }
 .el-cascader-menu__wrap {
 .el-cascader-menu__wrap {
   height: inherit !important;
   height: inherit !important;
-border: 1px solid #468EC0;
-background: linear-gradient(0deg, #102A54 0%, #21407E 100%);
+  border: 1px solid #468ec0;
+  background: linear-gradient(0deg, #102a54 0%, #21407e 100%);
 }
 }
 .el-cascader-node {
 .el-cascader-node {
-
   .el-cascader-node__label {
   .el-cascader-node__label {
     color: #fff;
     color: #fff;
   }
   }
-  i{
+  i {
     color: #fff;
     color: #fff;
   }
   }
 }
 }
-.el-cascader-node:not(.is-disabled):focus, .el-cascader-node:not(.is-disabled):hover {
-  background: #2D75E4 !important;
+.el-cascader-node:not(.is-disabled):focus,
+.el-cascader-node:not(.is-disabled):hover {
+  background: #2d75e4 !important;
 }
 }
 
 
 .el-popper {
 .el-popper {
@@ -119,18 +122,22 @@ background: linear-gradient(0deg, #102A54 0%, #21407E 100%);
               .el-radio__input {
               .el-radio__input {
                 &.is-checked {
                 &.is-checked {
                   .el-radio__inner {
                   .el-radio__inner {
-                    border-color: #FFF !important;
-                    background: #FFF !important;
+                    border-color: #fff !important;
+                    background: #fff !important;
                     &::after {
                     &::after {
                       width: 6px;
                       width: 6px;
                       height: 6px;
                       height: 6px;
-                      background: linear-gradient(0deg, #102A54 0%, #405F97 100%);
+                      background: linear-gradient(
+                        0deg,
+                        #102a54 0%,
+                        #405f97 100%
+                      );
                     }
                     }
                   }
                   }
                 }
                 }
                 .el-radio__inner {
                 .el-radio__inner {
-                    border-color: #70D5FF;
-                    background: linear-gradient(0deg, #102A54 0%, #405F97 100%);
+                  border-color: #70d5ff;
+                  background: linear-gradient(0deg, #102a54 0%, #405f97 100%);
                 }
                 }
               }
               }
             }
             }
@@ -152,24 +159,26 @@ background: linear-gradient(0deg, #102A54 0%, #21407E 100%);
   .el-message-box__title {
   .el-message-box__title {
     color: #fff !important;
     color: #fff !important;
   }
   }
-  .el-dialog__header{
-    background: linear-gradient(0deg, rgba(1,148,233,0.6) 0%, #0653AC 100%) !important;
+  .el-dialog__header {
+    background: linear-gradient(
+      0deg,
+      rgba(1, 148, 233, 0.6) 0%,
+      #0653ac 100%
+    ) !important;
   }
   }
-  .el-dialog__title{
+  .el-dialog__title {
     color: #fff !important;
     color: #fff !important;
-
   }
   }
-  .el-dialog__body{
-    border: 1px solid #3D8BE7;
-    box-shadow: inset 0px 0px 20px 0px #3D8BE7;
+  .el-dialog__body {
+    border: 1px solid #3d8be7;
+    box-shadow: inset 0px 0px 20px 0px #3d8be7;
   }
   }
-
 }
 }
 .featureModal2 {
 .featureModal2 {
   width: 80% !important;
   width: 80% !important;
   height: 80% !important;
   height: 80% !important;
-  border: 1px solid #3D8BE7;
-  box-shadow: inset 0px 0px 20px 0px #3D8BE7 !important;
+  border: 1px solid #3d8be7;
+  box-shadow: inset 0px 0px 20px 0px #3d8be7 !important;
   //background: url("./assets/images/box-bg.png") no-repeat !important;
   //background: url("./assets/images/box-bg.png") no-repeat !important;
   background: #133887 !important;
   background: #133887 !important;
   background-size: 100% 100% !important;
   background-size: 100% 100% !important;
@@ -178,25 +187,27 @@ background: linear-gradient(0deg, #102A54 0%, #21407E 100%);
   .el-message-box__title {
   .el-message-box__title {
     color: #fff !important;
     color: #fff !important;
   }
   }
-  .el-dialog__header{
-    background: linear-gradient(0deg, rgba(1,148,233,0.6) 0%, #0653AC 100%) !important;
+  .el-dialog__header {
+    background: linear-gradient(
+      0deg,
+      rgba(1, 148, 233, 0.6) 0%,
+      #0653ac 100%
+    ) !important;
   }
   }
-  .el-dialog__title{
+  .el-dialog__title {
     color: #fff !important;
     color: #fff !important;
-
   }
   }
-  .el-dialog__body{
+  .el-dialog__body {
     height: 92% !important;
     height: 92% !important;
     padding: 10px !important;
     padding: 10px !important;
   }
   }
-
 }
 }
 %common1 {
 %common1 {
   opacity: 1;
   opacity: 1;
   -ms-transform: scaleY(1);
   -ms-transform: scaleY(1);
   transform: scaleY(1);
   transform: scaleY(1);
   transition: transform 1s cubic-bezier(0.23, 1, 0.32, 1) 0.5s,
   transition: transform 1s cubic-bezier(0.23, 1, 0.32, 1) 0.5s,
-  opacity 1s cubic-bezier(0.23, 1, 0.32, 1) 0.5s;
+    opacity 1s cubic-bezier(0.23, 1, 0.32, 1) 0.5s;
   -ms-transform-origin: center top;
   -ms-transform-origin: center top;
   transform-origin: center top;
   transform-origin: center top;
 }
 }
@@ -211,4 +222,27 @@ background: linear-gradient(0deg, #102A54 0%, #21407E 100%);
   -ms-transform: scaleY(0);
   -ms-transform: scaleY(0);
   transform: scaleY(0);
   transform: scaleY(0);
 }
 }
+
+.el-dropdown-menu {
+  background-color: #264584 !important;
+  border: 1px solid #2c64a1 !important;
+  .el-dropdown-menu__item {
+    color: #1bf1ff !important;
+  }
+  .selected {
+    background-color: #2363ae !important;
+    span {
+      color: #1bf1ff !important;
+    }
+  }
+  .el-dropdown-menu__item:hover {
+    background-color: #2363ae !important;
+  }
+  .popper__arrow {
+    border-bottom-color: #2c64a1 !important;
+  }
+  .popper__arrow::after {
+    border-bottom-color: #264584 !important;
+  }
+}
 </style>
 </style>

+ 1 - 0
BJYSYBZ_C/src/router/config.js

@@ -49,6 +49,7 @@ const routePathConfig = [
       },
       },
       {
       {
         path: 'manage-list',
         path: 'manage-list',
+        name: "地块管理",
         component: () => import('@/views/BjWlydManageView')
         component: () => import('@/views/BjWlydManageView')
       },
       },
     ]
     ]

+ 10 - 2
BJYSYBZ_C/src/views/components/HeaderCompBJ.vue

@@ -35,14 +35,16 @@
           <span>{{ syUserName||'管理员' }}</span>
           <span>{{ syUserName||'管理员' }}</span>
         </div> -->
         </div> -->
 
 
-        <el-dropdown @command="handleCommand">
+        <el-dropdown @command="handleCommand" :disabled="disabledDkgl">
           <span class="el-dropdown-link">
           <span class="el-dropdown-link">
             <img src="@/assets/images/user.png" />
             <img src="@/assets/images/user.png" />
             <span>{{ syUserName || '管理员' }}</span>
             <span>{{ syUserName || '管理员' }}</span>
             <i class="el-icon-arrow-down el-icon--right"></i>
             <i class="el-icon-arrow-down el-icon--right"></i>
           </span>
           </span>
           <el-dropdown-menu slot="dropdown">
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="xcryManage">巡查人员管理</el-dropdown-item>
+            <el-dropdown-item command="xcryManage"
+              >巡查人员管理</el-dropdown-item
+            >
             <el-dropdown-item command="updataPwd">修改密码</el-dropdown-item>
             <el-dropdown-item command="updataPwd">修改密码</el-dropdown-item>
             <el-dropdown-item command="clearLogin">退出登录</el-dropdown-item>
             <el-dropdown-item command="clearLogin">退出登录</el-dropdown-item>
           </el-dropdown-menu>
           </el-dropdown-menu>
@@ -74,6 +76,7 @@ export default {
   components: { UpdataPas, XcryDetail },
   components: { UpdataPas, XcryDetail },
   data() {
   data() {
     return {
     return {
+      disabledDkgl: false,
       currentUrl: '',
       currentUrl: '',
       syUserName: '',
       syUserName: '',
       orgRole: false,
       orgRole: false,
@@ -86,6 +89,11 @@ export default {
   },
   },
   props: {},
   props: {},
   mounted() {
   mounted() {
+    if (this.$route.name == '地块管理') {
+      this.disabledDkgl = false;
+    } else {
+      this.disabledDkgl = true;
+    }
     if (this.$route.fullPath.indexOf('manage-list') > 0) {
     if (this.$route.fullPath.indexOf('manage-list') > 0) {
       this.bjTitle = '滨江区地块管理';
       this.bjTitle = '滨江区地块管理';
       this.bjSTitle = '';
       this.bjSTitle = '';

+ 2 - 2
YSGZYBZ_WXAPP/pages/login/index.vue

@@ -39,8 +39,8 @@ export default {
         };
         };
         uni
         uni
           .request({
           .request({
-            // url: 'https://zlzd.zrzyt.zj.gov.cn/ysybz/api/app/xc/getXcryByMobile',
-            url: 'http://10.10.9.71:7089/ysgzybz/app/xc/getXcryByMobile',
+            url: 'https://zlzd.zrzyt.zj.gov.cn/ysybz/api/app/xc/getXcryByMobile',
+            // url: 'http://10.10.9.71:7089/ysgzybz/app/xc/getXcryByMobile',
             method: 'GET',
             method: 'GET',
             data: params,
             data: params,
           })
           })

File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map


+ 7 - 3
YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -3433,9 +3433,13 @@ https;exports.default = _default;
 "use strict";
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var config = {
 Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var config = {
   //发布线上需要吧login里面地址跟这里替换掉
   //发布线上需要吧login里面地址跟这里替换掉
-  baseUrl: "http://10.10.9.71:7089/ysgzybz/",
-  // baseUrl: "https://zlzd.zrzyt.zj.gov.cn/app215/ybz-api/",
-  webViewUrl: "http://10.10.9.58:8084/#/",
+  // baseUrl: "http://10.10.9.71:7089/ysgzybz/",
+  // webViewUrl: "http://10.10.9.58:8084/#/",
+
+
+  baseUrl: "https://zlzd.zrzyt.zj.gov.cn/app215/ybz-api/",
+  webViewUrl: "https://zlzd.zrzyt.zj.gov.cn/app215/wxin-view/#/",
+
   bjdkgl: 'https://zlzd.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJ_DKGL/MapServer' };var _default =
   bjdkgl: 'https://zlzd.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJ_DKGL/MapServer' };var _default =
 
 
 
 

+ 7 - 3
YSGZYBZ_WXAPP/utils/config.js

@@ -1,8 +1,12 @@
 const config = {
 const config = {
   //发布线上需要吧login里面地址跟这里替换掉
   //发布线上需要吧login里面地址跟这里替换掉
-  baseUrl: "http://10.10.9.71:7089/ysgzybz/",
-  // baseUrl: "https://zlzd.zrzyt.zj.gov.cn/app215/ybz-api/",
-  webViewUrl: "http://10.10.9.58:8084/#/",
+  // baseUrl: "http://10.10.9.71:7089/ysgzybz/",
+  // webViewUrl: "http://10.10.9.58:8084/#/",
+
+
+  baseUrl: "https://zlzd.zrzyt.zj.gov.cn/app215/ybz-api/",
+  webViewUrl: "https://zlzd.zrzyt.zj.gov.cn/app215/wxin-view/#/",
+  
   bjdkgl: 'https://zlzd.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJ_DKGL/MapServer'
   bjdkgl: 'https://zlzd.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJ_DKGL/MapServer'
 }
 }
 
 

Some files were not shown because too many files changed in this diff