diff --git a/config/index.js b/config/index.js
index 7e47eae..1bb3a4b 100644
--- a/config/index.js
+++ b/config/index.js
@@ -32,14 +32,14 @@
}
},
"/groupApi": {
- target: "http://192.168.16.166:8282", //陆展
+ target: "http://192.168.30.199:8282", //陆展
changeOrigin: true, //是否跨域
pathRewrite: {
"^/groupApi": "" //需要rewrite重写的,
}
},
"/projectApi": {
- target: "http://192.168.16.166:7099", //陆展
+ target: "http://192.168.30.199:7099", //陆展
changeOrigin: true, //是否跨域
pathRewrite: {
"^/projectApi": "" //需要rewrite重写的,
@@ -88,7 +88,7 @@
// Various Dev Server settings
host: "localhost" , // can be overwritten by process.env.HOST
- port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+ port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
notifyOnErrors: true,
diff --git a/config/index.js b/config/index.js
index 7e47eae..1bb3a4b 100644
--- a/config/index.js
+++ b/config/index.js
@@ -32,14 +32,14 @@
}
},
"/groupApi": {
- target: "http://192.168.16.166:8282", //陆展
+ target: "http://192.168.30.199:8282", //陆展
changeOrigin: true, //是否跨域
pathRewrite: {
"^/groupApi": "" //需要rewrite重写的,
}
},
"/projectApi": {
- target: "http://192.168.16.166:7099", //陆展
+ target: "http://192.168.30.199:7099", //陆展
changeOrigin: true, //是否跨域
pathRewrite: {
"^/projectApi": "" //需要rewrite重写的,
@@ -88,7 +88,7 @@
// Various Dev Server settings
host: "localhost" , // can be overwritten by process.env.HOST
- port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+ port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
notifyOnErrors: true,
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b8ed1f9..7599362 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -87,6 +87,22 @@
color: #409EFF;
cursor: pointer;
}
+.table-status{
+ color: #409EFF;
+}
+.table-status.red{
+ color: #e52027;
+}
+.table-status.yellow{
+ color: #f19c33;
+}
+.noData{
+ display: flex;
+ width: 100%;
+ height: 100%;
+ justify-content: center;
+ align-items: center;
+}
.page-data {
display: flex;
flex-direction: column;
diff --git a/config/index.js b/config/index.js
index 7e47eae..1bb3a4b 100644
--- a/config/index.js
+++ b/config/index.js
@@ -32,14 +32,14 @@
}
},
"/groupApi": {
- target: "http://192.168.16.166:8282", //陆展
+ target: "http://192.168.30.199:8282", //陆展
changeOrigin: true, //是否跨域
pathRewrite: {
"^/groupApi": "" //需要rewrite重写的,
}
},
"/projectApi": {
- target: "http://192.168.16.166:7099", //陆展
+ target: "http://192.168.30.199:7099", //陆展
changeOrigin: true, //是否跨域
pathRewrite: {
"^/projectApi": "" //需要rewrite重写的,
@@ -88,7 +88,7 @@
// Various Dev Server settings
host: "localhost" , // can be overwritten by process.env.HOST
- port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+ port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
notifyOnErrors: true,
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b8ed1f9..7599362 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -87,6 +87,22 @@
color: #409EFF;
cursor: pointer;
}
+.table-status{
+ color: #409EFF;
+}
+.table-status.red{
+ color: #e52027;
+}
+.table-status.yellow{
+ color: #f19c33;
+}
+.noData{
+ display: flex;
+ width: 100%;
+ height: 100%;
+ justify-content: center;
+ align-items: center;
+}
.page-data {
display: flex;
flex-direction: column;
diff --git a/src/components/ServiceWatch/components/applied.vue b/src/components/ServiceWatch/components/applied.vue
index a6ceef8..5fb022b 100644
--- a/src/components/ServiceWatch/components/applied.vue
+++ b/src/components/ServiceWatch/components/applied.vue
@@ -13,7 +13,13 @@
:field-list="tableInfo.fieldList"
:handle="tableInfo.handle"
@handleClick="handleClick"
- />
+ >
+
+
+ {{ scope.row.status === 2 ? "监控异常" : scope.row.status === 1 ? "停止" : "正常"}}
+
+
+
-
+
@@ -99,7 +106,7 @@
{ label: "路径", value: "homePath", minWidth: 150, tooltip: true },
{ label: "进程号", value: "pid", width: 120 },
{ label: "端口", value: "port", width: 80 },
- { label: "状态", value: "status", width: 80, list: "statusList" },
+ { label: "状态", value: "status", width: 80, type: "slot"},
{
label: "更新时间",
value: "updateTime",
@@ -288,8 +295,8 @@
border-top: 1px solid rgb(58, 58, 60);
}
.apply-chart {
- flex: 1;
- overflow: hidden;
+ width: calc(100% - 50px);
+ height: 100px;
}
.describe {
width: 50px;
@@ -300,4 +307,7 @@
/deep/ .el-input__inner {
color: #999 !important;
}
+/deep/ .el-dialog__body{
+ height: calc(100% - 116px) !important;
+}
diff --git a/config/index.js b/config/index.js
index 7e47eae..1bb3a4b 100644
--- a/config/index.js
+++ b/config/index.js
@@ -32,14 +32,14 @@
}
},
"/groupApi": {
- target: "http://192.168.16.166:8282", //陆展
+ target: "http://192.168.30.199:8282", //陆展
changeOrigin: true, //是否跨域
pathRewrite: {
"^/groupApi": "" //需要rewrite重写的,
}
},
"/projectApi": {
- target: "http://192.168.16.166:7099", //陆展
+ target: "http://192.168.30.199:7099", //陆展
changeOrigin: true, //是否跨域
pathRewrite: {
"^/projectApi": "" //需要rewrite重写的,
@@ -88,7 +88,7 @@
// Various Dev Server settings
host: "localhost" , // can be overwritten by process.env.HOST
- port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+ port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
notifyOnErrors: true,
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b8ed1f9..7599362 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -87,6 +87,22 @@
color: #409EFF;
cursor: pointer;
}
+.table-status{
+ color: #409EFF;
+}
+.table-status.red{
+ color: #e52027;
+}
+.table-status.yellow{
+ color: #f19c33;
+}
+.noData{
+ display: flex;
+ width: 100%;
+ height: 100%;
+ justify-content: center;
+ align-items: center;
+}
.page-data {
display: flex;
flex-direction: column;
diff --git a/src/components/ServiceWatch/components/applied.vue b/src/components/ServiceWatch/components/applied.vue
index a6ceef8..5fb022b 100644
--- a/src/components/ServiceWatch/components/applied.vue
+++ b/src/components/ServiceWatch/components/applied.vue
@@ -13,7 +13,13 @@
:field-list="tableInfo.fieldList"
:handle="tableInfo.handle"
@handleClick="handleClick"
- />
+ >
+
+
+ {{ scope.row.status === 2 ? "监控异常" : scope.row.status === 1 ? "停止" : "正常"}}
+
+
+
-
+
@@ -99,7 +106,7 @@
{ label: "路径", value: "homePath", minWidth: 150, tooltip: true },
{ label: "进程号", value: "pid", width: 120 },
{ label: "端口", value: "port", width: 80 },
- { label: "状态", value: "status", width: 80, list: "statusList" },
+ { label: "状态", value: "status", width: 80, type: "slot"},
{
label: "更新时间",
value: "updateTime",
@@ -288,8 +295,8 @@
border-top: 1px solid rgb(58, 58, 60);
}
.apply-chart {
- flex: 1;
- overflow: hidden;
+ width: calc(100% - 50px);
+ height: 100px;
}
.describe {
width: 50px;
@@ -300,4 +307,7 @@
/deep/ .el-input__inner {
color: #999 !important;
}
+/deep/ .el-dialog__body{
+ height: calc(100% - 116px) !important;
+}
diff --git a/src/components/ServiceWatch/components/monitor.vue b/src/components/ServiceWatch/components/monitor.vue
index d57dc9a..1c8d54a 100644
--- a/src/components/ServiceWatch/components/monitor.vue
+++ b/src/components/ServiceWatch/components/monitor.vue
@@ -869,6 +869,8 @@
height: 78px;
width: 10%;
padding: 10px;
+ min-width: 160px;
+ text-align: center;
}
.choice {
text-align: left;
diff --git a/config/index.js b/config/index.js
index 7e47eae..1bb3a4b 100644
--- a/config/index.js
+++ b/config/index.js
@@ -32,14 +32,14 @@
}
},
"/groupApi": {
- target: "http://192.168.16.166:8282", //陆展
+ target: "http://192.168.30.199:8282", //陆展
changeOrigin: true, //是否跨域
pathRewrite: {
"^/groupApi": "" //需要rewrite重写的,
}
},
"/projectApi": {
- target: "http://192.168.16.166:7099", //陆展
+ target: "http://192.168.30.199:7099", //陆展
changeOrigin: true, //是否跨域
pathRewrite: {
"^/projectApi": "" //需要rewrite重写的,
@@ -88,7 +88,7 @@
// Various Dev Server settings
host: "localhost" , // can be overwritten by process.env.HOST
- port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+ port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
notifyOnErrors: true,
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b8ed1f9..7599362 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -87,6 +87,22 @@
color: #409EFF;
cursor: pointer;
}
+.table-status{
+ color: #409EFF;
+}
+.table-status.red{
+ color: #e52027;
+}
+.table-status.yellow{
+ color: #f19c33;
+}
+.noData{
+ display: flex;
+ width: 100%;
+ height: 100%;
+ justify-content: center;
+ align-items: center;
+}
.page-data {
display: flex;
flex-direction: column;
diff --git a/src/components/ServiceWatch/components/applied.vue b/src/components/ServiceWatch/components/applied.vue
index a6ceef8..5fb022b 100644
--- a/src/components/ServiceWatch/components/applied.vue
+++ b/src/components/ServiceWatch/components/applied.vue
@@ -13,7 +13,13 @@
:field-list="tableInfo.fieldList"
:handle="tableInfo.handle"
@handleClick="handleClick"
- />
+ >
+
+
+ {{ scope.row.status === 2 ? "监控异常" : scope.row.status === 1 ? "停止" : "正常"}}
+
+
+
-
+
@@ -99,7 +106,7 @@
{ label: "路径", value: "homePath", minWidth: 150, tooltip: true },
{ label: "进程号", value: "pid", width: 120 },
{ label: "端口", value: "port", width: 80 },
- { label: "状态", value: "status", width: 80, list: "statusList" },
+ { label: "状态", value: "status", width: 80, type: "slot"},
{
label: "更新时间",
value: "updateTime",
@@ -288,8 +295,8 @@
border-top: 1px solid rgb(58, 58, 60);
}
.apply-chart {
- flex: 1;
- overflow: hidden;
+ width: calc(100% - 50px);
+ height: 100px;
}
.describe {
width: 50px;
@@ -300,4 +307,7 @@
/deep/ .el-input__inner {
color: #999 !important;
}
+/deep/ .el-dialog__body{
+ height: calc(100% - 116px) !important;
+}
diff --git a/src/components/ServiceWatch/components/monitor.vue b/src/components/ServiceWatch/components/monitor.vue
index d57dc9a..1c8d54a 100644
--- a/src/components/ServiceWatch/components/monitor.vue
+++ b/src/components/ServiceWatch/components/monitor.vue
@@ -869,6 +869,8 @@
height: 78px;
width: 10%;
padding: 10px;
+ min-width: 160px;
+ text-align: center;
}
.choice {
text-align: left;
diff --git a/src/components/newFiber/NewFiberSearch.vue b/src/components/newFiber/NewFiberSearch.vue
index a1cb086..f6684b6 100644
--- a/src/components/newFiber/NewFiberSearch.vue
+++ b/src/components/newFiber/NewFiberSearch.vue
@@ -1330,6 +1330,7 @@
color: var(--xfcxcolor);
text-align: left;
padding-top: 5px;
+ padding-bottom: 5px;
cursor: pointer;
background: var(--xfcxmegbgc);
&:not(:last-child) {
diff --git a/config/index.js b/config/index.js
index 7e47eae..1bb3a4b 100644
--- a/config/index.js
+++ b/config/index.js
@@ -32,14 +32,14 @@
}
},
"/groupApi": {
- target: "http://192.168.16.166:8282", //陆展
+ target: "http://192.168.30.199:8282", //陆展
changeOrigin: true, //是否跨域
pathRewrite: {
"^/groupApi": "" //需要rewrite重写的,
}
},
"/projectApi": {
- target: "http://192.168.16.166:7099", //陆展
+ target: "http://192.168.30.199:7099", //陆展
changeOrigin: true, //是否跨域
pathRewrite: {
"^/projectApi": "" //需要rewrite重写的,
@@ -88,7 +88,7 @@
// Various Dev Server settings
host: "localhost" , // can be overwritten by process.env.HOST
- port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+ port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
notifyOnErrors: true,
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b8ed1f9..7599362 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -87,6 +87,22 @@
color: #409EFF;
cursor: pointer;
}
+.table-status{
+ color: #409EFF;
+}
+.table-status.red{
+ color: #e52027;
+}
+.table-status.yellow{
+ color: #f19c33;
+}
+.noData{
+ display: flex;
+ width: 100%;
+ height: 100%;
+ justify-content: center;
+ align-items: center;
+}
.page-data {
display: flex;
flex-direction: column;
diff --git a/src/components/ServiceWatch/components/applied.vue b/src/components/ServiceWatch/components/applied.vue
index a6ceef8..5fb022b 100644
--- a/src/components/ServiceWatch/components/applied.vue
+++ b/src/components/ServiceWatch/components/applied.vue
@@ -13,7 +13,13 @@
:field-list="tableInfo.fieldList"
:handle="tableInfo.handle"
@handleClick="handleClick"
- />
+ >
+
+
+ {{ scope.row.status === 2 ? "监控异常" : scope.row.status === 1 ? "停止" : "正常"}}
+
+
+
-
+
@@ -99,7 +106,7 @@
{ label: "路径", value: "homePath", minWidth: 150, tooltip: true },
{ label: "进程号", value: "pid", width: 120 },
{ label: "端口", value: "port", width: 80 },
- { label: "状态", value: "status", width: 80, list: "statusList" },
+ { label: "状态", value: "status", width: 80, type: "slot"},
{
label: "更新时间",
value: "updateTime",
@@ -288,8 +295,8 @@
border-top: 1px solid rgb(58, 58, 60);
}
.apply-chart {
- flex: 1;
- overflow: hidden;
+ width: calc(100% - 50px);
+ height: 100px;
}
.describe {
width: 50px;
@@ -300,4 +307,7 @@
/deep/ .el-input__inner {
color: #999 !important;
}
+/deep/ .el-dialog__body{
+ height: calc(100% - 116px) !important;
+}
diff --git a/src/components/ServiceWatch/components/monitor.vue b/src/components/ServiceWatch/components/monitor.vue
index d57dc9a..1c8d54a 100644
--- a/src/components/ServiceWatch/components/monitor.vue
+++ b/src/components/ServiceWatch/components/monitor.vue
@@ -869,6 +869,8 @@
height: 78px;
width: 10%;
padding: 10px;
+ min-width: 160px;
+ text-align: center;
}
.choice {
text-align: left;
diff --git a/src/components/newFiber/NewFiberSearch.vue b/src/components/newFiber/NewFiberSearch.vue
index a1cb086..f6684b6 100644
--- a/src/components/newFiber/NewFiberSearch.vue
+++ b/src/components/newFiber/NewFiberSearch.vue
@@ -1330,6 +1330,7 @@
color: var(--xfcxcolor);
text-align: left;
padding-top: 5px;
+ padding-bottom: 5px;
cursor: pointer;
background: var(--xfcxmegbgc);
&:not(:last-child) {
diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index 76b9f0c..971875d 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -1123,6 +1123,7 @@
return;
}
let d = res;
+ console.log(33333);
_this.$http
.post(_this.nozzle.getTempData, {
data: {
diff --git a/config/index.js b/config/index.js
index 7e47eae..1bb3a4b 100644
--- a/config/index.js
+++ b/config/index.js
@@ -32,14 +32,14 @@
}
},
"/groupApi": {
- target: "http://192.168.16.166:8282", //陆展
+ target: "http://192.168.30.199:8282", //陆展
changeOrigin: true, //是否跨域
pathRewrite: {
"^/groupApi": "" //需要rewrite重写的,
}
},
"/projectApi": {
- target: "http://192.168.16.166:7099", //陆展
+ target: "http://192.168.30.199:7099", //陆展
changeOrigin: true, //是否跨域
pathRewrite: {
"^/projectApi": "" //需要rewrite重写的,
@@ -88,7 +88,7 @@
// Various Dev Server settings
host: "localhost" , // can be overwritten by process.env.HOST
- port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+ port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
notifyOnErrors: true,
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b8ed1f9..7599362 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -87,6 +87,22 @@
color: #409EFF;
cursor: pointer;
}
+.table-status{
+ color: #409EFF;
+}
+.table-status.red{
+ color: #e52027;
+}
+.table-status.yellow{
+ color: #f19c33;
+}
+.noData{
+ display: flex;
+ width: 100%;
+ height: 100%;
+ justify-content: center;
+ align-items: center;
+}
.page-data {
display: flex;
flex-direction: column;
diff --git a/src/components/ServiceWatch/components/applied.vue b/src/components/ServiceWatch/components/applied.vue
index a6ceef8..5fb022b 100644
--- a/src/components/ServiceWatch/components/applied.vue
+++ b/src/components/ServiceWatch/components/applied.vue
@@ -13,7 +13,13 @@
:field-list="tableInfo.fieldList"
:handle="tableInfo.handle"
@handleClick="handleClick"
- />
+ >
+
+
+ {{ scope.row.status === 2 ? "监控异常" : scope.row.status === 1 ? "停止" : "正常"}}
+
+
+
-
+
@@ -99,7 +106,7 @@
{ label: "路径", value: "homePath", minWidth: 150, tooltip: true },
{ label: "进程号", value: "pid", width: 120 },
{ label: "端口", value: "port", width: 80 },
- { label: "状态", value: "status", width: 80, list: "statusList" },
+ { label: "状态", value: "status", width: 80, type: "slot"},
{
label: "更新时间",
value: "updateTime",
@@ -288,8 +295,8 @@
border-top: 1px solid rgb(58, 58, 60);
}
.apply-chart {
- flex: 1;
- overflow: hidden;
+ width: calc(100% - 50px);
+ height: 100px;
}
.describe {
width: 50px;
@@ -300,4 +307,7 @@
/deep/ .el-input__inner {
color: #999 !important;
}
+/deep/ .el-dialog__body{
+ height: calc(100% - 116px) !important;
+}
diff --git a/src/components/ServiceWatch/components/monitor.vue b/src/components/ServiceWatch/components/monitor.vue
index d57dc9a..1c8d54a 100644
--- a/src/components/ServiceWatch/components/monitor.vue
+++ b/src/components/ServiceWatch/components/monitor.vue
@@ -869,6 +869,8 @@
height: 78px;
width: 10%;
padding: 10px;
+ min-width: 160px;
+ text-align: center;
}
.choice {
text-align: left;
diff --git a/src/components/newFiber/NewFiberSearch.vue b/src/components/newFiber/NewFiberSearch.vue
index a1cb086..f6684b6 100644
--- a/src/components/newFiber/NewFiberSearch.vue
+++ b/src/components/newFiber/NewFiberSearch.vue
@@ -1330,6 +1330,7 @@
color: var(--xfcxcolor);
text-align: left;
padding-top: 5px;
+ padding-bottom: 5px;
cursor: pointer;
background: var(--xfcxmegbgc);
&:not(:last-child) {
diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index 76b9f0c..971875d 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -1123,6 +1123,7 @@
return;
}
let d = res;
+ console.log(33333);
_this.$http
.post(_this.nozzle.getTempData, {
data: {
diff --git a/src/components/sys/user.vue b/src/components/sys/user.vue
index 896ba3f..b3ceab2 100644
--- a/src/components/sys/user.vue
+++ b/src/components/sys/user.vue
@@ -109,7 +109,7 @@
data() {
// 验证电话
let checkPhone = (rule, value, callback) => {
- let check = this.$validate({ label: "电话", value, rules: ["moblie"] });
+ let check = this.$validate({ label: "电话", value, rules: ["phone"] });
if (!check.result) {
callback(new Error(check.message));
} else {