Skip to content

V
V3-TailingPond
Commit 740a24a1 authored by Kimber's avatar Kimber
Browse files
Options

'update'

parents 298b7818 6f1b5fea
Show whitespace changes
Inline Side-by-side
Showing with 329 additions and 226 deletions
src/layout/components/AppMain.vue
View file @ 740a24a1
...@@ -6,7 +6,11 @@ ...@@ -6,7 +6,11 @@
</keep-alive> </keep-alive>
</transition> </transition>
<footer v-if="$route.path!=='/dashboard'" class="page-footer"></footer> <footer v-if="$route.path!=='/dashboard'" class="page-footer" :data-content="$store.state.settings.footerTxt">
<!-- <span v-html="$store.state.settings.footerTxt" style="color:#888;display:inline-block;font-weight:bold;" /> -->
<!-- <span style="color:#888;display:inline-block;font-weight:bold;" /> -->
</footer>
<!-- <div v-if="$store.state.settings.showFooter" id="el-main-footer"> <!-- <div v-if="$store.state.settings.showFooter" id="el-main-footer">
<span v-html="$store.state.settings.footerTxt" /> <span v-html="$store.state.settings.footerTxt" />
...@@ -53,7 +57,12 @@ export default { ...@@ -53,7 +57,12 @@ export default {
display:flex;justify-content:center;background-color:#fff;line-height:2; display:flex;justify-content:center;background-color:#fff;line-height:2;
&:after{ &:after{
color:#888;display:inline-block;font-weight:bold; color:#888;display:inline-block;font-weight:bold;
<<<<<<< HEAD
content:'© ⋅ 技术支持：山东天地寰宇信息科技有限公司'; content:'© ⋅ 技术支持：山东天地寰宇信息科技有限公司';
=======
// content:'© ⋅ 技术支持：山东天地寰宇';
content: attr(data-content)
>>>>>>> 6f1b5fea3d8cf5d5a8c61fffcc1447d936fe0cf8
} }
} }
</style> </style>
......
src/settings.js
View file @ 740a24a1
...@@ -43,7 +43,7 @@ module.exports = { ...@@ -43,7 +43,7 @@ module.exports = {
* 底部文字，支持html语法 * 底部文字，支持html语法
*/ */
//footerTxt: '© 2019 Zheng Jie <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License 2.0</a>', //footerTxt: '© 2019 Zheng Jie <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License 2.0</a>',
footerTxt: '© ', footerTxt: '© ⋅ 技术支持：山东天地寰宇',
/** /**
* 备案号 * 备案号
*/ */
......
src/views/dataMonitor/bmwy/history/index.vue
View file @ 740a24a1
...@@ -16,10 +16,24 @@ ...@@ -16,10 +16,24 @@
<div class="content-fix"> <div class="content-fix">
<div class="toolbar"> <div class="toolbar">
<div> <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>
<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>
</div> </div>
<!-- 表格渲染 --> <!-- 表格渲染 -->
...@@ -49,75 +63,103 @@ ...@@ -49,75 +63,103 @@
</template> </template>
<script> <script>
import { reqApi, Config } from '@/assets/js/httpApi.js'; import { reqApi, Config } from "@/assets/js/httpApi.js";
import { Tools } from '@/assets/js/common.js'; import { Tools } from "@/assets/js/common.js";
import DateRangePicker from '@/components/DateRangePicker'; import DateRangePicker from "@/components/DateRangePicker";
import TableFilter from '@/components/TableFilter'; import TableFilter from "@/components/TableFilter";
import cuForm from '@/components/cuForm'; import cuForm from "@/components/cuForm";
import cuTable from '@/components/cuTable'; import cuTable from "@/components/cuTable";
export default { export default {
name: 'Dashboard', name: "Dashboard",
components: { components: {
DateRangePicker, TableFilter, cuForm, cuTable DateRangePicker,
TableFilter,
cuForm,
cuTable,
}, },
data() { data() {
return { return {
Dict:{selectList:[]}, refreshInterval: null,
table:{ Dict: { selectList: [] },
table: {
page: 1, page: 1,
size: 10, size: 10,
total: 0, total: 0,
loading: false, loading: false,
dataList:[], dataList: [],
}, },
rules: {}, rules: {},
form: { form: {
title:'', visible:false, reqType:'add', historyDialog:false, title: "",
status:{cu:0}, visible: false,
query:{}, reqType: "add",
search:{}, historyDialog: false,
item:{}, status: { cu: 0 },
file:0, query: {},
config:{}, search: {},
item: {},
file: 0,
config: {},
}, },
} };
}, },
created(){ created() {
// 获取基本信息 // 获取基本信息
this.pageApi = Config.getModuleInfo(this); this.pageApi = Config.getModuleInfo(this);
this.Dict = this.pageApi.Dict; this.Dict = this.pageApi.Dict;
this.form.config = this.pageApi.config; this.form.config = this.pageApi.config;
this.rules = reqApi.getRules(this.Dict.baseInfo) || (this.Dict.rules || {}); this.rules = reqApi.getRules(this.Dict.baseInfo) || this.Dict.rules || {};
this.pageApi.created && this.pageApi.created(); this.pageApi.created && this.pageApi.created();
}, },
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
this.loadData(); this.loadData();
this.startRefreshInterval(); // 开启定时器
}); });
// 获取选择列表字典 // 获取选择列表字典
var selectList = this.Dict.selectList; 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'){ if (typeof value === "function") {
value.call(this.Dict).then(function(res){ value.call(this.Dict).then(function (res) {
selectList[key] = res; next(); selectList[key] = res;
}) next();
}else{next()}; });
} else {
next();
}
}); });
}, },
beforeDestroy() {
this.clearRefreshInterval(); // 清除定时器
},
methods: { methods: {
loadData:reqApi.common.getRequst, // 定时刷新开始
cancelForm(){ startRefreshInterval() {
this.refreshInterval = setInterval(() => {
this.loadData(); // 每30秒刷新列表
}, 30000); // 30000毫秒 == 30秒
},
clearRefreshInterval() {
if (this.refreshInterval) {
clearInterval(this.refreshInterval);
this.refreshInterval = null;
}
},
// 定时刷新结束
loadData: reqApi.common.getRequst,
cancelForm() {
this.form.visible = false; this.form.visible = false;
}, },
submitForm(form, item){ submitForm(form, item) {
reqApi.common.submitForm.call(this, form, item); reqApi.common.submitForm.call(this, form, item);
}, },
} },
} };
</script> </script>
<style rel="stylesheet/scss" lang="scss" scope> <style rel="stylesheet/scss" lang="scss" scope>
.qyzz{ .qyzz {
} }
</style> </style>
src/views/dataMonitor/common/history/index.vue
View file @ 740a24a1
...@@ -16,10 +16,24 @@ ...@@ -16,10 +16,24 @@
<div class="content-fix"> <div class="content-fix">
<div class="toolbar"> <div class="toolbar">
<div> <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>
<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>
</div> </div>
<!-- 表格渲染 --> <!-- 表格渲染 -->
...@@ -49,75 +63,103 @@ ...@@ -49,75 +63,103 @@
</template> </template>
<script> <script>
import { reqApi, Config } from '@/assets/js/httpApi.js'; import { reqApi, Config } from "@/assets/js/httpApi.js";
import { Tools } from '@/assets/js/common.js'; import { Tools } from "@/assets/js/common.js";
import DateRangePicker from '@/components/DateRangePicker'; import DateRangePicker from "@/components/DateRangePicker";
import TableFilter from '@/components/TableFilter'; import TableFilter from "@/components/TableFilter";
import cuForm from '@/components/cuForm'; import cuForm from "@/components/cuForm";
import cuTable from '@/components/cuTable'; import cuTable from "@/components/cuTable";
export default { export default {
name: 'Dashboard', name: "Dashboard",
components: { components: {
DateRangePicker, TableFilter, cuForm, cuTable DateRangePicker,
TableFilter,
cuForm,
cuTable,
}, },
data() { data() {
return { return {
Dict:{selectList:[]}, refreshInterval: null,
table:{ Dict: { selectList: [] },
table: {
page: 1, page: 1,
size: 10, size: 10,
total: 0, total: 0,
loading: false, loading: false,
dataList:[], dataList: [],
}, },
rules: {}, rules: {},
form: { form: {
title:'', visible:false, reqType:'add', historyDialog:false, title: "",
status:{cu:0}, visible: false,
query:{}, reqType: "add",
search:{}, historyDialog: false,
item:{}, status: { cu: 0 },
file:0, query: {},
config:{}, search: {},
item: {},
file: 0,
config: {},
}, },
} };
}, },
created(){ created() {
// 获取基本信息 // 获取基本信息
this.pageApi = Config.getModuleInfo(this); this.pageApi = Config.getModuleInfo(this);
this.Dict = this.pageApi.Dict; this.Dict = this.pageApi.Dict;
this.form.config = this.pageApi.config; this.form.config = this.pageApi.config;
this.rules = reqApi.getRules(this.Dict.baseInfo) || (this.Dict.rules || {}); this.rules = reqApi.getRules(this.Dict.baseInfo) || this.Dict.rules || {};
this.pageApi.created && this.pageApi.created(); this.pageApi.created && this.pageApi.created();
}, },
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
this.loadData(); this.loadData();
this.startRefreshInterval(); // 开启定时器
}); });
// 获取选择列表字典 // 获取选择列表字典
var selectList = this.Dict.selectList; 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'){ if (typeof value === "function") {
value.call(this.Dict).then(function(res){ value.call(this.Dict).then(function (res) {
selectList[key] = res; next(); selectList[key] = res;
}) next();
}else{next()}; });
} else {
next();
}
}); });
}, },
beforeDestroy() {
this.clearRefreshInterval(); // 清除定时器
},
methods: { methods: {
loadData:reqApi.common.getRequst, // 定时刷新开始
cancelForm(){ startRefreshInterval() {
this.refreshInterval = setInterval(() => {
this.loadData(); // 每30秒刷新列表
}, 30000); // 30000毫秒 == 30秒
},
clearRefreshInterval() {
if (this.refreshInterval) {
clearInterval(this.refreshInterval);
this.refreshInterval = null;
}
},
// 定时刷新结束
loadData: reqApi.common.getRequst,
cancelForm() {
this.form.visible = false; this.form.visible = false;
}, },
submitForm(form, item){ submitForm(form, item) {
reqApi.common.submitForm.call(this, form, item); reqApi.common.submitForm.call(this, form, item);
}, },
} },
} };
</script> </script>
<style rel="stylesheet/scss" lang="scss" scope> <style rel="stylesheet/scss" lang="scss" scope>
.qyzz{ .qyzz {
} }
</style> </style>
src/views/home_manage.vue
View file @ 740a24a1
...@@ -307,6 +307,7 @@ export default { ...@@ -307,6 +307,7 @@ export default {
.home_manage{ .home_manage{
a.amap-logo{ a.amap-logo{
display:flex !important;justify-content:center;align-items:center; display:flex !important;justify-content:center;align-items:center;
display: none !important;
height:.35rem;width:100%; height:.35rem;width:100%;
&:before{ &:before{
content:'';display:block; content:'';display:block;
...@@ -318,7 +319,11 @@ export default { ...@@ -318,7 +319,11 @@ export default {
//background-image:-webkit-linear-gradient(top, #8fe9ff, #3d8aff); //background-image:-webkit-linear-gradient(top, #8fe9ff, #3d8aff);
background-image:-webkit-linear-gradient(top,#8affe1,#4193ff); background-image:-webkit-linear-gradient(top,#8affe1,#4193ff);
-webkit-background-clip:text;-webkit-text-fill-color:transparent; -webkit-background-clip:text;-webkit-text-fill-color:transparent;
<<<<<<< HEAD
content:'© ⋅ 技术支持：山东天地寰宇信息科技有限公司'; content:'© ⋅ 技术支持：山东天地寰宇信息科技有限公司';
=======
content:'© ⋅ 技术支持：山东天地寰宇';
>>>>>>> 6f1b5fea3d8cf5d5a8c61fffcc1447d936fe0cf8
} }
img{display:none !important;} img{display:none !important;}
} }
......
src/views/home_manage_fly.vue
View file @ 740a24a1
...@@ -432,6 +432,7 @@ export default { ...@@ -432,6 +432,7 @@ export default {
.home_manage{ .home_manage{
a.amap-logo{ a.amap-logo{
display:flex !important;justify-content:center;align-items:center; display:flex !important;justify-content:center;align-items:center;
display: none !important;
height:.35rem;width:100%; height:.35rem;width:100%;
&:before{ &:before{
content:'';display:block; content:'';display:block;
...@@ -443,7 +444,11 @@ export default { ...@@ -443,7 +444,11 @@ export default {
//background-image:-webkit-linear-gradient(top, #8fe9ff, #3d8aff); //background-image:-webkit-linear-gradient(top, #8fe9ff, #3d8aff);
background-image:-webkit-linear-gradient(top,#8affe1,#4193ff); background-image:-webkit-linear-gradient(top,#8affe1,#4193ff);
-webkit-background-clip:text;-webkit-text-fill-color:transparent; -webkit-background-clip:text;-webkit-text-fill-color:transparent;
<<<<<<< HEAD
content:'© ⋅ 技术支持：山东天地寰宇信息科技有限公司'; content:'© ⋅ 技术支持：山东天地寰宇信息科技有限公司';
=======
content:'© ⋅ 技术支持：山东天地寰宇';
>>>>>>> 6f1b5fea3d8cf5d5a8c61fffcc1447d936fe0cf8
} }
img{display:none !important;} img{display:none !important;}
} }
......
西沟-dist.7z 0 → 100644
View file @ 740a24a1
File added
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