diff --git a/.env.development b/.env.development index bfa0ade..7739947 100644 --- a/.env.development +++ b/.env.development @@ -3,16 +3,16 @@ ENV = 'development' # 接口地址 #内网服务地址 -# VUE_APP_BASE_API = 'http://192.168.99.107:7077' -# VUE_APP_WS_API = 'ws://192.168.99.107:7077' -# VUE_APP_CAMERA_API = '192.168.99.107:3000' +VUE_APP_BASE_API = 'http://192.168.99.107:7077' +VUE_APP_WS_API = 'ws://192.168.99.107:7077' +VUE_APP_CAMERA_API = '192.168.99.107:3000' # 许镇-本地服地址 # VUE_APP_BASE_API = 'http://192.168.99.84:7070' # VUE_APP_WS_API = 'ws://192.168.99.84:7070' -VUE_APP_BASE_API = 'http://192.168.99.67:11100' -VUE_APP_WS_API = 'ws://192.168.99.67:11100' +# VUE_APP_BASE_API = 'http://192.168.99.67:11100' +# VUE_APP_WS_API = 'ws://192.168.99.67:11100' # 是否启用 babel-plugin-dynamic-import-node插件 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/assets/iconfonts/light/iconfont.css b/src/assets/iconfonts/light/iconfont.css index b86259c..7b755ef 100644 --- a/src/assets/iconfonts/light/iconfont.css +++ b/src/assets/iconfonts/light/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 3966148 */ - src: url('iconfont.woff2?t=1682583233390') format('woff2'), - url('iconfont.woff?t=1682583233390') format('woff'), - url('iconfont.ttf?t=1682583233390') format('truetype'); + src: url('iconfont.woff2?t=1685929738396') format('woff2'), + url('iconfont.woff?t=1685929738396') format('woff'), + url('iconfont.ttf?t=1685929738396') format('truetype'); } .iconfont { @@ -13,6 +13,110 @@ -moz-osx-font-smoothing: grayscale; } +.icon-zhengque:before { + content: "\e653"; +} + +.icon-cuowu:before { + content: "\e654"; +} + +.icon-huifu:before { + content: "\e655"; +} + +.icon-dian2:before { + content: "\e656"; +} + +.icon-dian:before { + content: "\e657"; +} + +.icon-shangchuanchenggong:before { + content: "\e658"; +} + +.icon-dayin:before { + content: "\e659"; +} + +.icon-shangchuanshibai:before { + content: "\e65a"; +} + +.icon-xiaowenjian:before { + content: "\e65b"; +} + +.icon-bendiguajie:before { + content: "\e65c"; +} + +.icon-zhongxinjiance:before { + content: "\e65d"; +} + +.icon-tianjiawenjian:before { + content: "\e65e"; +} + +.icon-shangchuan2:before { + content: "\e650"; +} + +.icon-a-1:before { + content: "\e64f"; +} + +.icon-a-2:before { + content: "\e651"; +} + +.icon-xiazai:before { + content: "\e652"; +} + +.icon-zhengli:before { + content: "\e64e"; +} + +.icon-changgui:before { + content: "\e64d"; +} + +.icon-yuguidangku:before { + content: "\e64b"; +} + +.icon-shoujizhengbian:before { + content: "\e64c"; +} + +.icon-yidong:before { + content: "\e645"; +} + +.icon-piliangchengjian:before { + content: "\e646"; +} + +.icon-hebingchengjian:before { + content: "\e647"; +} + +.icon-danganfenlei:before { + content: "\e648"; +} + +.icon-gengduo:before { + content: "\e649"; +} + +.icon-fenlei:before { + content: "\e64a"; +} + .icon-tupianyulan:before { content: "\e644"; } diff --git a/src/assets/iconfonts/light/iconfont.js b/src/assets/iconfonts/light/iconfont.js index f148c62..e4ae63f 100644 --- a/src/assets/iconfonts/light/iconfont.js +++ b/src/assets/iconfonts/light/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_3966148='',function(c){var a=(a=document.getElementsByTagName("script"))[a.length-1],l=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,i,o,t,s,v=function(a,l){l.parentNode.insertBefore(a,l)};if(l&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_3966148,(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,(a=document.body).firstChild?v(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,t=c.document,s=!1,m(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,z())})}function z(){s||(s=!0,o())}function m(){try{t.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}z()}}(window); \ No newline at end of file +window._iconfont_svg_string_3966148='',function(c){var a=(a=document.getElementsByTagName("script"))[a.length-1],l=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,i,o,t,s,v=function(a,l){l.parentNode.insertBefore(a,l)};if(l&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_3966148,(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,(a=document.body).firstChild?v(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,t=c.document,s=!1,p(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,z())})}function z(){s||(s=!0,o())}function p(){try{t.documentElement.doScroll("left")}catch(a){return void setTimeout(p,50)}z()}}(window); \ No newline at end of file diff --git a/src/assets/iconfonts/light/iconfont.json b/src/assets/iconfonts/light/iconfont.json index bdadaca..79e12e9 100644 --- a/src/assets/iconfonts/light/iconfont.json +++ b/src/assets/iconfonts/light/iconfont.json @@ -5,6 +5,188 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "35809396", + "name": "正确", + "font_class": "zhengque", + "unicode": "e653", + "unicode_decimal": 58963 + }, + { + "icon_id": "35809397", + "name": "错误", + "font_class": "cuowu", + "unicode": "e654", + "unicode_decimal": 58964 + }, + { + "icon_id": "35809398", + "name": "恢复", + "font_class": "huifu", + "unicode": "e655", + "unicode_decimal": 58965 + }, + { + "icon_id": "35809399", + "name": "点2", + "font_class": "dian2", + "unicode": "e656", + "unicode_decimal": 58966 + }, + { + "icon_id": "35809400", + "name": "点", + "font_class": "dian", + "unicode": "e657", + "unicode_decimal": 58967 + }, + { + "icon_id": "35809401", + "name": "上传成功", + "font_class": "shangchuanchenggong", + "unicode": "e658", + "unicode_decimal": 58968 + }, + { + "icon_id": "35809402", + "name": "打印", + "font_class": "dayin", + "unicode": "e659", + "unicode_decimal": 58969 + }, + { + "icon_id": "35809403", + "name": "上传失败", + "font_class": "shangchuanshibai", + "unicode": "e65a", + "unicode_decimal": 58970 + }, + { + "icon_id": "35809404", + "name": "小文件", + "font_class": "xiaowenjian", + "unicode": "e65b", + "unicode_decimal": 58971 + }, + { + "icon_id": "35809405", + "name": "本地挂接", + "font_class": "bendiguajie", + "unicode": "e65c", + "unicode_decimal": 58972 + }, + { + "icon_id": "35809406", + "name": "重新检测", + "font_class": "zhongxinjiance", + "unicode": "e65d", + "unicode_decimal": 58973 + }, + { + "icon_id": "35809407", + "name": "添加文件", + "font_class": "tianjiawenjian", + "unicode": "e65e", + "unicode_decimal": 58974 + }, + { + "icon_id": "35809370", + "name": "上传2", + "font_class": "shangchuan2", + "unicode": "e650", + "unicode_decimal": 58960 + }, + { + "icon_id": "35809352", + "name": "1", + "font_class": "a-1", + "unicode": "e64f", + "unicode_decimal": 58959 + }, + { + "icon_id": "35809354", + "name": "2", + "font_class": "a-2", + "unicode": "e651", + "unicode_decimal": 58961 + }, + { + "icon_id": "35809355", + "name": "下载", + "font_class": "xiazai", + "unicode": "e652", + "unicode_decimal": 58962 + }, + { + "icon_id": "35809307", + "name": "整理", + "font_class": "zhengli", + "unicode": "e64e", + "unicode_decimal": 58958 + }, + { + "icon_id": "35809305", + "name": "常规", + "font_class": "changgui", + "unicode": "e64d", + "unicode_decimal": 58957 + }, + { + "icon_id": "35809299", + "name": "预归档库", + "font_class": "yuguidangku", + "unicode": "e64b", + "unicode_decimal": 58955 + }, + { + "icon_id": "35809300", + "name": "收集整编", + "font_class": "shoujizhengbian", + "unicode": "e64c", + "unicode_decimal": 58956 + }, + { + "icon_id": "35808830", + "name": "移动", + "font_class": "yidong", + "unicode": "e645", + "unicode_decimal": 58949 + }, + { + "icon_id": "35808831", + "name": "批量成件", + "font_class": "piliangchengjian", + "unicode": "e646", + "unicode_decimal": 58950 + }, + { + "icon_id": "35808833", + "name": "合并成件", + "font_class": "hebingchengjian", + "unicode": "e647", + "unicode_decimal": 58951 + }, + { + "icon_id": "35808942", + "name": "档案分类", + "font_class": "danganfenlei", + "unicode": "e648", + "unicode_decimal": 58952 + }, + { + "icon_id": "35808943", + "name": "更多", + "font_class": "gengduo", + "unicode": "e649", + "unicode_decimal": 58953 + }, + { + "icon_id": "35808945", + "name": "分类", + "font_class": "fenlei", + "unicode": "e64a", + "unicode_decimal": 58954 + }, { "icon_id": "35165878", "name": "图片预览", diff --git a/src/assets/iconfonts/light/iconfont.ttf b/src/assets/iconfonts/light/iconfont.ttf index 99b53d3..de4efc4 100644 Binary files a/src/assets/iconfonts/light/iconfont.ttf and b/src/assets/iconfonts/light/iconfont.ttf differ diff --git a/src/assets/iconfonts/light/iconfont.woff b/src/assets/iconfonts/light/iconfont.woff index 25b0461..34f2312 100644 Binary files a/src/assets/iconfonts/light/iconfont.woff and b/src/assets/iconfonts/light/iconfont.woff differ diff --git a/src/assets/iconfonts/light/iconfont.woff2 b/src/assets/iconfonts/light/iconfont.woff2 index ab536d7..4db54d4 100644 Binary files a/src/assets/iconfonts/light/iconfont.woff2 and b/src/assets/iconfonts/light/iconfont.woff2 differ diff --git a/src/assets/icons/svg/sr-dngl.svg b/src/assets/icons/svg/sr-dngl.svg new file mode 100644 index 0000000..6e0a272 --- /dev/null +++ b/src/assets/icons/svg/sr-dngl.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/sr-ygdk.svg b/src/assets/icons/svg/sr-ygdk.svg new file mode 100644 index 0000000..9a2fbe6 --- /dev/null +++ b/src/assets/icons/svg/sr-ygdk.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/system/zwsj.png b/src/assets/images/system/zwsj.png new file mode 100644 index 0000000..a3dd5b6 Binary files /dev/null and b/src/assets/images/system/zwsj.png differ diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index 085290c..212368e 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -2174,3 +2174,96 @@ input[type ='number'] { @include btn_blue_style; } } + +.corres-field-main{ + display: flex; + justify-content: space-between; + height: 428px; + border: 1px solid #E6E8ED; + overflow: hidden; + overflow-y: scroll; + .corres-field-list{ + // border-right: 1px solid #E6E8ED; + .corres-field-title{ + height: 60px; + line-height: 20px; + background-color: #F5F9FC; + text-align: center; + p{ + font-size: 14px; + color: #0C0E1E; + padding-top: 10px; + } + span{ + font-size: 12px; + color: #0348F3; + } + } + .field-list{ + // height: 360px; + // overflow: hidden; + // overflow-y: scroll; + border-right: 1px solid #E6E8ED; + .field-item{ + display: flex; + justify-content: space-between; + height: 40px; + line-height: 40px; + border-bottom: 1px solid #E6E8ED; + p{ + flex: 1; + font-size: 14px; + color: #545B65; + text-align: center; + } + .el-select{ + width: 302px; + border-right: 1px solid #E6E8ED; + .el-input__inner{ + height: 38px; + line-height: 38px; + border: none; + } + } + .field-state{ + width: 88px; + text-align: center; + border-left: 1px solid #E6E8ED; + span{ + display: inline-block; + width: 48px; + height: 22px; + line-height: 22px; + font-size: 12px; + border-radius: 3px; + } + span.is-select{ + color: #0348F3; + background-color: #EEF5FE; + border: 1px solid #90B0F9; + } + span.is-hide{ + color: #A6ADB6; + background-color: #F3F5F9; + border: 1px solid #E6E8ED; + } + } + } + } + } + .corres-field-middle, + .corres-field-right{ + flex: 1; + } + .corres-field-right{ + border-right: none; + } +} + +.el-upload { + .el-button{ + color: #fff !important; + background-color: #1F55EB !important; + border: none !important; + } +} diff --git a/src/views/components/BindingTagDlg.vue b/src/views/components/BindingTagDlg.vue index b4d4dd1..1e1d99a 100644 --- a/src/views/components/BindingTagDlg.vue +++ b/src/views/components/BindingTagDlg.vue @@ -274,7 +274,8 @@ export default { }, async getDevId() { return await new Promise(async(resolve, reject) => { - const mac = await RFID.getDeviceMac() + // const mac = await RFID.getDeviceMac() + const mac = '12-34-56-12-34-56' if (!mac || mac === '') { this.step1Message = '获取mac地址失败' this.errorStep = 1 diff --git a/src/views/components/category/PreviewForm.vue b/src/views/components/category/PreviewForm.vue index be5c376..32653c5 100644 --- a/src/views/components/category/PreviewForm.vue +++ b/src/views/components/category/PreviewForm.vue @@ -45,12 +45,28 @@ - + + + + + + 上传 + + + @@ -122,8 +138,11 @@ export default { }, data() { return { - addOrUpdateForm: {}, - rules: {}, + fileOriginal: null, + addOrUpdateForm: { + }, + rules: { + }, popoverTableData: [], // popover - popoverTableData popoverVisible: false, // popover - visible currentFieldName: null, // popover 当前fieldName @@ -142,7 +161,15 @@ export default { label: node.dicName, children: node.childMenus } - } + }, + qiniuData: { + key: '', + token: '' + }, + // 七牛云的上传地址 + upload_qiniu_url: 'https://upload.qiniup.com/', + // 这是七牛云空间的外链默认域名 + upload_qiniu_addr: 'qiniu.aiyxlib.com' } }, watch: { @@ -448,6 +475,33 @@ export default { handleClose(done) { this.popoverVisible = false done() + }, + handleChange(file, fileList) { + this.fileList = fileList.slice(-3) + }, + // 验证文件合法性 + beforeAvatarUpload(file) { + this.qiniuData.key = file.name + const isJPG = file.type === 'image/jpeg' || file.type === 'image/png' + const isLt2M = file.size / 1024 / 1024 < 2 + if (!isJPG) { + this.$message.error('图片只支持bmp、jpg、png、gif格式的文件 !') + } + if (!isLt2M) { + this.$message.error('图片大小不能超过 2MB !') + } + return isJPG && isLt2M + }, + handleAvatarSuccess: function(res, file) { + this.form.imageUrl = 'http://' + this.upload_qiniu_addr + '/' + res.key + console.log(this.form.imageUrl) + }, + handleError: function(res) { + this.$message({ + message: '上传失败', + duration: 2000, + type: 'warning' + }) } } } @@ -466,12 +520,22 @@ export default { } } +@mixin preview-border-color{ + [data-theme="dark"] & { + border-color: #3a99fd; + } + [data-theme="light"] & { + border-color: #EDEFF3; + } +} + .preview-content { padding: 20px 0 0 0 !important; margin-top: 0 !important; border-radius: 4px; margin: 0 auto; - @include preview-border-style; + border: 1px solid; + @include preview-border-color; .el-row { margin-left: 0 !important; margin-right: 0 !important; @@ -510,4 +574,23 @@ export default { line-height: 30px; } } +.preview-form-bottom{ + padding: 20px 20px 0 20px; + border-top: 1px solid; + @include preview-border-color; +} + +.upload-wm{ + display: flex; + justify-content: flex-start; + ::v-deep .el-form-item__content{ + width: 510px !important; + display: flex; + justify-content: space-between; + .upload-btn{ + margin-right: 0; + margin-left: 10px; + } + } +} diff --git a/src/views/prearchiveLibrary/index.vue b/src/views/prearchiveLibrary/index.vue index 8f575bb..7e514b0 100644 --- a/src/views/prearchiveLibrary/index.vue +++ b/src/views/prearchiveLibrary/index.vue @@ -26,7 +26,7 @@
- +
@@ -38,10 +38,12 @@ 删除 -