Browse Source

Merge branch 'release-sy-v1.0.0' into 'dev'

Release sy v1.0.0

See merge request project/water/shuili-vue!104
sy-water-data-board-ui
黄星淮 11 months ago
parent
commit
a690f6cb96
  1. 27
      public/index.html
  2. 14
      src/views/sluice/runManage/dangerWeakProject/inspectTasks/taskDetails.vue
  3. 2
      src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
  4. 6
      src/views/sluice/runManage/supervisionInspetion/tasksManage/index.vue
  5. 4
      src/views/sluice/runManage/supervisionInspetion/tasksManage/tasksDetails.vue
  6. 2
      src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue
  7. 2
      src/views/welcome/index.vue

27
public/index.html

@ -7,15 +7,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<script src="./config.js"></script>
<!-- <link href="./lib/Cesium/Widgets/widgets.css" rel="stylesheet" /> -->
<link href="./lib/sycim/sycim.min.css" rel="stylesheet" />
<script src="./lib/sycim/sycim.min.js"></script>
<script>
window.Cesium = sycim.Cesium;
sycim.config.baseUrl = "./lib/sycim/resources/";
</script>
<script src="./lib/SuperMap3D/SuperMap3D.js"></script>
<title><%= webpackConfig.name %></title>
<style>
@ -214,5 +209,23 @@
<div class="load_title">正在加载系统资源,请耐心等待</div>
</div>
</div>
<script>
function downloadJs(url){
var script = document.createElement('script');
script.type = 'text/javascript'
script.src = url;
document.body.appendChild(script);
}
window.onload = function(){
console.log('window.onload')
downloadJs('./lib/sycim/sycim.min.js');
setTimeout(() => {
window.Cesium = sycim.Cesium;
sycim.config.baseUrl = "./lib/sycim/resources/";
downloadJs('./lib/SuperMap3D/SuperMap3D.js');
}, 500);
}
</script>
</body>
</html>

14
src/views/sluice/runManage/dangerWeakProject/inspectTasks/taskDetails.vue

@ -19,7 +19,7 @@ export default {
paramsData: {
name: "",
type: null,
dikeName: "",
wagaName: "",
selectLevel: "",
selectType: "",
},
@ -358,8 +358,8 @@ export default {
this.$refs.ruleForm.validate((valid) => {
if (valid) {
if (
!this.ruleForm.dikeList ||
this.ruleForm.dikeList.length < 1
!this.ruleForm.wagaList ||
this.ruleForm.wagaList.length < 1
) {
this.$message.error("请至少添加一个堤防");
return;
@ -367,11 +367,11 @@ export default {
let formData = {
...this.ruleForm,
dikeCode: this.ruleForm.dikeList
.map((item) => item.dikeCode)
wagaCode: this.ruleForm.wagaList
.map((item) => item.wagaCode)
.join(","),
dikeName: this.ruleForm.dikeList
.map((item) => item.dikeName)
wagaName: this.ruleForm.wagaList
.map((item) => item.wagaName)
.join(","),
};
if (this.$route.query.id) {

2
src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue

@ -363,7 +363,7 @@ export default {
<template>
<div class="slider-right">
<div class="top-title">
{{ $router.currentRoute.meta.title }} - {{ $route.query.dikeName }}
{{ $router.currentRoute.meta.title }} - {{ $route.query.wagaName }}
</div>
<div class="table-box">
<div class="top-search">

6
src/views/sluice/runManage/supervisionInspetion/tasksManage/index.vue

@ -101,11 +101,7 @@ export default {
.catch(() => {});
},
},
created() {
this.getDicts("embankment_type").then((response) => {
this.dikeTypeList = response.data;
});
},
created() {},
mounted() {
//
this.getTableData();

4
src/views/sluice/runManage/supervisionInspetion/tasksManage/tasksDetails.vue

@ -18,7 +18,7 @@ export default {
paramsData: {
name: "",
type: null,
dikeName: "",
wagaName: "",
selectLevel: "",
selectType: "",
},
@ -164,7 +164,7 @@ export default {
this.$refs[ruleForm].resetFields();
this.ruleForm = {
wagaCode: [],
dikeName: "",
wagaName: "",
name: "",
type: "",
instruction: "",

2
src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue

@ -113,7 +113,7 @@ import {
getRainfallAndGateFlowApi,
getWaterLevelInfoApi,
} from "@/api/sluice/index.js";
import { getYearRainfallData } from "@/api/dike/analysis";
import { getYearRainfallData } from "@/api/sluice/analysis";
import dayjs from "dayjs";

2
src/views/welcome/index.vue

@ -1,5 +1,5 @@
<template>
<div class="welcome-page">欢迎来到广东水工程运行管理系统~</div>
<div class="welcome-page">欢迎来到智慧水利工程应用~</div>
</template>
<style scoped lang="scss">
.welcome-page{

Loading…
Cancel
Save