bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

页面修改

This commit is contained in:
zzyuan 2025-09-28 09:16:19 +08:00
parent 9b2a0f5d61
commit 597ae9277c
7 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/canteen/dish/material/components/MaterialDialog.vue
View File

@ -127,7 +127,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="营养信息" prop="nutritionId"> <el-form-item label="营养信息" prop="nutritionId">
<el-select v-model="form.nutritionId" placeholder="请选择营养信息" style="width: 100%" clearable @change="chosenNutrition"> <el-select v-model="form.nutritionId" placeholder="请选择营养信息" filterable style="width: 100%" clearable @change="chosenNutrition">
<el-option v-for="item in this.nutritionOptions" <el-option v-for="item in this.nutritionOptions"
:key="item.nutritionId" :key="item.nutritionId"
:label="item.nutritionName" :label="item.nutritionName"

6
src/views/kitchen/devicesManage/deviesInfo/index.vue
View File

@ -79,7 +79,7 @@
/> />
<!-- 添加或修改参数配置对话框 --> <!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body> <el-dialog :title="title+deviceTypeName" :visible.sync="open" width="900px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
@ -296,6 +296,7 @@ export default {
treeOptions:[], //区域 treeOptions:[], //区域
canteenOptions: [], canteenOptions: [],
subPlaceOptions: [], subPlaceOptions: [],
deviceTypeName:"摄像头",
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
@ -307,7 +308,7 @@ export default {
keyWord: undefined, keyWord: undefined,
deviceNetworkState: null deviceNetworkState: null
}, },
activeName:"1", activeName:1,
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
@ -398,6 +399,7 @@ export default {
}, },
handleTabClick(tab, event) { handleTabClick(tab, event) {
console.log(tab.name,tab.label) console.log(tab.name,tab.label)
this.deviceTypeName = tab.label
this.handleQuery() this.handleQuery()
}, },
/** 查询列表 */ /** 查询列表 */

6
src/views/kitchen/environment/alarmRecord/index.vue
View File

@ -14,10 +14,10 @@
<el-form-item label="设备类型" prop="deviceType5" v-if="activeName==5"> <el-form-item label="设备类型" prop="deviceType5" v-if="activeName==5">
<el-select v-model="queryParams.deviceType5" style="width: 240px" clearable> <el-select v-model="queryParams.deviceType5" style="width: 240px" clearable>
<el-option label="传感器" value="2"></el-option> <el-option label="传感器" value="2"></el-option>
<el-option label="气体检测仪" value="13"></el-option> <!-- <el-option label="气体检测仪" value="13"></el-option> -->
<el-option label="温湿度传感器" value="14"></el-option> <el-option label="温湿度传感器" value="14"></el-option>
<el-option label="烟雾检测传感器 " value="15"></el-option> <!-- <el-option label="烟雾检测传感器 " value="15"></el-option> -->
<el-option label="水浸检测传感器 " value="22"></el-option> <!-- <el-option label="水浸检测传感器 " value="22"></el-option> -->
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备类型" prop="deviceType6" v-if="activeName==6"> <el-form-item label="设备类型" prop="deviceType6" v-if="activeName==6">

2
src/views/kitchen/environment/environmentMonitor/index.vue
View File

@ -11,7 +11,7 @@
<el-option label="温度过低" value="3"></el-option> <el-option label="温度过低" value="3"></el-option>
<el-option label="湿度过高" value="4"></el-option> <el-option label="湿度过高" value="4"></el-option>
<el-option label="湿度过低" value="5"></el-option> <el-option label="湿度过低" value="5"></el-option>
<el-option label="烟雾浓度过高" value="6"></el-option> <!-- <el-option label="烟雾浓度过高" value="6"></el-option> -->
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>

12
src/views/kitchen/environment/videoMonitoring/history.vue
View File

@ -90,10 +90,10 @@ methods:{
iframeLogin(domId){ iframeLogin(domId){
var oLiveView = { var oLiveView = {
iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https
szIP: "192.168.1.10", // protocol ip szIP: "192.168.20.32", // protocol ip
szPort: "80", // protocol port szPort: "80", // protocol port
szUsername: "admin", // device username szUsername: "admin", // device username
szPassword: "hzx12345", // device password szPassword: "JYY202509", // device password
iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream
iChannelID: 1, // channel no iChannelID: 1, // channel no
bZeroChannel: false // zero channel bZeroChannel: false // zero channel
@ -129,10 +129,10 @@ methods:{
iframeLogout(domId){ iframeLogout(domId){
var oLiveView = { var oLiveView = {
iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https
szIP: "192.168.1.10", // protocol ip szIP: "192.168.20.32", // protocol ip
szPort: "80", // protocol port szPort: "80", // protocol port
szUsername: "admin", // device username szUsername: "admin", // device username
szPassword: "hzx12345", // device password szPassword: "JYY202509", // device password
iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream
iChannelID: 1, // channel no iChannelID: 1, // channel no
bZeroChannel: false // zero channel bZeroChannel: false // zero channel
@ -161,10 +161,10 @@ methods:{
iframeLoaded2(){ iframeLoaded2(){
var oLiveView = { var oLiveView = {
iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https
szIP: "192.168.1.10", // protocol ip szIP: "192.168.20.32", // protocol ip
szPort: "80", // protocol port szPort: "80", // protocol port
szUsername: "admin", // device username szUsername: "admin", // device username
szPassword: "hzx12345", // device password szPassword: "JYY202509", // device password
iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream
iChannelID: 1, // channel no iChannelID: 1, // channel no
bZeroChannel: false // zero channel bZeroChannel: false // zero channel

23
src/views/kitchen/environment/videoMonitoring/index.vue
View File

@ -68,10 +68,10 @@ methods:{
iframeLogin(domId){ iframeLogin(domId){
var oLiveView = { var oLiveView = {
iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https
szIP: "192.168.1.10", // protocol ip szIP: "192.168.20.32", // protocol ip
szPort: "80", // protocol port szPort: "80", // protocol port
szUsername: "admin", // device username szUsername: "admin", // device username
szPassword: "hzx12345", // device password szPassword: "JYY202509", // device password
iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream
iChannelID: 1, // channel no iChannelID: 1, // channel no
bZeroChannel: false // zero channel bZeroChannel: false // zero channel
@ -86,32 +86,33 @@ methods:{
oWebVideoCtrl1.I_InsertOBJECTPlugin("divPlugin"); oWebVideoCtrl1.I_InsertOBJECTPlugin("divPlugin");
oWebVideoCtrl1.I_Login(oLiveView.szIP,oLiveView.iProtocol, oLiveView.szPort, oLiveView.szUsername, oLiveView.szPassword, { oWebVideoCtrl1.I_Login(oLiveView.szIP,oLiveView.iProtocol, oLiveView.szPort, oLiveView.szUsername, oLiveView.szPassword, {
success: function (xmlDoc) { success: function (xmlDoc) {
console.log("success",xmlDoc)
oWebVideoCtrl1.I_StartRealPlay(szDeviceIdentify, { oWebVideoCtrl1.I_StartRealPlay(szDeviceIdentify, {
iRtspPort: oLiveView.szPort, iRtspPort: oLiveView.szPort,
iWndIndex:0, iWndIndex:0,
iStreamType: oLiveView.iStreamType, iStreamType: oLiveView.iStreamType,
iChannelID: 15, iChannelID: 1,
bZeroChannel: oLiveView.bZeroChannel bZeroChannel: oLiveView.bZeroChannel
}); });
oWebVideoCtrl1.I_StartRealPlay(szDeviceIdentify, { oWebVideoCtrl1.I_StartRealPlay(szDeviceIdentify, {
iRtspPort: oLiveView.szPort, iRtspPort: oLiveView.szPort,
iWndIndex:1, iWndIndex:1,
iStreamType: oLiveView.iStreamType, iStreamType: oLiveView.iStreamType,
iChannelID: 16, iChannelID: 2,
bZeroChannel: oLiveView.bZeroChannel bZeroChannel: oLiveView.bZeroChannel
}); });
oWebVideoCtrl1.I_StartRealPlay(szDeviceIdentify, { oWebVideoCtrl1.I_StartRealPlay(szDeviceIdentify, {
iRtspPort: oLiveView.szPort, iRtspPort: oLiveView.szPort,
iWndIndex:2, iWndIndex:2,
iStreamType: oLiveView.iStreamType, iStreamType: oLiveView.iStreamType,
iChannelID: 21, iChannelID: 1,
bZeroChannel: oLiveView.bZeroChannel bZeroChannel: oLiveView.bZeroChannel
}); });
oWebVideoCtrl1.I_StartRealPlay(szDeviceIdentify, { oWebVideoCtrl1.I_StartRealPlay(szDeviceIdentify, {
iRtspPort: oLiveView.szPort, iRtspPort: oLiveView.szPort,
iWndIndex:3, iWndIndex:3,
iStreamType: oLiveView.iStreamType, iStreamType: oLiveView.iStreamType,
iChannelID: 22, iChannelID: 2,
bZeroChannel: oLiveView.bZeroChannel bZeroChannel: oLiveView.bZeroChannel
}); });
} }
@ -136,11 +137,11 @@ methods:{
iframeLogout(domId){ iframeLogout(domId){
var oLiveView = { var oLiveView = {
iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https
szIP: "192.168.1.10", // protocol ip szIP: "192.168.20.32", // protocol ip
szPort: "80", // protocol port szPort: "80", // protocol port
szUsername: "admin", // device username szUsername: "admin", // device username
szPassword: "hzx12345", // device password szPassword: "JYY202509", // device password
iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream iStreamType: 1, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream
iChannelID: 1, // channel no iChannelID: 1, // channel no
bZeroChannel: false // zero channel bZeroChannel: false // zero channel
} }
@ -169,10 +170,10 @@ methods:{
iframeLoaded(WinNo,Channel){ iframeLoaded(WinNo,Channel){
var oLiveView = { var oLiveView = {
iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https
szIP: "192.168.1.10", // protocol ip szIP:"192.168.20.32", // protocol ip
szPort:"80", // protocol port szPort:"80", // protocol port
szUsername:"admin", // device username szUsername:"admin", // device username
szPassword: "hzx12345", // device password szPassword:"JYY202509", // device password
iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream
iChannelID: 1, // channel no iChannelID: 1, // channel no
bZeroChannel: false // zero channel bZeroChannel: false // zero channel

16
src/views/kitchen/environment/videoMonitoring/temp.vue
View File

@ -108,10 +108,10 @@ methods:{
iframeLogin(domId){ iframeLogin(domId){
var oLiveView = { var oLiveView = {
iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https
szIP: "192.168.1.10", // protocol ip szIP: "192.168.20.32", // protocol ip
szPort: "80", // protocol port szPort: "80", // protocol port
szUsername: "admin", // device username szUsername: "admin", // device username
szPassword: "hzx12345", // device password szPassword: "JYY202509", // device password
iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream
iChannelID: 1, // channel no iChannelID: 1, // channel no
bZeroChannel: false // zero channel bZeroChannel: false // zero channel
@ -202,10 +202,10 @@ methods:{
iframeLogout(domId){ iframeLogout(domId){
var oLiveView = { var oLiveView = {
iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https
szIP: "192.168.1.10", // protocol ip szIP: "192.168.20.32", // protocol ip
szPort: "80", // protocol port szPort: "80", // protocol port
szUsername: "admin", // device username szUsername: "admin", // device username
szPassword: "hzx12345", // device password szPassword: "JYY202509", // device password
iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream
iChannelID: 1, // channel no iChannelID: 1, // channel no
bZeroChannel: false // zero channel bZeroChannel: false // zero channel
@ -260,10 +260,10 @@ methods:{
console.log(Channel) console.log(Channel)
var oLiveView = { var oLiveView = {
iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https
szIP: "192.168.1.10", // protocol ip szIP: "192.168.20.32", // protocol ip
szPort: "80", // protocol port szPort: "80", // protocol port
szUsername: "admin", // device username szUsername: "admin", // device username
szPassword: "hzx12345", // device password szPassword: "JYY202509", // device password
iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream
iChannelID: 1, // channel no iChannelID: 1, // channel no
bZeroChannel: false // zero channel bZeroChannel: false // zero channel
@ -297,10 +297,10 @@ methods:{
iframeLoaded2(Channel){ iframeLoaded2(Channel){
var oLiveView = { var oLiveView = {
iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https iProtocol: 1, // protocol 1<EFBFBD><EFBFBD>http, 2:https
szIP: "192.168.1.10", // protocol ip szIP: "192.168.20.32", // protocol ip
szPort: "80", // protocol port szPort: "80", // protocol port
szUsername: "admin", // device username szUsername: "admin", // device username
szPassword: "hzx12345", // device password szPassword: "JYY202509", // device password
iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream iStreamType: 2, // stream 1<EFBFBD><EFBFBD>main stream 2<EFBFBD><EFBFBD>sub-stream 3<EFBFBD><EFBFBD>third stream 4<EFBFBD><EFBFBD>transcode stream
iChannelID: 1, // channel no iChannelID: 1, // channel no
bZeroChannel: false // zero channel bZeroChannel: false // zero channel