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 Show 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
<!DOCTYPE html>
<html lang="en">
<head>
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<!-- Cesium
1. CSS
2. JS
-->
<link
rel="stylesheet"
type="text/css"
href="./Cesium/Widgets/widgets.css"
/>
<link rel="stylesheet" type="text/css" href="./Cesium/Widgets/widgets.css" />
<script type="text/javascript" src="./Cesium/Cesium.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.7.2/proj4.js"></script>
......@@ -194,14 +191,14 @@
border-radius: 3px;
}
.search_box > div {
.search_box>div {
display: flex;
justify-content: start;
color: #fff;
align-items: center;
}
.search_box > div > span {
.search_box>div>span {
display: flex;
justify-content: start;
margin: 0 10px;
......@@ -234,9 +231,9 @@
display: none !important;
}
</style>
</head>
</head>
<body>
<body>
<div id="cesiumcontainer">
<div></div>
</div>
......@@ -332,5 +329,6 @@
}
})();
</script>
</body>
</body>
</html>
\ No newline at end of file
public/model/init.js
View file @ 83aacf1b
......@@ -367,8 +367,7 @@ const initCesiumpolyline = (
text: ` 平距 : ${distance.value}\n 空间距离 : ${Math.sqrt(
distance.value * distance.value +
elevationDifference.value * elevationDifference.value
)}\n 高差 : ${elevationDifference.value}(米)\n 坡度 : ${
slopeDegrees.value
)}\n 高差 : ${elevationDifference.value}(米)\n 坡度 : ${slopeDegrees.value
}`,
fillColor: Cesium.Color.GREEN,
};
......
src/components/CenterViews/index.vue
View file @ 83aacf1b
This diff is collapsed.
src/components/TableFilter/index.vue
View file @ 83aacf1b
<!--
/**
* 表单通用组件
......@@ -57,34 +56,31 @@
<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)"/>
<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>
<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 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>
<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>
......@@ -94,7 +90,7 @@ export default {
return {
}
},
props:{
props: {
form: {
type: Object,
default: {},
......@@ -104,24 +100,34 @@ export default {
default: {},
},
},
beforeCreate(){
beforeCreate() {
},
created(){
created() {
},
mounted() {
},
methods: {
onEventInfos:qf.vue.onEventInfos,
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;}
.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;}
}
.el-button {
margin-left: 20px;
}
.el-checkbox {
margin-right: 5px;
}
}
</style>
src/utils/request.js
View file @ 83aacf1b
......@@ -8,12 +8,10 @@ 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,
baseURL: 'http://192.168.2.37:9003',
timeout: Config.timeout // 请求超时时间
})
......
src/views/Screen/index.vue
View file @ 83aacf1b
This diff is collapsed.
src/views/dataMonitor/jrx/history/index copy.vue
View file @ 83aacf1b
<template>
<div class="common-page qyzz page-t1">
<div class="option page-row">
<table-filter
ref="filter"
:form="form"
:Dict="Dict"
:rules="rules"
:config="form.config"
:loadData="loadData"
/>
<table-filter ref="filter" :form="form" :Dict="Dict" :rules="rules" :config="form.config" :loadData="loadData" />
</div>
<div class="new-container" style="display: flex">
<div class="canvas-wrapper" style="width: 1000px;">
<!-- 替换为 Canvas 元素 -->
<canvas
ref="canvas"
id="mainCanvas"
width="1000"
style="background: #f0f0f0"
></canvas>
<canvas ref="canvas" id="mainCanvas" width="1000" style="background: #f0f0f0"></canvas>
</div>
<div class="chart-wrapper" style="padding-left: 0px;">
<div
ref="chartContainer"
style="width: 870px; height: 550px; margin-bottom: 20px;border:1px solid gainsboro;"
></div>
<div ref="chartContainer" style="width: 870px; height: 550px; margin-bottom: 20px;border:1px solid gainsboro;">
</div>
<div class="chart-btn-group">
<button
size="small"
:type="currentChartType === 'line' ? 'primary' : ''"
@click="switchChartType('line')"
>
<button size="small" :type="currentChartType === 'line' ? 'primary' : ''" @click="switchChartType('line')">
折线图
</button>
<button
size="small"
:type="currentChartType === 'column' ? 'primary' : ''"
@click="switchChartType('column')"
>
<button size="small" :type="currentChartType === 'column' ? 'primary' : ''"
@click="switchChartType('column')">
柱状图
</button>
</div>
......@@ -51,49 +30,24 @@
<div class="content-fix">
<div class="toolbar">
<div>
<el-button
v-for="(item, key) in form.config.otherBtn"
size="mini"
:type="item.type"
:icon="item.icon"
@click="item.callback.call(_self, $event)"
>{{ item.name }}</el-button
>
<el-button v-for="(item, key) in form.config.otherBtn" size="mini" :type="item.type" :icon="item.icon"
@click="item.callback.call(_self, $event)">{{ item.name }}</el-button>
</div>
<div>
<el-button
v-for="(item, key) in form.config.rightBtn"
size="mini"
:type="item.type"
:icon="item.icon"
@click="item.callback.call(_self, $event)"
>{{ item.name }}</el-button
>
<el-button v-for="(item, key) in form.config.rightBtn" size="mini" :type="item.type" :icon="item.icon"
@click="item.callback.call(_self, $event)">{{ item.name }}</el-button>
</div>
</div>
<!-- 表格渲染 -->
<cu-table
ref="cuTable"
:table="table"
:Dict="Dict"
:config="form.config"
:loadData="loadData"
/>
<cu-table ref="cuTable" :table="table" :Dict="Dict" :config="form.config" :loadData="loadData" />
</div>
</div>
</div>
</div>
<!-- 表单渲染 -->
<cu-form
ref="cuForm"
:form="form"
:Dict="Dict"
:rules="rules"
:submit="submitForm"
:cancel="cancelForm"
:watchKeys="['paperfilename']"
/>
<cu-form ref="cuForm" :form="form" :Dict="Dict" :rules="rules" :submit="submitForm" :cancel="cancelForm"
:watchKeys="['paperfilename']" />
</div>
</template>
......@@ -296,9 +250,9 @@ export default {
// 获取选择列表字典
var selectList = this.Dict.selectList;
Tools.asyncLoop.call(this, selectList, function(key, value, next) {
Tools.asyncLoop.call(this, selectList, function (key, value, next) {
if (typeof value === "function") {
value.call(this.Dict).then(function(res) {
value.call(this.Dict).then(function (res) {
selectList[key] = res;
next();
});
......@@ -318,7 +272,7 @@ export default {
},
methods: {
getCanvasData(){
getCanvasData() {
const params = {}
request({
url: "tab/jrx/dissect/visual-xinHua",
......@@ -418,7 +372,7 @@ export default {
for (let index = 0; index < tjNumber; index++) {
canvasData.poConfigs.push({
x: 0,
y: 600- (150 * index),
y: 600 - (150 * index),
width: 879 - 250 * index,
height: 150
});
......@@ -856,7 +810,7 @@ export default {
{ color: "blue", name: "蓝色报警线" }
],
alarmLine = {},
setAlarmSerie = function(value, name, color) {
setAlarmSerie = function (value, name, color) {
// 修改蓝色色值
color === "blue" && (color = "#3BAFFB");
var sx = list[0].date,
......@@ -940,7 +894,7 @@ export default {
});
}
},
loadData: function() {
loadData: function () {
console.log(this.form, "form");
this.initChart1();
......@@ -956,6 +910,5 @@ export default {
};
</script>
<style rel="stylesheet/scss" lang="scss" scope>
.qyzz {
}
.qyzz {}
</style>
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