jianguan
/
supervise-monitor-ui
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

9.22

master
fengdong777 2 years ago
parent
b98738f630
commit
16b8895e09
8 changed files with 65 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .env.development
  2. 3
      package.json
  3. 4
      src/layout/components/Sidebar/index.vue
  4. 2
      src/layout/index.vue
  5. 10
      src/router/index.js
  6. 4
      src/views/renlianshibie/renlianshibieList.vue
  7. 2
      src/views/zhiwujiance/zhiwujianceInfo.vue
  8. 99
      src/views/zhiwujiance/zhiwujianceList.vue

2
.env.development
View File

@ -6,4 +6,4 @@ VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址 ## 配置测试和本地开发时的 接口地址
# VUE_APP_URL = "http://huirong.ybkjyl.com/api" # VUE_APP_URL = "http://huirong.ybkjyl.com/api"
VUE_APP_URL = "http://127.0.0.1:7103" VUE_APP_URL = "http://192.168.1.193:7103"

3
package.json
View File

@ -28,13 +28,16 @@
"path-to-regexp": "2.4.0", "path-to-regexp": "2.4.0",
"portfinder": "^1.0.21", "portfinder": "^1.0.21",
"qs": "^6.9.4", "qs": "^6.9.4",
"regenerator-runtime": "^0.14.0",
"sass-resources-loader": "^2.1.1", "sass-resources-loader": "^2.1.1",
"stompjs": "^2.3.3", "stompjs": "^2.3.3",
"svg-baker-runtime": "^1.4.7",
"viewerjs": "^1.9.0", "viewerjs": "^1.9.0",
"vue": "2.6.10", "vue": "2.6.10",
"vue-amap": "^0.5.10", "vue-amap": "^0.5.10",
"vue-router": "3.0.6", "vue-router": "3.0.6",
"vue-stomp": "^0.0.5", "vue-stomp": "^0.0.5",
"vue-style-loader": "^4.1.3",
"vuex": "3.1.0", "vuex": "3.1.0",
"vuex-persistedstate": "^4.0.0", "vuex-persistedstate": "^4.0.0",
"web-control": "^1.0.2", "web-control": "^1.0.2",

4
src/layout/components/Sidebar/index.vue
View File

@ -121,7 +121,7 @@ export default {
component: "zhiwujiance", component: "zhiwujiance",
meta: { meta: {
icon: "icon-renlianshibie", icon: "icon-renlianshibie",
title: "质物监测", title: "货堆监测",
}, },
name: "", name: "",
path: "/zhiwujiance/zhiwujianceList", path: "/zhiwujiance/zhiwujianceList",
@ -130,7 +130,7 @@ export default {
// component: "index", // component: "index",
// meta: { // meta: {
// icon: "el-icon-help", // icon: "el-icon-help",
// title: "质物监测", // title: "货堆监测",
// }, // },
// name: "/zhiwujiance/zhiwujianceList", // name: "/zhiwujiance/zhiwujianceList",
// path: "/zhiwujiance/zhiwujianceList", // path: "/zhiwujiance/zhiwujianceList",

2
src/layout/index.vue
View File

@ -11,7 +11,7 @@
<div class="main-container"> <div class="main-container">
<div class="home-box"> <div class="home-box">
<a href="javascript:window.opener=null;window.open('','_self');window.close();" class="text-center">平台首页</a> <a href="javascript:window.opener=null;window.open('','_self');window.close();" class="text-center">平台首页</a>
<a href="javascript:void(0);" class="text-center">监控中心</a> <a href="javascript:void(0);" class="text-center">仓库安防</a>
</div> </div>
<sidebar class="sidebar-container" /> <sidebar class="sidebar-container" />
<!--菜单--> <!--菜单-->

10
src/router/index.js
View File

@ -280,13 +280,13 @@ export const constantRoutes = [
}, },
], ],
}, },
////质物监测 ////货堆监测
{ {
path: "/zhiwujianceList", path: "/zhiwujianceList",
component: Layout, component: Layout,
redirect: "/zhiwujiance/zhiwujianceList", redirect: "/zhiwujiance/zhiwujianceList",
meta: { meta: {
title: "质物监测", title: "货堆监测",
}, },
children: [ children: [
{ {
@ -294,7 +294,7 @@ export const constantRoutes = [
component: () => import("@/views/zhiwujiance/zhiwujianceList.vue"), component: () => import("@/views/zhiwujiance/zhiwujianceList.vue"),
name: "zhiwujianceList", name: "zhiwujianceList",
meta: { meta: {
title: "质物监测", title: "货堆监测",
noCache: true, noCache: true,
}, },
}, },
@ -305,7 +305,7 @@ export const constantRoutes = [
component: Layout, component: Layout,
redirect: "/renlianshibie/renlianshibieList", redirect: "/renlianshibie/renlianshibieList",
meta: { meta: {
title: "质物监测", title: "货堆监测",
}, },
children: [ children: [
{ {
@ -313,7 +313,7 @@ export const constantRoutes = [
component: () => import("@/views/renlianshibie/renlianshibieList.vue"), component: () => import("@/views/renlianshibie/renlianshibieList.vue"),
name: "renlianshibieList", name: "renlianshibieList",
meta: { meta: {
title: "质物监测", title: "货堆监测",
noCache: true, noCache: true,
}, },
}, },

4
src/views/renlianshibie/renlianshibieList.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div v-show="viewState == 1"> <div v-show="viewState == 1">
<button-bar view-title="质物监测" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/> <button-bar view-title="货堆监测" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content"> <div class="main-content">
<!-- <div class="tops"> <!-- <div class="tops">
@ -74,7 +74,7 @@
</div> </div>
</div> </div>
<div class="listtop"> <div class="listtop">
<div class="tit">质物监测信息列表</div> <div class="tit">货堆监测信息列表</div>
<!-- 翻页分页 --> <!-- 翻页分页 -->
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/> <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div> </div>

2
src/views/zhiwujiance/zhiwujianceInfo.vue
View File

@ -10,7 +10,7 @@
<div class="listconadd"> <div class="listconadd">
<el-form ref="form_obj" :model="infoForm" :rules="rules" class="formadd"> <el-form ref="form_obj" :model="infoForm" :rules="rules" class="formadd">
<div class="title"> <div class="title">
<div>质物监测详情信息</div> <div>货堆监测详情信息</div>
</div> </div>
<el-row> <el-row>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">

99
src/views/zhiwujiance/zhiwujianceList.vue
View File

@ -1,8 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="app-containerb" v-show="viewState == 1"> <div v-show="viewState == 1">
<div class="webye"> <button-bar view-title="货堆监测" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<button-bar view-title="质物监测" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<div class="main-content"> <div class="main-content">
<div class="searchcon"> <div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button> <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
@ -29,7 +28,7 @@
</div> </div>
</div> </div>
<div class="listtop"> <div class="listtop">
<div class="tit">质物监测信息列表</div> <div class="tit">货堆监测信息列表</div>
<!-- 翻页分页 --> <!-- 翻页分页 -->
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" <!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" /> --> :limit.sync="listQuery.size" class="pagination" @pagination="getList" /> -->
@ -39,40 +38,57 @@
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50" /> <el-table-column type="selection" align="center" width="50" />
<el-table-column label="序号" fixed type="index" width="80" :index="indexMethod" align="center" /> <el-table-column label="序号" fixed type="index" width="80" :index="indexMethod" align="center" />
<el-table-column prop="jc" width="320" label="质物信息" header-align="center" align="center"> <el-table-column label="仓库名称" min-width="150" align="center" prop="wareHouseName" />
<el-table-column label="摄像头名称" min-width="180" align="center" prop="name" />
<el-table-column label="模板拍照时间" width="180" align="center" prop="createTime" />
<el-table-column prop="jc" label="图片" width="200" header-align="center" align="center">
<template slot-scope="{row}"> <template slot-scope="{row}">
<div class="newsname">
<div class="tit">仓库名称：{{ row.wareHouseName }}</div> <div class="newsli">
<div class="time">仓库位置：{{ row.wareHouseAddress }}</div> <div class="tu"><img :src="fileUrl + row.imgBefore" alt="" /></div>
<!-- <div class="time">货架号：{{ item.huohao }}</div> --> </div>
<div class="time">联系人：{{ row.linkerName }}</div> <!-- <div class="newsli">
<div class="time">联系电话：{{ row.linkerPhone }}</div> <div class="tu"><img :src="fileUrl + row.imgAfter" alt="" /></div>
</div> <div class="rightwen">
<div class="time" style="margin-top:10%">拍照时间：{{ row.modifyTime }}</div>
</div>
</div> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="jc" label="相似度对比" header-align="center" align="center"> <el-table-column prop="jc" label="相似度对比" width="200" header-align="center" align="center">
<template slot-scope="{row}"> <template slot-scope="{row}">
<div>
<div class="newslilefts"> <!-- <div class="newsli">
<div class="newsli">
<div class="tu"><img :src="fileUrl + row.imgBefore" alt="" /></div> <div class="tu"><img :src="fileUrl + row.imgBefore" alt="" /></div>
<div class="rightwen"> <div class="rightwen">
<div class="time" style="margin-top:10%">拍照时间：{{ row.createTime }}</div> <div class="time" style="margin-top:10%">拍照时间：{{ row.createTime }}</div>
</div> </div>
</div> </div> -->
<div class="yuans"> <div class="yuans">
<p>{{ row.similarity }}</p><span>相似度</span> <p>{{ row.similarity }}</p>
</div> </div>
<div class="newsli"> <!-- <div class="newsli">
<div class="tu"><img :src="fileUrl + row.imgAfter" alt="" /></div> <div class="tu"><img :src="fileUrl + row.imgAfter" alt="" /></div>
<div class="rightwen"> <div class="rightwen">
<div class="time" style="margin-top:10%">拍照时间：{{ row.modifyTime }}</div> <div class="time" style="margin-top:10%">拍照时间：{{ row.modifyTime }}</div>
</div> </div>
</div> -->
</template>
</el-table-column>
<el-table-column prop="jc" label="图片" width="200" header-align="center" align="center">
<template slot-scope="{row}">
<div class="newsli">
<div class="tu"><img :src="fileUrl + row.imgAfter" alt="" /></div>
</div> </div>
</div> <!-- <div class="newsli">
</div> <div class="tu"><img :src="fileUrl + row.imgAfter" alt="" /></div>
<div class="rightwen">
<div class="time" style="margin-top:10%">拍照时间：{{ row.modifyTime }}</div>
</div>
</div> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="对比拍照时间" width="200" align="center" prop="modifyTime" />
<el-table-column label="操作" align="center" width="220px" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="220px" class-name="small-padding fixed-width">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button size="mini" type="primary" @click="getVedioPcLive(row)">视频</el-button> <el-button size="mini" type="primary" @click="getVedioPcLive(row)">视频</el-button>
@ -86,7 +102,6 @@
:limit.sync="listQuery.size" class="pagination" @pagination="getList" /> :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div> </div>
</div> </div>
</div>
</div> </div>
<!-- 查看视频 --> <!-- 查看视频 -->
<el-dialog title="查看视频" :visible.sync="dialogImage" width="800px" :before-close="handleClose"> <el-dialog title="查看视频" :visible.sync="dialogImage" width="800px" :before-close="handleClose">
@ -442,20 +457,11 @@ export default {
text-align: left; text-align: left;
} }
/* ///// */
.newslilefts {
display: flex;
flex-direction: row;
flex-wrap: nowrap;
justify-content: flex-start;
align-items: center;
}
/* .news .contents .newslis .tits{padding: 0;width: 20px;color: #8e8e8e;} */ /* .news .contents .newslis .tits{padding: 0;width: 20px;color: #8e8e8e;} */
/* /*
.news .contents .newslis .rentu{padding: 0;width: 80px;height: 80px;border-radius: 5px;border: 1px solid #ff2424;margin: 0 20px;} */ .news .contents .newslis .rentu{padding: 0;width: 80px;height: 80px;border-radius: 5px;border: 1px solid #ff2424;margin: 0 20px;} */
.newslilefts .yuans { .yuans {
padding: 0; padding: 0;
margin: 0 20px; margin: 0 20px;
width: 80px; width: 80px;
@ -466,14 +472,13 @@ export default {
display: inline-block; display: inline-block;
} }
.newslilefts .yuans p { .yuans p {
padding: 23px 0 10px 0; padding: 32px 0 10px 0;
color: #ff2424; color: #ff2424;
font-size: 26px; font-size: 26px;
margin: 0; margin: 0;
} }
.yuans span {
.newslilefts .yuans span {
padding: 0; padding: 0;
margin: 0; margin: 0;
color: #8e8e8e; color: #8e8e8e;
@ -483,38 +488,34 @@ export default {
/* .news .contents .newslis .rightzi{padding: 0 10px;color: #8e8e8e;text-align: left;} /* .news .contents .newslis .rightzi{padding: 0 10px;color: #8e8e8e;text-align: left;}
.news .contents .newslis .rightzi p{padding: 1px 0;color: #8e8e8e;font-size: 12px;margin: 0;} */ .news .contents .newslis .rightzi p{padding: 1px 0;color: #8e8e8e;font-size: 12px;margin: 0;} */
.newslilefts .newsli { .newsli {
display: flex; margin: 0px auto;
flex-direction: row;
flex-wrap: nowrap;
justify-content: space-between;
margin: 0px 0px;
padding: 5px 10px; padding: 5px 10px;
/* border-bottom: 1px solid #ececee; */ /* border-bottom: 1px solid #ececee; */
} }
.newslilefts .newsli .tu { .newsli .tu {
padding: 0px 0 0 0; padding: 0px 0 0 0;
width: 120px; width: 160px;
height: 120px; height: 90px;
border-radius: 5px; border-radius: 5px;
border: 1px solid #ff2424; border: 1px solid #ff2424;
} }
.newslilefts .newsli .tu img { .newsli .tu img {
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 5px; border-radius: 5px;
border: 1px solid #ff2424; border: 1px solid #ff2424;
} }
.newslilefts .newsli .rightwen { .newsli .rightwen {
padding: 20px 0 0 20px; padding: 20px 0 0 20px;
text-align: left; text-align: left;
flex: 3; flex: 3;
} }
.newslilefts .newsli .rightwen .tit { .newsli .rightwen .tit {
padding: 7px 0; padding: 7px 0;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
@ -523,7 +524,7 @@ export default {
line-height: 25px; */ line-height: 25px; */
} }
.newslilefts .newsli .rightwen .time { .newsli .rightwen .time {
padding: 12px 0; padding: 12px 0;
/* color: #848383; */ /* color: #848383; */
font-size: 14px; font-size: 14px;

Write Preview
Loading…
Cancel
Save