diff --git a/src/assets/iconfonts/iconfont.css b/src/assets/iconfonts/iconfont.css
index f903852..5a0b2ca 100644
--- a/src/assets/iconfonts/iconfont.css
+++ b/src/assets/iconfonts/iconfont.css
@@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 3409379 */
- src: url('iconfont.woff2?t=1657517549703') format('woff2'),
- url('iconfont.woff?t=1657517549703') format('woff'),
- url('iconfont.ttf?t=1657517549703') format('truetype');
+ src: url('iconfont.woff2?t=1658129042026') format('woff2'),
+ url('iconfont.woff?t=1658129042026') format('woff'),
+ url('iconfont.ttf?t=1658129042026') format('truetype');
}
.iconfont {
@@ -13,6 +13,42 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-zhenglishi:before {
+ content: "\e63c";
+}
+
+.icon-shebeizhuangtai:before {
+ content: "\e63d";
+}
+
+.icon-loushuijiance:before {
+ content: "\e63e";
+}
+
+.icon-loushuibaojing:before {
+ content: "\e63f";
+}
+
+.icon-loushuiweizhi:before {
+ content: "\e640";
+}
+
+.icon-weihubaojing:before {
+ content: "\e641";
+}
+
+.icon-kongqizhiliangshuju:before {
+ content: "\e642";
+}
+
+.icon-ganyingxianduanlie:before {
+ content: "\e643";
+}
+
+.icon-chuku-fanbai:before {
+ content: "\e63b";
+}
+
.icon-danganzongliang:before {
content: "\e636";
}
diff --git a/src/assets/iconfonts/iconfont.js b/src/assets/iconfonts/iconfont.js
index cbe678b..053bc0d 100644
--- a/src/assets/iconfonts/iconfont.js
+++ b/src/assets/iconfonts/iconfont.js
@@ -1 +1 @@
-!function(c){var l,h,a,i,z,m='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),F=function(c,l){l.parentNode.insertBefore(c,l)};if(t&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function o(){z||(z=!0,a())}function v(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(v,50)}o()}l=function(){var c,l=document.createElement("div");l.innerHTML=m,m=null,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(c=document.body).firstChild?F(l,c.firstChild):c.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(h=function(){document.removeEventListener("DOMContentLoaded",h,!1),l()},document.addEventListener("DOMContentLoaded",h,!1)):document.attachEvent&&(a=l,i=c.document,z=!1,v(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,o())})}(window);
\ No newline at end of file
+!function(c){var l,h,a,i,z,m='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),F=function(c,l){l.parentNode.insertBefore(c,l)};if(t&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function o(){z||(z=!0,a())}function v(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(v,50)}o()}l=function(){var c,l=document.createElement("div");l.innerHTML=m,m=null,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(c=document.body).firstChild?F(l,c.firstChild):c.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(h=function(){document.removeEventListener("DOMContentLoaded",h,!1),l()},document.addEventListener("DOMContentLoaded",h,!1)):document.attachEvent&&(a=l,i=c.document,z=!1,v(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,o())})}(window);
\ No newline at end of file
diff --git a/src/assets/iconfonts/iconfont.json b/src/assets/iconfonts/iconfont.json
index db47904..dc34c33 100644
--- a/src/assets/iconfonts/iconfont.json
+++ b/src/assets/iconfonts/iconfont.json
@@ -5,6 +5,69 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
+ {
+ "icon_id": "30660167",
+ "name": "整理室",
+ "font_class": "zhenglishi",
+ "unicode": "e63c",
+ "unicode_decimal": 58940
+ },
+ {
+ "icon_id": "30660168",
+ "name": "设备状态",
+ "font_class": "shebeizhuangtai",
+ "unicode": "e63d",
+ "unicode_decimal": 58941
+ },
+ {
+ "icon_id": "30660169",
+ "name": "漏水检测",
+ "font_class": "loushuijiance",
+ "unicode": "e63e",
+ "unicode_decimal": 58942
+ },
+ {
+ "icon_id": "30660170",
+ "name": "漏水报警",
+ "font_class": "loushuibaojing",
+ "unicode": "e63f",
+ "unicode_decimal": 58943
+ },
+ {
+ "icon_id": "30660171",
+ "name": "漏水位置",
+ "font_class": "loushuiweizhi",
+ "unicode": "e640",
+ "unicode_decimal": 58944
+ },
+ {
+ "icon_id": "30660173",
+ "name": "维护报警",
+ "font_class": "weihubaojing",
+ "unicode": "e641",
+ "unicode_decimal": 58945
+ },
+ {
+ "icon_id": "30660174",
+ "name": "空气质量数据",
+ "font_class": "kongqizhiliangshuju",
+ "unicode": "e642",
+ "unicode_decimal": 58946
+ },
+ {
+ "icon_id": "30660264",
+ "name": "感应线断裂",
+ "font_class": "ganyingxianduanlie",
+ "unicode": "e643",
+ "unicode_decimal": 58947
+ },
+ {
+ "icon_id": "30627119",
+ "name": "出库-反白",
+ "font_class": "chuku-fanbai",
+ "unicode": "e63b",
+ "unicode_decimal": 58939
+ },
{
"icon_id": "30271220",
"name": "档案总量",
diff --git a/src/assets/iconfonts/iconfont.ttf b/src/assets/iconfonts/iconfont.ttf
index 065361f..0432d41 100644
Binary files a/src/assets/iconfonts/iconfont.ttf and b/src/assets/iconfonts/iconfont.ttf differ
diff --git a/src/assets/iconfonts/iconfont.woff b/src/assets/iconfonts/iconfont.woff
index f0847ff..026836b 100644
Binary files a/src/assets/iconfonts/iconfont.woff and b/src/assets/iconfonts/iconfont.woff differ
diff --git a/src/assets/iconfonts/iconfont.woff2 b/src/assets/iconfonts/iconfont.woff2
index b8d7a57..30e48b3 100644
Binary files a/src/assets/iconfonts/iconfont.woff2 and b/src/assets/iconfonts/iconfont.woff2 differ
diff --git a/src/assets/styles/lend-manage.scss b/src/assets/styles/lend-manage.scss
index c1e7ead..f77b29f 100644
--- a/src/assets/styles/lend-manage.scss
+++ b/src/assets/styles/lend-manage.scss
@@ -137,4 +137,26 @@ color:#F65163;
}
::v-deep .el-tag.el-tag--info .el-tag__close{
background-color: #fff;
+}
+
+//出入库
+.dpflex{
+ display: flex;
+}
+.orange-btn{
+ background-color: #FD8042;
+ border: none;
+ &.el-button.is-disabled, &.el-button.is-disabled:hover{
+ background-color: #7E4021;
+ color: #666;
+ }
+}
+.green-btn{
+
+ background-color: #1AAE93;
+ border: none;
+ &.el-button.is-disabled, &.el-button.is-disabled:hover{
+ background-color: #0D5649;
+ color: #666;
+ }
}
\ No newline at end of file
diff --git a/src/views/archivesManage/outInStorage/inStorage/index.vue b/src/views/archivesManage/outInStorage/inStorage/index.vue
index dfdeb14..1cb8d29 100644
--- a/src/views/archivesManage/outInStorage/inStorage/index.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/index.vue
@@ -22,9 +22,9 @@
-
-
入库
-
人工确认
+
+ 入库
+ 人工确认
-
-
- 出库
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ 出库
+ 人工确认
+