wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
wuhongjian 2022-07-13 18:16:12 +08:00
parent 39a93eefc6 7f2f5e541b
commit 21a5d058ef
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
front/public/index.html
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-03-29 16:45:25 * @Date: 2022-03-29 16:45:25
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-13 18:01:36 * @LastEditTime: 2022-07-13 18:15:32
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!DOCTYPE html> <!DOCTYPE html>

5
front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-06-17 14:11:08 * @Date: 2022-06-17 14:11:08
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-01 20:34:36 * @LastEditTime: 2022-07-13 18:14:42
* @Description: 上架 * @Description: 上架
--> -->
<template> <template>
@ -461,6 +461,7 @@
}) })
} }
const ApplicationArea = (item, itemson) => { const ApplicationArea = (item, itemson) => {
console.log('点击=========》', item, itemson)
// console.log(item, itemson) // console.log(item, itemson)
if (item.note2.indexOf(itemson.dictLabel) === -1) { if (item.note2.indexOf(itemson.dictLabel) === -1) {
item.note2.push(itemson.dictLabel) item.note2.push(itemson.dictLabel)
@ -568,7 +569,7 @@
delFlag: 0, delFlag: 0,
}) })
} else { } else {
if (val.name !== '应用领域') { if (val.name !== '应用领域' && val.name !== '发布端') {
mybus.emit('chageDataFrom', { mybus.emit('chageDataFrom', {
attrType: val.name, attrType: val.name,
attrValue: val.note1, attrValue: val.note1,

2
front/src/views/home/apply.vue
View File

@ -423,7 +423,7 @@
item.note1 = JSON.parse(item.note1) item.note1 = JSON.parse(item.note1)
item.note1.map((sxt) => { item.note1.map((sxt) => {
obj.system.push({ obj.system.push({
resourceId: sxt.idtCameraChannel, resourceId: sxt.idtCameraChannel + '',
resourceName: sxt.channelName, resourceName: sxt.channelName,
cameraId: sxt.channelId, cameraId: sxt.channelId,
}) })