diff --git a/config/index.js b/config/index.js index 3c07461..bc9f3c4 100644 --- a/config/index.js +++ b/config/index.js @@ -42,7 +42,7 @@ '/XY': { // 测试环境 // 'target': 'http://192.168.30.189:8800', // 接口域名 - 'target': 'http://192.168.30.59:7005', // 谢阳 + 'target': 'http://192.168.30.15:9200', // 谢阳 // 'target': 'http://192.168.30.30:8001/api', // 服务器接口 'changeOrigin': true, //是否跨域 'pathRewrite': { diff --git a/config/index.js b/config/index.js index 3c07461..bc9f3c4 100644 --- a/config/index.js +++ b/config/index.js @@ -42,7 +42,7 @@ '/XY': { // 测试环境 // 'target': 'http://192.168.30.189:8800', // 接口域名 - 'target': 'http://192.168.30.59:7005', // 谢阳 + 'target': 'http://192.168.30.15:9200', // 谢阳 // 'target': 'http://192.168.30.30:8001/api', // 服务器接口 'changeOrigin': true, //是否跨域 'pathRewrite': { diff --git a/src/components/configure/PatrolConfiguration.vue b/src/components/configure/PatrolConfiguration.vue index bdff98e..8f19af8 100644 --- a/src/components/configure/PatrolConfiguration.vue +++ b/src/components/configure/PatrolConfiguration.vue @@ -10,11 +10,101 @@ :value="item.platform_code" > + 新增配置 -
+
+ + + + + + + + + +
+ +
+ + 设备检测类（33%） + 分值 + +
+
+
{{item.Title}}
+
{{item.Value}}
+
+
+ + 人员打卡（33%） + 分值 + +
+
+
{{item.Title}}
+
{{item.Value}}
+
+
+ + 轨迹跟踪（33%） + 分值 + +
+
+
{{item.Title}}
+
{{item.Value}}
+
+ 途经点位预览 +
+
+ + +
+ 配置名称： + +
+
+
+
+
+ - + @@ -94,4 +284,122 @@ margin-top: 10px; background: rgba(53, 53, 53, 0.5); } +/* 详情弹窗 */ +#tablelist { + width: 100%; + height: auto; + max-height: 600px; + border: 1px solid rgba(255, 255, 255, 0.2); + box-sizing: border-box; + padding: 2px; + overflow: auto; +} +.DataTitle { + display: inline-block; + width: 100%; + text-align: left; + padding-left: 15px; + box-sizing: border-box; + color: aqua; + font-size: 16px; + height: 30px; + line-height: 30px; + position: relative; +} +.DataTitleFz { + position: absolute; + left: 225px; + font-size: 14px; +} +.Datalistbox { + display: inline-block; + width: 100%; + height: auto; + box-sizing: border-box; + border: 1px solid rgba(255, 255, 255, 0.2); +} +.Datalist { + width: 25%; + height: 30px; + line-height: 30px; + box-sizing: border-box; + border-right: 1px solid rgba(255, 255, 255, 0.2); + border-bottom: 1px solid rgba(255, 255, 255, 0.2); + float: left; +} +.DatalistTitle { + height: 100%; + width: 80%; + float: left; + text-align: left; + box-sizing: border-box; + padding-left: 5px; + color: white; +} +.DatalistNember { + height: 100%; + width: 20%; + float: left; + text-align: center; + color: aqua; +} +.TJD { + width: 100px; + height: 20px; + line-height: 20px; + background: rgb(64, 158, 255); + color: white; + margin-top: 5px; + float: left; + margin-left: 15px; + cursor: pointer; +} +/* 新增/修改 弹窗样式 */ +.SelectTitle2 { + display: inline-block; + margin-left: 5px; + text-align: center; + height: 40px; + line-height: 40px; + color: rgb(1, 109, 252); + font-size: 16px; + font-weight: 600; +} +#AddBox1 { + height: 60px; + width: 100%; + border-bottom: 1px solid rgba(255, 255, 255, 0.2); + display: inline-block; + text-align: left; + box-sizing: border-box; + padding: 10px; +} +#AddBox1 .el-input { + width: 200px; + margin: 0 10px; +} +#AddBox2 { + /* height: 40px; */ + width: 100%; + border-bottom: 1px solid rgba(255, 255, 255, 0.2); + display: inline-block; +} +#AddBox3 { + /* height: 40px; */ + width: 100%; + border-bottom: 1px solid rgba(255, 255, 255, 0.2); + display: inline-block; +} +#AddBox4 { + /* height: 40px; */ + width: 100%; + border-bottom: 1px solid rgba(255, 255, 255, 0.2); + display: inline-block; +} +#AddBox5 { + /* height: 40px; */ + width: 100%; + border-bottom: 1px solid rgba(255, 255, 255, 0.2); + display: inline-block; +} \ No newline at end of file diff --git a/config/index.js b/config/index.js index 3c07461..bc9f3c4 100644 --- a/config/index.js +++ b/config/index.js @@ -42,7 +42,7 @@ '/XY': { // 测试环境 // 'target': 'http://192.168.30.189:8800', // 接口域名 - 'target': 'http://192.168.30.59:7005', // 谢阳 + 'target': 'http://192.168.30.15:9200', // 谢阳 // 'target': 'http://192.168.30.30:8001/api', // 服务器接口 'changeOrigin': true, //是否跨域 'pathRewrite': { diff --git a/src/components/configure/PatrolConfiguration.vue b/src/components/configure/PatrolConfiguration.vue index bdff98e..8f19af8 100644 --- a/src/components/configure/PatrolConfiguration.vue +++ b/src/components/configure/PatrolConfiguration.vue @@ -10,11 +10,101 @@ :value="item.platform_code" > + 新增配置 -
+
+ + + + + + + + + +
+ +
+ + 设备检测类（33%） + 分值 + +
+
+
{{item.Title}}
+
{{item.Value}}
+
+
+ + 人员打卡（33%） + 分值 + +
+
+
{{item.Title}}
+
{{item.Value}}
+
+
+ + 轨迹跟踪（33%） + 分值 + +
+
+
{{item.Title}}
+
{{item.Value}}
+
+ 途经点位预览 +
+
+ + +
+ 配置名称： + +
+
+
+
+
+ - + @@ -94,4 +284,122 @@ margin-top: 10px; background: rgba(53, 53, 53, 0.5); } +/* 详情弹窗 */ +#tablelist { + width: 100%; + height: auto; + max-height: 600px; + border: 1px solid rgba(255, 255, 255, 0.2); + box-sizing: border-box; + padding: 2px; + overflow: auto; +} +.DataTitle { + display: inline-block; + width: 100%; + text-align: left; + padding-left: 15px; + box-sizing: border-box; + color: aqua; + font-size: 16px; + height: 30px; + line-height: 30px; + position: relative; +} +.DataTitleFz { + position: absolute; + left: 225px; + font-size: 14px; +} +.Datalistbox { + display: inline-block; + width: 100%; + height: auto; + box-sizing: border-box; + border: 1px solid rgba(255, 255, 255, 0.2); +} +.Datalist { + width: 25%; + height: 30px; + line-height: 30px; + box-sizing: border-box; + border-right: 1px solid rgba(255, 255, 255, 0.2); + border-bottom: 1px solid rgba(255, 255, 255, 0.2); + float: left; +} +.DatalistTitle { + height: 100%; + width: 80%; + float: left; + text-align: left; + box-sizing: border-box; + padding-left: 5px; + color: white; +} +.DatalistNember { + height: 100%; + width: 20%; + float: left; + text-align: center; + color: aqua; +} +.TJD { + width: 100px; + height: 20px; + line-height: 20px; + background: rgb(64, 158, 255); + color: white; + margin-top: 5px; + float: left; + margin-left: 15px; + cursor: pointer; +} +/* 新增/修改 弹窗样式 */ +.SelectTitle2 { + display: inline-block; + margin-left: 5px; + text-align: center; + height: 40px; + line-height: 40px; + color: rgb(1, 109, 252); + font-size: 16px; + font-weight: 600; +} +#AddBox1 { + height: 60px; + width: 100%; + border-bottom: 1px solid rgba(255, 255, 255, 0.2); + display: inline-block; + text-align: left; + box-sizing: border-box; + padding: 10px; +} +#AddBox1 .el-input { + width: 200px; + margin: 0 10px; +} +#AddBox2 { + /* height: 40px; */ + width: 100%; + border-bottom: 1px solid rgba(255, 255, 255, 0.2); + display: inline-block; +} +#AddBox3 { + /* height: 40px; */ + width: 100%; + border-bottom: 1px solid rgba(255, 255, 255, 0.2); + display: inline-block; +} +#AddBox4 { + /* height: 40px; */ + width: 100%; + border-bottom: 1px solid rgba(255, 255, 255, 0.2); + display: inline-block; +} +#AddBox5 { + /* height: 40px; */ + width: 100%; + border-bottom: 1px solid rgba(255, 255, 255, 0.2); + display: inline-block; +} \ No newline at end of file diff --git a/src/util/XY.js b/src/util/XY.js new file mode 100644 index 0000000..cfbb5e2 --- /dev/null +++ b/src/util/XY.js @@ -0,0 +1,18 @@ +/** + * 巡检 + * @exports {Object} + * 谢阳 + */ +let host = '/dataApi'; + +let nozzle = { + 'personnelInfo': '/personnel/info', //获取巡检人信息 + + + +}; + +for (let item in nozzle) { + nozzle[item] = host + nozzle[item]; +} +export default nozzle; diff --git a/config/index.js b/config/index.js index 3c07461..bc9f3c4 100644 --- a/config/index.js +++ b/config/index.js @@ -42,7 +42,7 @@ '/XY': { // 测试环境 // 'target': 'http://192.168.30.189:8800', // 接口域名 - 'target': 'http://192.168.30.59:7005', // 谢阳 + 'target': 'http://192.168.30.15:9200', // 谢阳 // 'target': 'http://192.168.30.30:8001/api', // 服务器接口 'changeOrigin': true, //是否跨域 'pathRewrite': { diff --git a/src/components/configure/PatrolConfiguration.vue b/src/components/configure/PatrolConfiguration.vue index bdff98e..8f19af8 100644 --- a/src/components/configure/PatrolConfiguration.vue +++ b/src/components/configure/PatrolConfiguration.vue @@ -10,11 +10,101 @@ :value="item.platform_code" > + 新增配置 -
+
+ + + + + + + + + +
+ +
+ + 设备检测类（33%） + 分值 + +
+
+
{{item.Title}}
+
{{item.Value}}
+
+
+ + 人员打卡（33%） + 分值 + +
+
+
{{item.Title}}
+
{{item.Value}}
+
+
+ + 轨迹跟踪（33%） + 分值 + +
+
+
{{item.Title}}
+
{{item.Value}}
+
+ 途经点位预览 +
+
+ + +
+ 配置名称： + +
+
+
+
+
+ - + @@ -94,4 +284,122 @@ margin-top: 10px; background: rgba(53, 53, 53, 0.5); } +/* 详情弹窗 */ +#tablelist { + width: 100%; + height: auto; + max-height: 600px; + border: 1px solid rgba(255, 255, 255, 0.2); + box-sizing: border-box; + padding: 2px; + overflow: auto; +} +.DataTitle { + display: inline-block; + width: 100%; + text-align: left; + padding-left: 15px; + box-sizing: border-box; + color: aqua; + font-size: 16px; + height: 30px; + line-height: 30px; + position: relative; +} +.DataTitleFz { + position: absolute; + left: 225px; + font-size: 14px; +} +.Datalistbox { + display: inline-block; + width: 100%; + height: auto; + box-sizing: border-box; + border: 1px solid rgba(255, 255, 255, 0.2); +} +.Datalist { + width: 25%; + height: 30px; + line-height: 30px; + box-sizing: border-box; + border-right: 1px solid rgba(255, 255, 255, 0.2); + border-bottom: 1px solid rgba(255, 255, 255, 0.2); + float: left; +} +.DatalistTitle { + height: 100%; + width: 80%; + float: left; + text-align: left; + box-sizing: border-box; + padding-left: 5px; + color: white; +} +.DatalistNember { + height: 100%; + width: 20%; + float: left; + text-align: center; + color: aqua; +} +.TJD { + width: 100px; + height: 20px; + line-height: 20px; + background: rgb(64, 158, 255); + color: white; + margin-top: 5px; + float: left; + margin-left: 15px; + cursor: pointer; +} +/* 新增/修改 弹窗样式 */ +.SelectTitle2 { + display: inline-block; + margin-left: 5px; + text-align: center; + height: 40px; + line-height: 40px; + color: rgb(1, 109, 252); + font-size: 16px; + font-weight: 600; +} +#AddBox1 { + height: 60px; + width: 100%; + border-bottom: 1px solid rgba(255, 255, 255, 0.2); + display: inline-block; + text-align: left; + box-sizing: border-box; + padding: 10px; +} +#AddBox1 .el-input { + width: 200px; + margin: 0 10px; +} +#AddBox2 { + /* height: 40px; */ + width: 100%; + border-bottom: 1px solid rgba(255, 255, 255, 0.2); + display: inline-block; +} +#AddBox3 { + /* height: 40px; */ + width: 100%; + border-bottom: 1px solid rgba(255, 255, 255, 0.2); + display: inline-block; +} +#AddBox4 { + /* height: 40px; */ + width: 100%; + border-bottom: 1px solid rgba(255, 255, 255, 0.2); + display: inline-block; +} +#AddBox5 { + /* height: 40px; */ + width: 100%; + border-bottom: 1px solid rgba(255, 255, 255, 0.2); + display: inline-block; +} \ No newline at end of file diff --git a/src/util/XY.js b/src/util/XY.js new file mode 100644 index 0000000..cfbb5e2 --- /dev/null +++ b/src/util/XY.js @@ -0,0 +1,18 @@ +/** + * 巡检 + * @exports {Object} + * 谢阳 + */ +let host = '/dataApi'; + +let nozzle = { + 'personnelInfo': '/personnel/info', //获取巡检人信息 + + + +}; + +for (let item in nozzle) { + nozzle[item] = host + nozzle[item]; +} +export default nozzle; diff --git a/src/util/interface.js b/src/util/interface.js index ea32fd8..9ec2b32 100644 --- a/src/util/interface.js +++ b/src/util/interface.js @@ -2,6 +2,7 @@ import project from './project'; import NF from './NF'; import SJFX from './SJFX'; +import XY from './XY'; // import task from './apiField/task'; // import dataSource from './apiField/dataSource'; @@ -26,5 +27,6 @@ nozzle = Object.assign(nozzle, CHGTwo); nozzle = Object.assign(nozzle, NF); nozzle = Object.assign(nozzle, SJFX); +nozzle = Object.assign(nozzle, XY); // nozzle = Object.assign(nozzle, dataSource); export default nozzle;