Skip to content

platform / fanxing_new

Go to a project
Commit bf265bc4 by 罗鑫霖
Options

高新区软测修改

1 parent 0e503840
Inline Side-by-side
Showing 14 changed files with 40 additions and 26 deletions
fanxing.zip
No preview for this file type
public/js/version.json
{"commit":"5c64452e5cdc120d37edf748a605495f5e61efee","commitDate":"2021-11-23 14:48","buildDate":"2022-4-17 16:18","version":"2.1.0","info":"lxl"}
\ No newline at end of file \ No newline at end of file
{"commit":"0e5038400902761c6f098626feeb8634c767e7a7","commitDate":"2022-4-17 16:25","buildDate":"2022-5-6 16:10","version":"2.1.0","info":"高新区-软测修改"}
\ No newline at end of file \ No newline at end of file
src/App.vue
...@@ -30,10 +30,10 @@ export default { ...@@ -30,10 +30,10 @@ export default {
window.opsTableHeight = document.body.clientHeight - 260 + "px"; window.opsTableHeight = document.body.clientHeight - 260 + "px";
if (document.body.clientWidth > 1366) { if (document.body.clientWidth > 1366) {
window.oneSearchTableHeight = document.body.clientHeight - 280 + "px"; window.oneSearchTableHeight = document.body.clientHeight - 280 + "px";
window.twoSearchTableHeight = document.body.clientHeight - 320 + "px"; window.twoSearchTableHeight = document.body.clientHeight - 330 + "px";
} else { } else {
window.oneSearchTableHeight = document.body.clientHeight - 280 + "px"; window.oneSearchTableHeight = document.body.clientHeight - 280 + "px";
window.twoSearchTableHeight = document.body.clientHeight - 315 + "px"; window.twoSearchTableHeight = document.body.clientHeight - 320 + "px";
} }
} }
}; };
......
src/assets/resetElementCss/index.scss
...@@ -182,6 +182,9 @@ ...@@ -182,6 +182,9 @@
.el-table--small td, .el-table--small th{ .el-table--small td, .el-table--small th{
padding: 8px 0; padding: 8px 0;
} }
.ten-table-wrapper td, .ten-table-wrapper th {
padding: 16px 0;
}
.el-table--border::after, .el-table--group::after, .el-table::before{ .el-table--border::after, .el-table--group::after, .el-table::before{
// background-color: rgba(0,0,0,0); // background-color: rgba(0,0,0,0);
} }
......
src/libs/utils.js
...@@ -18,6 +18,8 @@ const splitUrlOrigin = (url) => { ...@@ -18,6 +18,8 @@ const splitUrlOrigin = (url) => {
} }
}; };
export const splitUrlOriginG = splitUrlOrigin;
export const buildImgurl = (url) => { export const buildImgurl = (url) => {
let isHttps = window.config.https, let isHttps = window.config.https,
origin = window.location.origin; origin = window.location.origin;
......
src/main.js
...@@ -23,6 +23,8 @@ Vue.prototype.$moment = moment; ...@@ -23,6 +23,8 @@ Vue.prototype.$moment = moment;
Vue.prototype.$buildCode = buildCode; Vue.prototype.$buildCode = buildCode;
Vue.prototype.oParse = new XML.ObjTree(); Vue.prototype.oParse = new XML.ObjTree();
Vue.prototype.axios = axios; Vue.prototype.axios = axios;
Vue.prototype.$pageSizeOpts = [10, 30, 50, 100];
Vue.prototype.$pageSize = 10;
// import VueParticles from "vue-particles"; // import VueParticles from "vue-particles";
Vue.use(api); Vue.use(api);
Vue.use(log); Vue.use(log);
......
src/views/search/event.vue
...@@ -127,6 +127,7 @@ ...@@ -127,6 +127,7 @@
v-loading="loading" v-loading="loading"
border border
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:class="$pageSizeOpts[0] === 10 ? 'ten-table-wrapper' : ''"
> >
<el-table-column <el-table-column
prop="index" prop="index"
...@@ -263,7 +264,7 @@ ...@@ -263,7 +264,7 @@
background background
prev-text="上一页" prev-text="上一页"
next-text="下一页" next-text="下一页"
:page-sizes="[30, 50, 100, 200]" :page-sizes="$pageSizeOpts"
layout="total, prev, pager, next,sizes, jumper" layout="total, prev, pager, next,sizes, jumper"
:current-page="page" :current-page="page"
@size-change="handleSizeChange" @size-change="handleSizeChange"
...@@ -365,7 +366,7 @@ export default { ...@@ -365,7 +366,7 @@ export default {
total: 0, total: 0,
page: 1, page: 1,
displaystatus: "table", displaystatus: "table",
pageSize: 30, pageSize: this.$pageSize,
selectcheck: [], selectcheck: [],
currentIndex: 0, currentIndex: 0,
cateList: JSON.parse(window.localStorage.getItem("cate列表")) || [], cateList: JSON.parse(window.localStorage.getItem("cate列表")) || [],
......
src/views/search/illegal.vue
...@@ -168,6 +168,7 @@ ...@@ -168,6 +168,7 @@
stripe stripe
border border
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:class="$pageSizeOpts[0] === 10 ? 'ten-table-wrapper' : ''"
> >
<el-table-column type="selection" align="center" width="55"> <el-table-column type="selection" align="center" width="55">
</el-table-column> </el-table-column>
...@@ -330,7 +331,7 @@ ...@@ -330,7 +331,7 @@
background background
prev-text="上一页" prev-text="上一页"
next-text="下一页" next-text="下一页"
:page-sizes="[30, 50, 100, 200]" :page-sizes="$pageSizeOpts"
layout="total, prev, pager, next,sizes, jumper" layout="total, prev, pager, next,sizes, jumper"
:current-page="page" :current-page="page"
@size-change="handleSizeChange" @size-change="handleSizeChange"
...@@ -442,7 +443,7 @@ ...@@ -442,7 +443,7 @@
</template> </template>
<script> <script>
import videoDialog from "@/components/video"; import videoDialog from "@/components/video";
import { getDataList } from "@/libs/utils"; import { getDataList, splitUrlOriginG } from "@/libs/utils";
export default { export default {
data() { data() {
let start_dt = this.yesterDay(); let start_dt = this.yesterDay();
...@@ -483,7 +484,7 @@ export default { ...@@ -483,7 +484,7 @@ export default {
formatterData: [], formatterData: [],
total: 0, total: 0,
page: 1, page: 1,
pageSize: 30, pageSize: this.$pageSize,
selectcheck: [], selectcheck: [],
exportevent: [], exportevent: [],
currentIndex: 0, currentIndex: 0,
...@@ -736,12 +737,14 @@ export default { ...@@ -736,12 +737,14 @@ export default {
this.$api.search this.$api.search
.detailVideo({}, unid) .detailVideo({}, unid)
.then((res) => { .then((res) => {
let play_url = res.mp4_url; if (res.mp4_url) {
console.log("录像路径", play_url); let play_url = location.origin + splitUrlOriginG(res.mp4_url);
setTimeout(() => { console.log("录像路径", play_url);
this.$refs.visableDialog.playvideos(play_url); setTimeout(() => {
console.log("videourl", url); this.$refs.visableDialog.playvideos(play_url);
}, 0); console.log("videourl", url);
}, 0);
}
}) })
.catch((e) => {}); .catch((e) => {});
}, },
......
src/views/search/pedestrian.vue
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
background background
prev-text="上一页" prev-text="上一页"
next-text="下一页" next-text="下一页"
:page-sizes="[30, 50, 100, 200]" :page-sizes="$pageSizeOpts"
layout="total, prev, pager, next,sizes, jumper" layout="total, prev, pager, next,sizes, jumper"
:current-page="page" :current-page="page"
@size-change="handleSizeChange" @size-change="handleSizeChange"
...@@ -297,7 +297,7 @@ export default { ...@@ -297,7 +297,7 @@ export default {
formattterData: [], formattterData: [],
total: 0, total: 0,
page: 1, page: 1,
pageSize: 30, pageSize: this.$pageSize,
selectcheck: [], selectcheck: [],
currentIndex: 0, currentIndex: 0,
taskList: [], taskList: [],
......
src/views/search/publicFlow.vue
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
background background
prev-text="上一页" prev-text="上一页"
next-text="下一页" next-text="下一页"
:page-sizes="[30, 50, 100, 200]" :page-sizes="$pageSizeOpts"
layout="total, prev, pager, next,sizes, jumper" layout="total, prev, pager, next,sizes, jumper"
:current-page="page" :current-page="page"
@size-change="handleSizeChange" @size-change="handleSizeChange"
...@@ -300,7 +300,7 @@ export default { ...@@ -300,7 +300,7 @@ export default {
formatterData: [], formatterData: [],
total: 0, total: 0,
page: 1, page: 1,
pageSize: 30, pageSize: this.$pageSize,
selectcheck: [], selectcheck: [],
currentIndex: 0, currentIndex: 0,
taskList: [], taskList: [],
......
src/views/search/traficflow.vue
...@@ -109,6 +109,7 @@ ...@@ -109,6 +109,7 @@
stripe stripe
v-loading="loading" v-loading="loading"
border border
:class="$pageSizeOpts[0] === 10 ? 'ten-table-wrapper' : ''"
> >
<el-table-column <el-table-column
prop="index" prop="index"
...@@ -200,7 +201,7 @@ ...@@ -200,7 +201,7 @@
background background
prev-text="上一页" prev-text="上一页"
next-text="下一页" next-text="下一页"
:page-sizes="[30, 50, 100, 200]" :page-sizes="$pageSizeOpts"
layout="total, prev, pager, next,sizes, jumper" layout="total, prev, pager, next,sizes, jumper"
:current-page="page" :current-page="page"
@size-change="handleSizeChange" @size-change="handleSizeChange"
...@@ -232,7 +233,7 @@ export default { ...@@ -232,7 +233,7 @@ export default {
formatterData: [], formatterData: [],
total: 0, total: 0,
page: 1, page: 1,
pageSize: 30, pageSize: this.$pageSize,
taskList: [], taskList: [],
subTaskList: [], subTaskList: [],
tableHeight: window.oneSearchTableHeight tableHeight: window.oneSearchTableHeight
......
src/views/search/vehicleSearch.vue
...@@ -189,6 +189,7 @@ ...@@ -189,6 +189,7 @@
border border
v-loading="loading" v-loading="loading"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:class="$pageSizeOpts[0] === 10 ? 'ten-table-wrapper' : ''"
> >
<el-table-column type="selection" align="center" width="55"> <el-table-column type="selection" align="center" width="55">
</el-table-column> </el-table-column>
...@@ -318,7 +319,7 @@ ...@@ -318,7 +319,7 @@
background background
prev-text="上一页" prev-text="上一页"
next-text="下一页" next-text="下一页"
:page-sizes="[30, 50, 100, 200]" :page-sizes="$pageSizeOpts"
layout="total, prev, pager, next,sizes, jumper" layout="total, prev, pager, next,sizes, jumper"
:current-page="page" :current-page="page"
@size-change="handleSizeChange" @size-change="handleSizeChange"
...@@ -450,7 +451,7 @@ export default { ...@@ -450,7 +451,7 @@ export default {
formatterData: [], formatterData: [],
total: 0, total: 0,
page: 1, page: 1,
pageSize: 30, pageSize: this.$pageSize,
selectcheck: [], selectcheck: [],
currentIndex: 0, currentIndex: 0,
taskList: [], taskList: [],
......
src/views/search/xcycle.vue
...@@ -275,6 +275,7 @@ ...@@ -275,6 +275,7 @@
stripe stripe
border border
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:class="$pageSizeOpts[0] === 10 ? 'ten-table-wrapper' : ''"
> >
<el-table-column type="selection" align="center" width="55"> <el-table-column type="selection" align="center" width="55">
</el-table-column> </el-table-column>
...@@ -426,7 +427,7 @@ ...@@ -426,7 +427,7 @@
background background
prev-text="上一页" prev-text="上一页"
next-text="下一页" next-text="下一页"
:page-sizes="[30, 50, 100, 200]" :page-sizes="$pageSizeOpts"
layout="total, prev, pager, next,sizes, jumper" layout="total, prev, pager, next,sizes, jumper"
:current-page="page" :current-page="page"
@size-change="handleSizeChange" @size-change="handleSizeChange"
...@@ -549,7 +550,7 @@ export default { ...@@ -549,7 +550,7 @@ export default {
formatterData: [], formatterData: [],
total: 0, total: 0,
page: 1, page: 1,
pageSize: 30, pageSize: this.$pageSize,
selectcheck: [], selectcheck: [],
currentIndex: 0, currentIndex: 0,
taskList: [], taskList: [],
......
src/views/search/xcycleold.vue
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
background background
prev-text="上一页" prev-text="上一页"
next-text="下一页" next-text="下一页"
:page-sizes="[30, 50, 100, 200]" :page-sizes="$pageSizeOpts"
layout="total, prev, pager, next,sizes, jumper" layout="total, prev, pager, next,sizes, jumper"
:current-page="page" :current-page="page"
@size-change="handleSizeChange" @size-change="handleSizeChange"
...@@ -255,7 +255,7 @@ export default { ...@@ -255,7 +255,7 @@ export default {
formattterData: [], formattterData: [],
total: 0, total: 0,
page: 1, page: 1,
pageSize: 30, pageSize: this.$pageSize,
selectcheck: [], selectcheck: [],
currentIndex: 0 currentIndex: 0
}; };
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!