+
@@ -89,8 +92,7 @@
:pagination="false"
bordered
size="middle"
- :scroll="{ y: 480 }"
- >
+ :scroll="{ y: 480 }">
凭证
@@ -111,12 +113,15 @@
-
+
+ {{ text || '-' }}
+
@@ -138,8 +143,7 @@
v-model:value="searchcategoryConfig"
placeholder="请输入类别名称"
style="width: 250px"
- @search="onSearch"
- />
+ @search="onSearch" />
+ :wrapper-col="wrapperCol">
@@ -188,10 +191,7 @@
-
+
{{ item.cnValue }}
@@ -220,8 +220,7 @@
:body-style="{ paddingBottom: '80px' }"
:footer-style="{ textAlign: 'right' }"
destroyOnClose
- @close="onCloseVoucher"
- >
+ @close="onCloseVoucher">
+ @close="onCloseEditData">
-
-
-
-
- 自行推估
- 定期量测
- 自动测量
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ :wrapper-col="wrapperCol">
+
+
+
+
+ 自行推估
+ 定期量测
+ 自动测量
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -321,8 +322,7 @@
name="file"
action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
:headers="headers"
- @change="handleChange"
- >
+ @change="handleChange">
点击上传凭证
@@ -333,20 +333,29 @@
确定
-
@@ -1353,11 +1436,11 @@
display: flex;
flex-direction: column;
- .top{
+ .top {
position: relative;
height: 80%;
margin-bottom: 20px;
- .ns-form-title{
+ .ns-form-title {
font-weight: bold;
user-select: text;
padding: 16px;
@@ -1365,7 +1448,7 @@
padding-bottom: 10px;
border-bottom: 1px solid #e9e9e9;
}
- .title{
+ .title {
text-align: left;
height: 32px;
line-height: 32px;
@@ -1383,13 +1466,13 @@
height: 13px;
width: 3px;
border-radius: 1px;
- background-color: #2778FF;
+ background-color: #2778ff;
}
}
- .bottom{
+ .bottom {
position: relative;
height: 20%;
- .ns-form-title{
+ .ns-form-title {
font-weight: bold;
user-select: text;
padding: 16px;
@@ -1397,7 +1480,7 @@
padding-bottom: 10px;
border-bottom: 1px solid #e9e9e9;
}
- .title{
+ .title {
text-align: left;
height: 32px;
line-height: 32px;
@@ -1415,17 +1498,17 @@
height: 13px;
width: 3px;
border-radius: 1px;
- background-color: #2778FF;
+ background-color: #2778ff;
}
- .button>div{
+ .button > div {
height: 3vh;
display: flex;
align-items: center;
}
- .pftj{
+ .pftj {
background: #c9e4ff;
}
- .tplx{
+ .tplx {
background: #c9e4ff;
}
}
@@ -1446,7 +1529,7 @@
width: 92%;
margin-bottom: @ns-gap;
}
- .mainLeft{
+ .mainLeft {
width: 19%;
margin-right: 1%;
border-right: 1px solid #f2f2f2;
@@ -1466,26 +1549,26 @@
}
}
}
- .addTreeNode{
+ .addTreeNode {
width: 100%;
padding: 16px;
position: absolute;
bottom: 0;
}
}
- .mainRight{
+ .mainRight {
width: 80%;
}
}
-
- .search{
+
+ .search {
width: 70%;
height: 5vh;
display: flex;
align-items: center;
margin-left: 10%;
}
- .treePart{
+ .treePart {
width: 70%;
height: 100%;
display: flex;
@@ -1493,4 +1576,4 @@
margin-left: 10%;
flex-direction: column;
}
-
\ No newline at end of file
+
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
index dd346e1..a58a17e 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
@@ -20,8 +20,7 @@
:model="formState"
:rules="rules"
:label-col="labelCol"
- :wrapper-col="wrapperCol"
- >
+ :wrapper-col="wrapperCol">
@@ -38,7 +37,10 @@
-
+
@@ -49,7 +51,7 @@
-
\ No newline at end of file
+
diff --git a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue
index b9b21c4..c6705cc 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue
@@ -1,53 +1,47 @@
diff --git a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue
index 3b63442..d6e50fd 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue
@@ -10,7 +10,7 @@
-
+
@@ -21,7 +21,7 @@
-
+
@@ -32,7 +32,7 @@
-
+
@@ -43,109 +43,104 @@
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
index adb4b68..e03748d 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
@@ -1,273 +1,276 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue
index c9f361a..1f941b4 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue
@@ -1,59 +1,59 @@
-
-
-
-
-
-
-
{{ result.name }}
-
-
-
-
-
-
-
控制模式
-
自动
-
-
-
-
亮度
-
{{ result.brightness }}
-
-
-
-
控制场景
-
{{ result.automatic2 }}
-
-
-
-
色温
-
{{ result.brightness3 }}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
{{ result.name }}
+
+
-
+
+
+
+
控制模式
+
自动
+
+
+
+
亮度
+
{{ result.brightness }}
+
+
+
+
控制场景
+
{{ result.automatic2 }}
+
+
+
+
色温
+
{{ result.brightness3 }}
+
+
+
+
+
+
-
+
-
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
index 9cd93e4..a370239 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
@@ -5,15 +5,21 @@
照明区域
-
-
+
{{ button.name }}
@@ -21,8 +27,11 @@
-
+
{{ button.name }}
@@ -37,13 +46,20 @@
照明回路
-
+
{{ isPlanEnabled2 ? '启用面板' : '禁用面板' }}
-
+
全选
{{ singleSelection ? '多选' : '单选' }}
@@ -52,8 +68,12 @@
-
+
{{ button.name }}
@@ -62,8 +82,12 @@
-
+
{{ button.name }}
@@ -81,37 +105,42 @@
-
+
{{ button3.label }}
-
+
-
-
+
+
{{ button4.label }}
-
+ @cancel="changeCancel">
刷新
执行
@@ -129,7 +158,11 @@
-
{{ item.name }}
+
{{ item.name }}
撤销
@@ -143,9 +176,7 @@
-
- 亮度
-
+
亮度
100lux
@@ -153,9 +184,7 @@
-
- 控制场景
-
+
控制场景
手动
@@ -163,9 +192,7 @@
-
- 色温
-
+
色温
4000k
@@ -176,7 +203,7 @@
-
+
-
+