Skip to content

V
V3-TailingPond
Commit 83aacf1b authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

add： 新华 剖面 update from liqilin

parent 5afb27b3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2994 additions and 1118 deletions
.env.development 0 → 100644
View file @ 83aacf1b
ENV = 'development'
# 开发服务器端口配置
VUE_APP_LOCAL_PORT = 8080
VUE_APP_BASE_API = 'http://192.168.2.11:8080'
VUE_APP_LOCAL_API = 'http://192.168.2.37:9003'
\ No newline at end of file
.gitignore
View file @ 83aacf1b
......@@ -19,7 +19,6 @@ selenium-debug.log
*.njsproj
*.sln
*.local
*.env.development
*dist.rar
package-lock.json
......
public/model/index.html
View file @ 83aacf1b
This diff is collapsed.
public/model/init.js
View file @ 83aacf1b
......@@ -53,12 +53,12 @@ const formatPos = (arr) => {
for (let i = 0; i < arr.length; i++) {
/**(
*
*
*
*
* 界
* - 清
* - 存
*
*
) */
if (!x) x = arr[i];
......@@ -112,9 +112,9 @@ function calcelatepoduCopy(podupoints) {
/**
* let point1 = podupoints[i];
let point2 = podupoints[i + 1];
*
*
*
*
*
*
* var point1 = turf.point([109.104262, 37.831315]);
var point2 = turf.point([109.104261, 37.831315]);
var bearing = turf.bearing(point1, point2);
......@@ -212,7 +212,7 @@ const initCesiumPoint = (
{ _longitude, _latitude, _height },
{ text, fillColor } = { text: "", fillColor: "" }
) => {
debugger;
if (_height < 15) return;
......@@ -293,7 +293,7 @@ const initCesiumpolyline = (
// if(switchModule.)
const pointConf = {
text: `
text: `
经度 : ${String(_longitude).slice(0, 8)}
纬度 : ${String(_latitude).slice(0, 8)}
高程 : ${String(_height).slice(0, 6)}(米)`,
......@@ -333,8 +333,8 @@ const initCesiumpolyline = (
let { distance, elevationDifference, slopeDegrees, bearing } = opt;
/**
*
*
*
*
* distance: {
name: "距离",
value: distance,
......@@ -351,13 +351,13 @@ const initCesiumpolyline = (
name: "当前轮 - 参数",
value: podupoints,
},
*
*
*
*
*/
/**
*
* text: `
*
* text: `
经度 : ${String(_longitude).slice(0, 8)}
纬度 : ${String(_latitude).slice(0, 8)}
高程 : ${String(_height).slice(0, 6)}(米)`,
......@@ -366,10 +366,9 @@ const initCesiumpolyline = (
const styleOpt = {
text: ` 平距 : ${distance.value}\n 空间距离 : ${Math.sqrt(
distance.value * distance.value +
elevationDifference.value * elevationDifference.value
)}\n 高差 : ${elevationDifference.value}(米)\n 坡度 : ${
slopeDegrees.value
}`,
elevationDifference.value * elevationDifference.value
)}\n 高差 : ${elevationDifference.value}(米)\n 坡度 : ${slopeDegrees.value
}`,
fillColor: Cesium.Color.GREEN,
};
......@@ -432,7 +431,7 @@ const xD = (old, cur) => {
// ================================================================ 模板函数 | S
/**
*
*
// 面
var polyEntity = viewer.entities.add({
name: 'Area Measurement',
......@@ -463,7 +462,7 @@ const xD = (old, cur) => {
}
});
*
*
*/
// ================================================================ 模板函数 | E
......
src/components/CenterViews/index.vue
View file @ 83aacf1b
This diff is collapsed.
src/components/TableFilter/index.vue
View file @ 83aacf1b
<!--
/**
* 表单通用组件
......@@ -53,75 +52,82 @@
*/
-->
<template>
<!--工具栏-->
<div class="head-container" v-if="form.config.search && form.config.search[0]">
<!-- 搜索 -->
<template v-for="(item, index) in form.config.search">
<label v-if="item.name" class="el-form-item-label">{{item.name}}</label>
<template v-if="item.type==='string'">
<el-input v-model="form.query[item.word]" clearable :placeholder="'请输入'+item.name" :style="'width:'+item.width" @clear="item.clear && item.clear.call(_self.$parent)"/>
</template>
<template v-if="item.type==='select'">
<el-select v-model="form.query[item.word]" :placeholder="'请选择'+item.name" size="small" :style="'width:'+(item.width || 'auto')" :disabled="item.disabled" clearable @change="onEventInfos(item.change)" @clear="item.clear && item.clear.call(_self.$parent)">
<el-option v-for="obj in Dict.selectList[item.word]" :label="obj[item.key] || obj.name" :value="obj[item.val] || obj.value" ></el-option>
</el-select>
</template>
<template v-else-if="item.type === 'checkbox'">
<el-checkbox v-model="form.query[item.word]" :label="item.label"></el-checkbox>
</template>
<template v-else-if="item.type.indexOf('date') > -1">
<el-date-picker
v-model="form.query[item.word]"
:style="'width:'+item.width"
:type="item.type"
:value-format="item.format || 'yyyy-MM-dd'"
:default-time="item.defaultTime"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
clearable
@change="item.change && item.change.call(_self, $event)"
>
</el-date-picker>
</template>
<el-button v-else-if="item.type==='button'" size="mini" :type="item.btntype || 'success'" :icon="item.icon" @click="item.click && item.click.call(_self.$parent, $event)">{{item.label}}</el-button>
</template>
</div>
<!--工具栏-->
<div class="head-container" v-if="form.config.search && form.config.search[0]">
<!-- 搜索 -->
<template v-for="(item, index) in form.config.search">
<label v-if="item.name" class="el-form-item-label">{{ item.name }}</label>
<template v-if="item.type === 'string'">
<el-input v-model="form.query[item.word]" clearable :placeholder="'请输入' + item.name"
:style="'width:' + item.width" @clear="item.clear && item.clear.call(_self.$parent)" />
</template>
<template v-if="item.type === 'select'">
<el-select v-model="form.query[item.word]" :placeholder="'请选择' + item.name" size="small"
:style="'width:' + (item.width || 'auto')" :disabled="item.disabled" clearable
@change="onEventInfos(item.change)" @clear="item.clear && item.clear.call(_self.$parent)">
<el-option v-for="obj in Dict.selectList[item.word]" :label="obj[item.key] || obj.name"
:value="obj[item.val] || obj.value"></el-option>
</el-select>
</template>
<template v-else-if="item.type === 'checkbox'">
<el-checkbox v-model="form.query[item.word]" :label="item.label"></el-checkbox>
</template>
<template v-else-if="item.type.indexOf('date') > -1">
<el-date-picker v-model="form.query[item.word]" :style="'width:' + item.width" :type="item.type"
:value-format="item.format || 'yyyy-MM-dd'" :default-time="item.defaultTime" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" clearable
@change="item.change && item.change.call(_self, $event)">
</el-date-picker>
</template>
<el-button v-else-if="item.type === 'button'" size="mini" :type="item.btntype || 'success'" :icon="item.icon"
@click="item.click && item.click.call(_self.$parent, $event)">{{ item.label }}</el-button>
</template>
</div>
</template>
<script>
export default {
data() {
return {
}
},
props:{
form: {
type: Object,
default: {},
},
Dict: {
type: Object,
default: {},
},
},
beforeCreate(){
},
created(){
},
mounted() {
},
methods: {
onEventInfos:qf.vue.onEventInfos,
},
data() {
return {
}
},
props: {
form: {
type: Object,
default: {},
},
Dict: {
type: Object,
default: {},
},
},
beforeCreate() {
},
created() {
},
mounted() {
},
methods: {
onEventInfos: qf.vue.onEventInfos,
},
}
</script>
<style lang="scss" scope>
.head-container{
.el-form-item-label{
font-weight:500;margin-left:15px;
&:first-child{margin-left:0;}
}
.el-button{margin-left:20px;}
.el-checkbox{margin-right:5px;}
}
.head-container {
.el-form-item-label {
font-weight: 500;
margin-left: 15px;
&:first-child {
margin-left: 0;
}
}
.el-button {
margin-left: 20px;
}
.el-checkbox {
margin-right: 5px;
}
}
</style>
src/utils/request.js
View file @ 83aacf1b
......@@ -8,13 +8,11 @@ import Config from '@/settings'
axios.defaults.withCredentials = true;
//var baseURL = (VUE_APP_API.ServiceURL || process.env.VUE_APP_LOCAL_API) + '/';
var baseURL = process.env.NODE_ENV
=== 'development' ? process.env.VUE_APP_LOCAL_API + '/' : (VUE_APP_API.ServiceURL || process.env.VUE_APP_LOCAL_API) + '/';
var baseURL = process.env.NODE_ENV === 'development' ? process.env.VUE_APP_LOCAL_API + '/' : (process.env.VUE_APP_BASE_API || process.env.VUE_APP_LOCAL_API) + '/';
// 创建axios实例
const service = axios.create({
baseURL: baseURL,
timeout: Config.timeout // 请求超时时间
baseURL: 'http://192.168.2.37:9003',
timeout: Config.timeout // 请求超时时间
})
// request拦截器
......@@ -46,21 +44,21 @@ service.interceptors.response.use(
break
// token 过期
// token 过期
case 401:
Notification({
title: '登录过期，请重新登录',
duration: 2000,
type: 'warning'
})
Notification({
title: '登录过期，请重新登录',
duration: 2000,
type: 'warning'
})
setTimeout(() => {
window.localStorage.removeItem('token')
window.location = '#/';
location.reload()
}, 1000)
setTimeout(() => {
window.localStorage.removeItem('token')
window.location = '#/';
location.reload()
}, 1000)
break
break
default:
break
......
src/views/Screen/index.vue
View file @ 83aacf1b
This diff is collapsed.
src/views/dataMonitor/jrx/history/index-剖面-old.vue 0 → 100644
View file @ 83aacf1b
This diff is collapsed.
src/views/dataMonitor/jrx/history/index.vue
View file @ 83aacf1b
This diff is collapsed.
src/views/dataMonitor/jrx/history/index1.vue 0 → 100644
View file @ 83aacf1b
This diff is collapsed.
vue.config.js
View file @ 83aacf1b
......@@ -12,8 +12,8 @@ function resolve(dir) {
};
const name = defaultSettings.title; // 网址标题
const port = process.env.VUE_APP_LOCAL_PORT; // 端口配置
const VUE_APP_BASE_API = process.env.VUE_APP_BASE_API;
const port = 9527; // 端口配置
const VUE_APP_BASE_API = 'http://192.168.2.37:9003';
// All configuration item explanations can be find in https://cli.vuejs.org/config/
module.exports = {
......@@ -63,14 +63,14 @@ module.exports = {
},
proxy: {
'/api': {
target: process.env.VUE_APP_BASE_API,
target: VUE_APP_BASE_API,
changeOrigin: true,
pathRewrite: {
'^/api': 'api'
}
},
'/auth': {
target: process.env.VUE_APP_BASE_API,
target: VUE_APP_BASE_API,
changeOrigin: true,
pathRewrite: {
'^/auth': 'auth'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment