diff --git a/config/index.js b/config/index.js index 460d843..2a40e5e 100644 --- a/config/index.js +++ b/config/index.js @@ -69,7 +69,7 @@ }, "/IotPc": { // 物联网平台端信息汇总 - 'target': 'http://192.168.16.100:8861', // 接口域名 + target: "http://192.168.16.100:8861", // 接口域名 // target: "http://132.232.115.20:8289", // 接口域名 changeOrigin: true, //是否跨域 pathRewrite: { @@ -87,7 +87,7 @@ }, // Various Dev Server settings - host: "localhost", // can be overwritten by process.env.HOST + host: "192.168.16.109", // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/config/index.js b/config/index.js index 460d843..2a40e5e 100644 --- a/config/index.js +++ b/config/index.js @@ -69,7 +69,7 @@ }, "/IotPc": { // 物联网平台端信息汇总 - 'target': 'http://192.168.16.100:8861', // 接口域名 + target: "http://192.168.16.100:8861", // 接口域名 // target: "http://132.232.115.20:8289", // 接口域名 changeOrigin: true, //是否跨域 pathRewrite: { @@ -87,7 +87,7 @@ }, // Various Dev Server settings - host: "localhost", // can be overwritten by process.env.HOST + host: "192.168.16.109", // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/assets/css/common.css b/src/assets/css/common.css index e1b0809..b8ed1f9 100644 --- a/src/assets/css/common.css +++ b/src/assets/css/common.css @@ -15,7 +15,7 @@ /*滚动条整体样式*/ width: 3px; /*高宽分别对应横竖滚动条的尺寸*/ - height: 3px; + height: 5px; } ::-webkit-scrollbar-thumb { diff --git a/config/index.js b/config/index.js index 460d843..2a40e5e 100644 --- a/config/index.js +++ b/config/index.js @@ -69,7 +69,7 @@ }, "/IotPc": { // 物联网平台端信息汇总 - 'target': 'http://192.168.16.100:8861', // 接口域名 + target: "http://192.168.16.100:8861", // 接口域名 // target: "http://132.232.115.20:8289", // 接口域名 changeOrigin: true, //是否跨域 pathRewrite: { @@ -87,7 +87,7 @@ }, // Various Dev Server settings - host: "localhost", // can be overwritten by process.env.HOST + host: "192.168.16.109", // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/assets/css/common.css b/src/assets/css/common.css index e1b0809..b8ed1f9 100644 --- a/src/assets/css/common.css +++ b/src/assets/css/common.css @@ -15,7 +15,7 @@ /*滚动条整体样式*/ width: 3px; /*高宽分别对应横竖滚动条的尺寸*/ - height: 3px; + height: 5px; } ::-webkit-scrollbar-thumb { diff --git a/src/components/ServiceWatch/components/applied.vue b/src/components/ServiceWatch/components/applied.vue index b7d5c0e..95e6f3d 100644 --- a/src/components/ServiceWatch/components/applied.vue +++ b/src/components/ServiceWatch/components/applied.vue @@ -288,7 +288,7 @@ } .apply-chart { flex: 1; - // width: 400px; + overflow: hidden; } .describe { width: 50px; diff --git a/config/index.js b/config/index.js index 460d843..2a40e5e 100644 --- a/config/index.js +++ b/config/index.js @@ -69,7 +69,7 @@ }, "/IotPc": { // 物联网平台端信息汇总 - 'target': 'http://192.168.16.100:8861', // 接口域名 + target: "http://192.168.16.100:8861", // 接口域名 // target: "http://132.232.115.20:8289", // 接口域名 changeOrigin: true, //是否跨域 pathRewrite: { @@ -87,7 +87,7 @@ }, // Various Dev Server settings - host: "localhost", // can be overwritten by process.env.HOST + host: "192.168.16.109", // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/assets/css/common.css b/src/assets/css/common.css index e1b0809..b8ed1f9 100644 --- a/src/assets/css/common.css +++ b/src/assets/css/common.css @@ -15,7 +15,7 @@ /*滚动条整体样式*/ width: 3px; /*高宽分别对应横竖滚动条的尺寸*/ - height: 3px; + height: 5px; } ::-webkit-scrollbar-thumb { diff --git a/src/components/ServiceWatch/components/applied.vue b/src/components/ServiceWatch/components/applied.vue index b7d5c0e..95e6f3d 100644 --- a/src/components/ServiceWatch/components/applied.vue +++ b/src/components/ServiceWatch/components/applied.vue @@ -288,7 +288,7 @@ } .apply-chart { flex: 1; - // width: 400px; + overflow: hidden; } .describe { width: 50px; diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue index 6613471..f3357c6 100644 --- a/src/components/site/previewOfSiteStatus.vue +++ b/src/components/site/previewOfSiteStatus.vue @@ -36,136 +36,137 @@ - -
-
- - 项目选择 -
-
- -
- +
+ +
+
历史搜索
+
+ + {{ item }} + +
+
- -
-
历史搜索
-
+
+ +
+
+ + 站点统计 +
{{ item.name }} - {{ item }} -
-
-
- -
-
- - 站点统计 -
- {{ item.name }} -
-
-
-
-

平台站点（个）

-
-
- - -
- - 总数 +
+
+

平台站点（个）

+
+
+ + +
+ + 总数 +
-
-
- -
- - 在线 +
+ +
+ + 在线 +
-
-
- -
- - 离线 +
+ +
+ + 离线 +
-
- -
-
- -
-
- - 项目站点覆盖排名 -
-
-
    -
  • - {{ item.RegionName }} -
    -
    -
    - - {{ item.RegionNum }} - 个 - -
    • -
-
-
- -
-
- - 项目设备总览 -
-
-
-
-
-
-

{{ XianYou }}

-

- - 现有设备 -

-
-
-

{{ DaJian }}

-

- - 搭建设备 -

-
-
-
-
-
- - 项目设备环比增长 -
-
-
-
-
-
-
- - 站点实时报警 -
-
-
-
- 暂无报警数据 -
+
+
+ + 项目站点覆盖排名 +
+
+
    +
  • - - {{ item.createTime }} - {{ item.siteName }} {{ item.warnTypeDesc }}{{ item.RegionName }} +
    +
    +
    + + {{ item.RegionNum }} + 个 + +
    • +
+
+
+
+
+ +
+
+ + 项目设备总览 +
+
+
+
+
+
+

+ {{ XianYou }} +

+

+ + 现有设备 +

+
+
+

{{ DaJian }}

+

+ + 搭建设备 +

+
+
+
+ + 项目设备环比增长 +
+
+
+
+
+
+
+ + 站点实时报警 +
+
+
+
+ 暂无报警数据 +
+ +
+ {{ + item.createTime + }} + {{ + item.siteName + }} + {{ item.warnTypeDesc }} +
+ +
+
+
+
+ +
@@ -491,7 +516,7 @@ }); this.namelist[index].select = true; - // console.log(this.platformtype, this.ChecksplatformCode); + console.log(this.platformtype, this.ChecksplatformCode); this.platformtype = item.type; this.$http @@ -1133,7 +1158,7 @@ this.loadQuyuPaiMing(); this.$nextTick(function() { - this.timer = setInterval(this.ScrollUp, 50); + this.timer = setInterval(this.ScrollUp, 100); }); // 默认从本地session srotage里面读取历史搜索记录ZZJ this.getItem(); @@ -1158,56 +1183,60 @@ position: relative; } #previewOfSiteStatusLeftTop { - position: absolute; - left: 0; + /* position: absolute; */ + /* left: 0; */ width: 350px; height: 290px; - top: 0px; + /* top: 0px; */ background: rgba(0, 0, 0, 0.5); z-index: 100; } #previewOfSiteStatusLeftcenter { - position: absolute; - left: 0; + position: relative; + /* left: 0; */ width: 350px; - height: 290px; - top: 305px; + height: 220px; + margin-top: 15px; + /* top: 305px; */ background: rgba(0, 0, 0, 0.5); z-index: 100; } #previewOfSiteStatusLeftBottom { - position: absolute; - left: 0; + /* position: absolute; */ + /* left: 0; */ width: 350px; height: 290px; - top: 610px; + margin-top: 15px; + /* top: 610px; */ background: rgba(0, 0, 0, 0.5); z-index: 100; } #previewOfSiteStatusRightTop { - position: absolute; - right: 0; + /* position: absolute; */ + /* right: 0; */ width: 350px; height: 290px; - top: 0px; + /* top: 0px; */ background: rgba(0, 0, 0, 0.5); z-index: 100; } #previewOfSiteStatusRightcenter { - position: absolute; - right: 0; + /* position: absolute; */ + /* right: 0; */ width: 350px; - height: 290px; - top: 305px; + height: 220px; + /* top: 305px; */ + margin-top: 15px; background: rgba(0, 0, 0, 0.5); z-index: 100; } #previewOfSiteStatusRightBottom { - position: absolute; - right: 0; + /* position: absolute; */ + /* right: 0; */ width: 350px; height: 290px; - top: 610px; + /* top: 540px; */ + margin-top: 15px; background: rgba(0, 0, 0, 0.5); z-index: 100; } @@ -1313,22 +1342,28 @@ .previewButton .previewHistory { display: flex; flex-wrap: wrap; - width: 100%; + /* width: 100%; */ + margin: 0 3%; + justify-content: space-between; } .previewButton .previewHistory .previewtext { cursor: pointer; width: 48%; - height: 0.213333rem; + /* height: 0.213333rem; */ margin-top: 0.1125rem; - line-height: 0.213333rem; - font-size: 0.093333rem; + /* margin-left: 2%; */ + /* line-height: 0.213333rem; */ + line-height: 24px; + /* font-size: 0.093333rem; */ + font-size: 12px; text-align: center; border: 1px solid var(--eldatebefore); color: #fff; background: var(--pretextbg); } .previewButton .previewHistory .previewtext:nth-child(2n) { - margin-left: 0.08rem; + /* margin-left: 0.08rem; */ + /* margin-right: 2%; */ } /* 项目选择A */ @@ -1666,4 +1701,20 @@ .actionList { display: none; } +.boxmain, +.boxmainR { + position: absolute; + top: 0; + bottom: 0; + width: 350px; + overflow-x: hidden; + overflow-y: auto; + z-index: 100; +} +.boxmain { + left: 0; +} +.boxmainR { + right: 0; +} diff --git a/config/index.js b/config/index.js index 460d843..2a40e5e 100644 --- a/config/index.js +++ b/config/index.js @@ -69,7 +69,7 @@ }, "/IotPc": { // 物联网平台端信息汇总 - 'target': 'http://192.168.16.100:8861', // 接口域名 + target: "http://192.168.16.100:8861", // 接口域名 // target: "http://132.232.115.20:8289", // 接口域名 changeOrigin: true, //是否跨域 pathRewrite: { @@ -87,7 +87,7 @@ }, // Various Dev Server settings - host: "localhost", // can be overwritten by process.env.HOST + host: "192.168.16.109", // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/assets/css/common.css b/src/assets/css/common.css index e1b0809..b8ed1f9 100644 --- a/src/assets/css/common.css +++ b/src/assets/css/common.css @@ -15,7 +15,7 @@ /*滚动条整体样式*/ width: 3px; /*高宽分别对应横竖滚动条的尺寸*/ - height: 3px; + height: 5px; } ::-webkit-scrollbar-thumb { diff --git a/src/components/ServiceWatch/components/applied.vue b/src/components/ServiceWatch/components/applied.vue index b7d5c0e..95e6f3d 100644 --- a/src/components/ServiceWatch/components/applied.vue +++ b/src/components/ServiceWatch/components/applied.vue @@ -288,7 +288,7 @@ } .apply-chart { flex: 1; - // width: 400px; + overflow: hidden; } .describe { width: 50px; diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue index 6613471..f3357c6 100644 --- a/src/components/site/previewOfSiteStatus.vue +++ b/src/components/site/previewOfSiteStatus.vue @@ -36,136 +36,137 @@
- -
-
- - 项目选择 -
-
- -
- +
+ +
+
历史搜索
+
+ + {{ item }} + +
+
- -
-
历史搜索
-
+
+ +
+
+ + 站点统计 +
{{ item.name }} - {{ item }} -
-
-
- -
-
- - 站点统计 -
- {{ item.name }} -
-
-
-
-

平台站点（个）

-
-
- - -
- - 总数 +
+
+

平台站点（个）

+
+
+ + +
+ + 总数 +
-
-
- -
- - 在线 +
+ +
+ + 在线 +
-
-
- -
- - 离线 +
+ +
+ + 离线 +
-
- -
-
- -
-
- - 项目站点覆盖排名 -
-
-
    -
  • - {{ item.RegionName }} -
    -
    -
    - - {{ item.RegionNum }} - 个 - -
    • -
-
-
- -
-
- - 项目设备总览 -
-
-
-
-
-
-

{{ XianYou }}

-

- - 现有设备 -

-
-
-

{{ DaJian }}

-

- - 搭建设备 -

-
-
-
-
-
- - 项目设备环比增长 -
-
-
-
-
-
-
- - 站点实时报警 -
-
-
-
- 暂无报警数据 -
+
+
+ + 项目站点覆盖排名 +
+
+
    +
  • - - {{ item.createTime }} - {{ item.siteName }} {{ item.warnTypeDesc }}{{ item.RegionName }} +
    +
    +
    + + {{ item.RegionNum }} + 个 + +
    • +
+
+
+
+
+ +
+
+ + 项目设备总览 +
+
+
+
+
+
+

+ {{ XianYou }} +

+

+ + 现有设备 +

+
+
+

{{ DaJian }}

+

+ + 搭建设备 +

+
+
+
+ + 项目设备环比增长 +
+
+
+
+
+
+
+ + 站点实时报警 +
+
+
+
+ 暂无报警数据 +
+ +
+ {{ + item.createTime + }} + {{ + item.siteName + }} + {{ item.warnTypeDesc }} +
+ +
+
+
+
+ +
@@ -491,7 +516,7 @@ }); this.namelist[index].select = true; - // console.log(this.platformtype, this.ChecksplatformCode); + console.log(this.platformtype, this.ChecksplatformCode); this.platformtype = item.type; this.$http @@ -1133,7 +1158,7 @@ this.loadQuyuPaiMing(); this.$nextTick(function() { - this.timer = setInterval(this.ScrollUp, 50); + this.timer = setInterval(this.ScrollUp, 100); }); // 默认从本地session srotage里面读取历史搜索记录ZZJ this.getItem(); @@ -1158,56 +1183,60 @@ position: relative; } #previewOfSiteStatusLeftTop { - position: absolute; - left: 0; + /* position: absolute; */ + /* left: 0; */ width: 350px; height: 290px; - top: 0px; + /* top: 0px; */ background: rgba(0, 0, 0, 0.5); z-index: 100; } #previewOfSiteStatusLeftcenter { - position: absolute; - left: 0; + position: relative; + /* left: 0; */ width: 350px; - height: 290px; - top: 305px; + height: 220px; + margin-top: 15px; + /* top: 305px; */ background: rgba(0, 0, 0, 0.5); z-index: 100; } #previewOfSiteStatusLeftBottom { - position: absolute; - left: 0; + /* position: absolute; */ + /* left: 0; */ width: 350px; height: 290px; - top: 610px; + margin-top: 15px; + /* top: 610px; */ background: rgba(0, 0, 0, 0.5); z-index: 100; } #previewOfSiteStatusRightTop { - position: absolute; - right: 0; + /* position: absolute; */ + /* right: 0; */ width: 350px; height: 290px; - top: 0px; + /* top: 0px; */ background: rgba(0, 0, 0, 0.5); z-index: 100; } #previewOfSiteStatusRightcenter { - position: absolute; - right: 0; + /* position: absolute; */ + /* right: 0; */ width: 350px; - height: 290px; - top: 305px; + height: 220px; + /* top: 305px; */ + margin-top: 15px; background: rgba(0, 0, 0, 0.5); z-index: 100; } #previewOfSiteStatusRightBottom { - position: absolute; - right: 0; + /* position: absolute; */ + /* right: 0; */ width: 350px; height: 290px; - top: 610px; + /* top: 540px; */ + margin-top: 15px; background: rgba(0, 0, 0, 0.5); z-index: 100; } @@ -1313,22 +1342,28 @@ .previewButton .previewHistory { display: flex; flex-wrap: wrap; - width: 100%; + /* width: 100%; */ + margin: 0 3%; + justify-content: space-between; } .previewButton .previewHistory .previewtext { cursor: pointer; width: 48%; - height: 0.213333rem; + /* height: 0.213333rem; */ margin-top: 0.1125rem; - line-height: 0.213333rem; - font-size: 0.093333rem; + /* margin-left: 2%; */ + /* line-height: 0.213333rem; */ + line-height: 24px; + /* font-size: 0.093333rem; */ + font-size: 12px; text-align: center; border: 1px solid var(--eldatebefore); color: #fff; background: var(--pretextbg); } .previewButton .previewHistory .previewtext:nth-child(2n) { - margin-left: 0.08rem; + /* margin-left: 0.08rem; */ + /* margin-right: 2%; */ } /* 项目选择A */ @@ -1666,4 +1701,20 @@ .actionList { display: none; } +.boxmain, +.boxmainR { + position: absolute; + top: 0; + bottom: 0; + width: 350px; + overflow-x: hidden; + overflow-y: auto; + z-index: 100; +} +.boxmain { + left: 0; +} +.boxmainR { + right: 0; +} diff --git a/src/components/sys/menu.vue b/src/components/sys/menu.vue index 73a4c97..c2d0518 100644 --- a/src/components/sys/menu.vue +++ b/src/components/sys/menu.vue @@ -68,7 +68,7 @@ {{ scope.row.perms }} - + - + + 重置密码 @@ -223,6 +223,25 @@ this.resetForm(); this.dialogInfo.btLoading = false; } + }, + "dialogInfo.type"(val) { + let formInfo = this.formInfo; + switch(val) { + case "update": + for(let item of formInfo.fieldList) { + if(item.value === "login") { + item.disabled = true; + } + } + break; + case "AddUser": + for(let item of formInfo.fieldList) { + if(item.value === "login") { + item.disabled = false; + } + } + break; + } } }, methods: { diff --git a/config/index.js b/config/index.js index 460d843..2a40e5e 100644 --- a/config/index.js +++ b/config/index.js @@ -69,7 +69,7 @@ }, "/IotPc": { // 物联网平台端信息汇总 - 'target': 'http://192.168.16.100:8861', // 接口域名 + target: "http://192.168.16.100:8861", // 接口域名 // target: "http://132.232.115.20:8289", // 接口域名 changeOrigin: true, //是否跨域 pathRewrite: { @@ -87,7 +87,7 @@ }, // Various Dev Server settings - host: "localhost", // can be overwritten by process.env.HOST + host: "192.168.16.109", // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/assets/css/common.css b/src/assets/css/common.css index e1b0809..b8ed1f9 100644 --- a/src/assets/css/common.css +++ b/src/assets/css/common.css @@ -15,7 +15,7 @@ /*滚动条整体样式*/ width: 3px; /*高宽分别对应横竖滚动条的尺寸*/ - height: 3px; + height: 5px; } ::-webkit-scrollbar-thumb { diff --git a/src/components/ServiceWatch/components/applied.vue b/src/components/ServiceWatch/components/applied.vue index b7d5c0e..95e6f3d 100644 --- a/src/components/ServiceWatch/components/applied.vue +++ b/src/components/ServiceWatch/components/applied.vue @@ -288,7 +288,7 @@ } .apply-chart { flex: 1; - // width: 400px; + overflow: hidden; } .describe { width: 50px; diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue index 6613471..f3357c6 100644 --- a/src/components/site/previewOfSiteStatus.vue +++ b/src/components/site/previewOfSiteStatus.vue @@ -36,136 +36,137 @@
- -
-
- - 项目选择 -
-
- -
- +
+ +
+
历史搜索
+
+ + {{ item }} + +
+
- -
-
历史搜索
-
+
+ +
+
+ + 站点统计 +
{{ item.name }} - {{ item }} -
-
-
- -
-
- - 站点统计 -
- {{ item.name }} -
-
-
-
-

平台站点（个）

-
-
- - -
- - 总数 +
+
+

平台站点（个）

+
+
+ + +
+ + 总数 +
-
-
- -
- - 在线 +
+ +
+ + 在线 +
-
-
- -
- - 离线 +
+ +
+ + 离线 +
-
- -
-
- -
-
- - 项目站点覆盖排名 -
-
-
    -
  • - {{ item.RegionName }} -
    -
    -
    - - {{ item.RegionNum }} - 个 - -
    • -
-
-
- -
-
- - 项目设备总览 -
-
-
-
-
-
-

{{ XianYou }}

-

- - 现有设备 -

-
-
-

{{ DaJian }}

-

- - 搭建设备 -

-
-
-
-
-
- - 项目设备环比增长 -
-
-
-
-
-
-
- - 站点实时报警 -
-
-
-
- 暂无报警数据 -
+
+
+ + 项目站点覆盖排名 +
+
+
    +
  • - - {{ item.createTime }} - {{ item.siteName }} {{ item.warnTypeDesc }}{{ item.RegionName }} +
    +
    +
    + + {{ item.RegionNum }} + 个 + +
    • +
+
+
+
+
+ +
+
+ + 项目设备总览 +
+
+
+
+
+
+

+ {{ XianYou }} +

+

+ + 现有设备 +

+
+
+

{{ DaJian }}

+

+ + 搭建设备 +

+
+
+
+ + 项目设备环比增长 +
+
+
+
+
+
+
+ + 站点实时报警 +
+
+
+
+ 暂无报警数据 +
+ +
+ {{ + item.createTime + }} + {{ + item.siteName + }} + {{ item.warnTypeDesc }} +
+ +
+
+
+
+ +
@@ -491,7 +516,7 @@ }); this.namelist[index].select = true; - // console.log(this.platformtype, this.ChecksplatformCode); + console.log(this.platformtype, this.ChecksplatformCode); this.platformtype = item.type; this.$http @@ -1133,7 +1158,7 @@ this.loadQuyuPaiMing(); this.$nextTick(function() { - this.timer = setInterval(this.ScrollUp, 50); + this.timer = setInterval(this.ScrollUp, 100); }); // 默认从本地session srotage里面读取历史搜索记录ZZJ this.getItem(); @@ -1158,56 +1183,60 @@ position: relative; } #previewOfSiteStatusLeftTop { - position: absolute; - left: 0; + /* position: absolute; */ + /* left: 0; */ width: 350px; height: 290px; - top: 0px; + /* top: 0px; */ background: rgba(0, 0, 0, 0.5); z-index: 100; } #previewOfSiteStatusLeftcenter { - position: absolute; - left: 0; + position: relative; + /* left: 0; */ width: 350px; - height: 290px; - top: 305px; + height: 220px; + margin-top: 15px; + /* top: 305px; */ background: rgba(0, 0, 0, 0.5); z-index: 100; } #previewOfSiteStatusLeftBottom { - position: absolute; - left: 0; + /* position: absolute; */ + /* left: 0; */ width: 350px; height: 290px; - top: 610px; + margin-top: 15px; + /* top: 610px; */ background: rgba(0, 0, 0, 0.5); z-index: 100; } #previewOfSiteStatusRightTop { - position: absolute; - right: 0; + /* position: absolute; */ + /* right: 0; */ width: 350px; height: 290px; - top: 0px; + /* top: 0px; */ background: rgba(0, 0, 0, 0.5); z-index: 100; } #previewOfSiteStatusRightcenter { - position: absolute; - right: 0; + /* position: absolute; */ + /* right: 0; */ width: 350px; - height: 290px; - top: 305px; + height: 220px; + /* top: 305px; */ + margin-top: 15px; background: rgba(0, 0, 0, 0.5); z-index: 100; } #previewOfSiteStatusRightBottom { - position: absolute; - right: 0; + /* position: absolute; */ + /* right: 0; */ width: 350px; height: 290px; - top: 610px; + /* top: 540px; */ + margin-top: 15px; background: rgba(0, 0, 0, 0.5); z-index: 100; } @@ -1313,22 +1342,28 @@ .previewButton .previewHistory { display: flex; flex-wrap: wrap; - width: 100%; + /* width: 100%; */ + margin: 0 3%; + justify-content: space-between; } .previewButton .previewHistory .previewtext { cursor: pointer; width: 48%; - height: 0.213333rem; + /* height: 0.213333rem; */ margin-top: 0.1125rem; - line-height: 0.213333rem; - font-size: 0.093333rem; + /* margin-left: 2%; */ + /* line-height: 0.213333rem; */ + line-height: 24px; + /* font-size: 0.093333rem; */ + font-size: 12px; text-align: center; border: 1px solid var(--eldatebefore); color: #fff; background: var(--pretextbg); } .previewButton .previewHistory .previewtext:nth-child(2n) { - margin-left: 0.08rem; + /* margin-left: 0.08rem; */ + /* margin-right: 2%; */ } /* 项目选择A */ @@ -1666,4 +1701,20 @@ .actionList { display: none; } +.boxmain, +.boxmainR { + position: absolute; + top: 0; + bottom: 0; + width: 350px; + overflow-x: hidden; + overflow-y: auto; + z-index: 100; +} +.boxmain { + left: 0; +} +.boxmainR { + right: 0; +} diff --git a/src/components/sys/menu.vue b/src/components/sys/menu.vue index 73a4c97..c2d0518 100644 --- a/src/components/sys/menu.vue +++ b/src/components/sys/menu.vue @@ -68,7 +68,7 @@ {{ scope.row.perms }} - + + 重置密码 @@ -223,6 +223,25 @@ this.resetForm(); this.dialogInfo.btLoading = false; } + }, + "dialogInfo.type"(val) { + let formInfo = this.formInfo; + switch(val) { + case "update": + for(let item of formInfo.fieldList) { + if(item.value === "login") { + item.disabled = true; + } + } + break; + case "AddUser": + for(let item of formInfo.fieldList) { + if(item.value === "login") { + item.disabled = false; + } + } + break; + } } }, methods: { diff --git a/src/router/index.js b/src/router/index.js index 72fad6f..b540275 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -200,13 +200,13 @@ name: "login", component: resolve => require(["@/components/login"], resolve) }, - { - path: "/", - redirect: "/Login" - }, + // { + // path: "/", + // redirect: "/Login" + // }, { path: "*", - redirect: "/" + redirect: "/index" } ] }); @@ -236,7 +236,7 @@ message({ data: { code: 1, - message: "登录已过期,请重新登录!" + msg: "请先登录在进行操作!" } }); next(`/Login`);