diff --git a/.gitignore b/.gitignore index 70d092c..e055140 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ npm-debug.log* yarn-debug.log* yarn-error.log* *.log - +*.zip # Editor directories and files .idea .vscode diff --git a/gyhl.zip b/gyhl.zip deleted file mode 100644 index 9fabd51..0000000 Binary files a/gyhl.zip and /dev/null differ diff --git a/src/assets/logo_yxk.png b/src/assets/logo_yxk.png index 314565c..73d5308 100644 Binary files a/src/assets/logo_yxk.png and b/src/assets/logo_yxk.png differ diff --git a/src/assets/sc_bg.png b/src/assets/sc_bg.png index d38d7e7..808f72d 100644 Binary files a/src/assets/sc_bg.png and b/src/assets/sc_bg.png differ diff --git a/src/components/System/dialogChooseSingleContract.vue b/src/components/System/dialogChooseSingleContract.vue index df32ee2..7f8df61 100644 --- a/src/components/System/dialogChooseSingleContract.vue +++ b/src/components/System/dialogChooseSingleContract.vue @@ -4,46 +4,39 @@
- + - + + + + 查询
- - - - - - - - - - + + + + + + + + + + + diff --git a/src/pages/independent/fszxjckb.vue b/src/pages/independent/fszxjckb.vue index 5850f73..2fb2411 100644 --- a/src/pages/independent/fszxjckb.vue +++ b/src/pages/independent/fszxjckb.vue @@ -2,14 +2,21 @@
- +
总排口
- +
监控时间
@@ -26,51 +33,70 @@
标准值
状态
-
+
{{ items.jksj }}
-
{{ items.ssll - }}
-
+
{{ items.ssll }}
+
{{ items.phz }}
-
+
{{ items.bzz1 }}
-
+
{{ items.cod }}
-
+
{{ items.bzz2 }}
-
+
{{ items.zt }}
-
+
{{ items.bzz3 }}
-
+
{{ items.zx }}
-
+
{{ items.bzz4 }}
-
+
{{ items.ad }}
-
+
{{ items.bzz5 }}
-
+
{{ items.zt2 }}
-
+
{{ items.zt2 }}
-
+
{{ items.zt2 }}
-
+
{{ items.zt2 }}
@@ -112,7 +138,10 @@
车间排口1
- +
监控时间
@@ -121,23 +150,42 @@
标准值
状态
-
-
{{ items.jksj - }}
-
{{ items.ssll }}
-
{{ items.zn }}
-
{{ items.bzz1 }}
+
+
{{ items.jksj }}
+
{{ items.ssll }}
+
{{ items.zn }}
+
{{ items.bzz1 }}
-
+
{{ items.zt2 }}
-
+
{{ items.zt2 }}
-
+
{{ items.zt2 }}
-
+
{{ items.zt2 }}
@@ -148,7 +196,10 @@
车间排口2
- +
监控时间
@@ -159,30 +210,46 @@
标准值
状态
-
+
{{ items.jksj }}
-
{{ items.ssll - }}
-
{{ items.zg }} -
-
+
{{ items.ssll }}
+
{{ items.zg }}
+
{{ items.bzz1 }}
-
{{ items.ljg }} -
-
{{ items.bzz2 - }}
+
{{ items.ljg }}
+
{{ items.bzz2 }}
-
+
{{ items.zt2 }}
-
+
{{ items.zt2 }}
-
+
{{ items.zt2 }}
-
+
{{ items.zt2 }}
@@ -259,31 +326,22 @@ export default { methods: { // 标准值定义 isDanger(val, bz,zt) { - if(zt==0){ - return '' + if (!val || !bz) { + return false; } - if(zt==1){ - return 'td-warn' + if (val > bz) { + if(zt){ + return 'error td-err' + }else{ + return 'error' + } + } else { + if(zt){ + return 'td-err' + }else{ + return '' + } } - if(zt==2){ - return 'td-err' - } - // if (!val || !bz) { - // return false; - // } - // if (val > bz) { - // if(zt){ - // return 'error td-err' - // }else{ - // return 'error' - // } - // } else { - // if(zt){ - // return 'td-err' - // }else{ - // return '' - // } - // } }, getLogo() { this.$api.fileAPI.getLogo().then(res => { @@ -505,7 +563,6 @@ export default { .error { color: red !important; } - .logo_kanban { width: 120px; height: 29px; @@ -513,7 +570,6 @@ export default { left: 20px; top: 20px; } - .home { position: relative; width: 100%; @@ -523,7 +579,6 @@ export default { min-height: 700px; height: 100%; } - .head_title { position: relative; height: 80px; @@ -532,7 +587,6 @@ export default { background-size: contain; margin: auto; } - .main { position: absolute; top: 80px; @@ -546,7 +600,6 @@ export default { justify-content: center; flex-wrap: wrap; } - .time { font-family: "黑体"; position: absolute; @@ -559,7 +612,6 @@ export default { -moz-transform: translate3d(0, 0, 0); -o-transform: translate3d(0, 0, 0); } - .date { font-family: "黑体"; position: absolute; @@ -573,43 +625,36 @@ export default { -moz-transform: translate3d(0, 0, 0); -o-transform: translate3d(0, 0, 0); } - .item_out { /*height: calc((100% - 60px)/3);*/ width: calc((100% - 60px) / 2); margin: 10px; } - .item_out-new { /*height: calc((100% - 60px)/3);*/ width: calc(100% - 60px); margin: 10px; } - .item_out10 { height: calc((100% - 60px) / 2); left: 10px; bottom: 10px; } - .item_out9 { height: calc((100% - 60px) / 2); left: 10px; top: 10px; } - .item_out7 { height: calc((100% - 55px) / 2); right: 10px; top: 0; } - .item_out8 { height: calc((100% - 60px) / 2); right: 10px; bottom: 10px; } - .item_name { position: relative; font-size: 16px; @@ -629,7 +674,6 @@ export default { background-repeat: no-repeat; background-size: contain; } - .item_container_back, .charts_item_container { position: absolute; @@ -639,7 +683,6 @@ export default { left: 0; top: 0; } - .item_container { position: relative; width: 100%; @@ -657,7 +700,6 @@ export default { width: 100%; height: 100%; } - .table_head { position: relative; display: flex; @@ -673,7 +715,6 @@ export default { -moz-transform: translate3d(0, 0, 0); -o-transform: translate3d(0, 0, 0); } - .table_head .td { text-align: center; line-height: 20px; @@ -684,7 +725,6 @@ export default { text-overflow: ellipsis; white-space: nowrap; } - .table_list { width: 100%; height: 35px; @@ -693,7 +733,6 @@ export default { justify-content: space-around; align-items: center; } - .table_list .td { position: relative; text-align: center; @@ -713,11 +752,10 @@ export default { -moz-transform: translate3d(0, 0, 0); -o-transform: translate3d(0, 0, 0); } - .table_list .td-err { position: relative; text-align: center; - width: 35%; + width: 40%; height: 60%; box-sizing: border-box; display: flex; @@ -727,30 +765,6 @@ export default { color: #fff !important; background-color: red; font-size: 13px; - margin-left: 5px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - transform: translate3d(0, 0, 0); - -webkit-transform: translate3d(0, 0, 0); - -moz-transform: translate3d(0, 0, 0); - -o-transform: translate3d(0, 0, 0); -} - -.table_list .td-warn { - position: relative; - text-align: center; - width: 35%; - height: 60%; - margin-left: 5px; - box-sizing: border-box; - display: flex; - align-items: center; - justify-content: center; - box-sizing: border-box; - color: #fff !important; - background-color: #E6A23C; - font-size: 13px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -764,27 +778,22 @@ export default { .table_list .td:nth-child(1) { width: 10%; } - .table_head .td:nth-child(2), .table_list .td:nth-child(2) { width: 21%; } - .table_head .td:nth-child(3), .table_list .td:nth-child(3) { width: 20%; } - .table_head .td:nth-child(4), .table_list .td:nth-child(4) { width: 12%; } - .table_head .td:nth-child(5), .table_list .td:nth-child(5) { width: 21%; } - .table_head .td:nth-child(6), .table_list .td:nth-child(6) { width: 16%; @@ -815,7 +824,6 @@ export default { left: 0; right: 0; } - footer { position: absolute; left: 0px; @@ -827,17 +835,13 @@ footer { font-size: 12px; color: #fff; } - footer span { padding: 0px 20px; } - footer span a { color: #fff; } - @media (max-width: 1600px) { - .table_list .td, .table_head, .items2_chartname, @@ -846,9 +850,7 @@ footer span a { font-size: 14px !important; } } - @media (min-width: 1600px) { - .table_list .td, .table_head, .items2_chartname, diff --git a/src/pages/independent/left/components/yxk_left.vue b/src/pages/independent/left/components/yxk_left.vue index 63f095f..7ea7514 100644 --- a/src/pages/independent/left/components/yxk_left.vue +++ b/src/pages/independent/left/components/yxk_left.vue @@ -107,7 +107,7 @@
-

实时库存统计

+

产能趋势图

@@ -515,7 +515,7 @@ export default { color: "#333" }, formatter: function(params) { - return params[0].name + ":
" + params[0].value + "万件"; + return params[0].name + ":
" + params[0].value + "万米"; } }, grid: { diff --git a/src/pages/independent/screen.vue b/src/pages/independent/screen.vue index dc85701..173122d 100644 --- a/src/pages/independent/screen.vue +++ b/src/pages/independent/screen.vue @@ -5,7 +5,7 @@

- 江西液压件工业互联网平台数字化展示中心 + 瑞彩科技工业互联网平台数字化展示中心

{{ time }}
diff --git a/src/pages/khgxgl/jcfx/add.vue b/src/pages/khgxgl/jcfx/add.vue index 7db9b75..f356601 100644 --- a/src/pages/khgxgl/jcfx/add.vue +++ b/src/pages/khgxgl/jcfx/add.vue @@ -93,7 +93,7 @@ - + - + @@ -123,13 +124,21 @@ - + + + + + + + +
-1&&rec-list[1]<=0){ + this.$set(this.formData, "jcjg", 'OK'); + }else{ + this.$set(this.formData, "jcjg", 'NG'); + } + }else{ + this.$set(this.formData, "jcjg", ''); + } + }, currentIndex(newv) { this.currentChildIndex = newv; }, @@ -491,15 +513,15 @@ export default { */ initialize() { Promise.all([ - this.$api.commonAPI.getUsers(), - this.$api.commonAPI.getDeptsTree(), - this.$api.dictAPI.getDictsByType("qy"), - this.$api.dictAPI.getDictsByType("jllx"), - this.$api.dictAPI.getDictsByType("dywz") + // this.$api.commonAPI.getUsers(), + // this.$api.commonAPI.getDeptsTree(), + this.$api.dictAPI.getDictsByType("bzfw"), + // this.$api.dictAPI.getDictsByType("jllx"), + // this.$api.dictAPI.getDictsByType("dywz") ]) - .then(([r1, r2, r3, r4, r5]) => { + .then(([r1]) => { if (r1.code === 0) { - this.getUserList = r1.datas; + this.bzfwList = r1.datas; } if (r2.code === 0) { this.depOptions = r2.data.children; diff --git a/src/pages/khgxgl/jcfx/index.vue b/src/pages/khgxgl/jcfx/index.vue index 8605944..44c83a4 100644 --- a/src/pages/khgxgl/jcfx/index.vue +++ b/src/pages/khgxgl/jcfx/index.vue @@ -138,16 +138,19 @@ - + + + + diff --git a/src/pages/khgxgl/wlbb/index.vue b/src/pages/khgxgl/wlbb/index.vue new file mode 100644 index 0000000..1333c7e --- /dev/null +++ b/src/pages/khgxgl/wlbb/index.vue @@ -0,0 +1,543 @@ + + + + + diff --git a/src/pages/khgxgl/wlps/add.vue b/src/pages/khgxgl/wlps/add.vue index fefdbc2..661ff78 100644 --- a/src/pages/khgxgl/wlps/add.vue +++ b/src/pages/khgxgl/wlps/add.vue @@ -118,12 +118,12 @@ > --> - + + @@ -149,7 +149,53 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- +
@@ -94,35 +119,27 @@ export default { height: 100%; /* background: #fff; */ background-image: url(../../assets/bg_login.png); - background-position: center center; - /* 图片居中 */ - background-repeat: no-repeat; - /* 不重复 */ - background-size: cover; - /* 覆盖整个屏幕 */ + background-position: center center; /* 图片居中 */ + background-repeat: no-repeat; /* 不重复 */ + background-size: cover; /* 覆盖整个屏幕 */ /* background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' version='1.1' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:svgjs='http://svgjs.dev/svgjs' width='1440' height='560' preserveAspectRatio='none' viewBox='0 0 1440 560'%3e%3cg clip-path='url(%26quot%3b%23SvgjsClipPath1041%26quot%3b)' fill='none'%3e%3crect width='1440' height='560' x='0' y='0' fill='%2332325d'%3e%3c/rect%3e%3ccircle r='35.605' cx='185.1' cy='286.35' fill='url(%26quot%3b%23SvgjsLinearGradient1042%26quot%3b)'%3e%3c/circle%3e%3ccircle r='17.8' cx='57.44' cy='151.68' fill='%2343468b'%3e%3c/circle%3e%3ccircle r='27.595' cx='843.22' cy='195.61' fill='url(%26quot%3b%23SvgjsLinearGradient1043%26quot%3b)'%3e%3c/circle%3e%3ccircle r='55.4' cx='79.95' cy='304.45' fill='url(%26quot%3b%23SvgjsLinearGradient1044%26quot%3b)'%3e%3c/circle%3e%3ccircle r='17.2' cx='419.65' cy='331.62' fill='url(%26quot%3b%23SvgjsLinearGradient1045%26quot%3b)'%3e%3c/circle%3e%3ccircle r='33.66' cx='1110.51' cy='176.8' fill='url(%26quot%3b%23SvgjsLinearGradient1046%26quot%3b)'%3e%3c/circle%3e%3ccircle r='24.325' cx='51.8' cy='349.83' fill='url(%26quot%3b%23SvgjsLinearGradient1047%26quot%3b)'%3e%3c/circle%3e%3ccircle r='43.22' cx='693.82' cy='50.84' fill='%2343468b'%3e%3c/circle%3e%3c/g%3e%3cdefs%3e%3cclipPath id='SvgjsClipPath1041'%3e%3crect width='1440' height='560' x='0' y='0'%3e%3c/rect%3e%3c/clipPath%3e%3clinearGradient x1='113.89' y1='286.35' x2='256.31' y2='286.35' gradientUnits='userSpaceOnUse' id='SvgjsLinearGradient1042'%3e%3cstop stop-color='%23ab3c51' offset='0.1'%3e%3c/stop%3e%3cstop stop-color='%234f4484' offset='0.9'%3e%3c/stop%3e%3c/linearGradient%3e%3clinearGradient x1='788.03' y1='195.61' x2='898.41' y2='195.61' gradientUnits='userSpaceOnUse' id='SvgjsLinearGradient1043'%3e%3cstop stop-color='%2384b6e0' offset='0.1'%3e%3c/stop%3e%3cstop stop-color='%23464a8f' offset='0.9'%3e%3c/stop%3e%3c/linearGradient%3e%3clinearGradient x1='-30.849999999999994' y1='304.45' x2='190.75' y2='304.45' gradientUnits='userSpaceOnUse' id='SvgjsLinearGradient1044'%3e%3cstop stop-color='%23f29b7c' offset='0.1'%3e%3c/stop%3e%3cstop stop-color='%237e6286' offset='0.9'%3e%3c/stop%3e%3c/linearGradient%3e%3clinearGradient x1='385.25' y1='331.62' x2='454.05' y2='331.62' gradientUnits='userSpaceOnUse' id='SvgjsLinearGradient1045'%3e%3cstop stop-color='%23e298de' offset='0.1'%3e%3c/stop%3e%3cstop stop-color='%23484687' offset='0.9'%3e%3c/stop%3e%3c/linearGradient%3e%3clinearGradient x1='1043.19' y1='176.8' x2='1177.83' y2='176.8' gradientUnits='userSpaceOnUse' id='SvgjsLinearGradient1046'%3e%3cstop stop-color='%23ab3c51' offset='0.1'%3e%3c/stop%3e%3cstop stop-color='%234f4484' offset='0.9'%3e%3c/stop%3e%3c/linearGradient%3e%3clinearGradient x1='3.1499999999999986' y1='349.83' x2='100.44999999999999' y2='349.83' gradientUnits='userSpaceOnUse' id='SvgjsLinearGradient1047'%3e%3cstop stop-color='%23f29b7c' offset='0.1'%3e%3c/stop%3e%3cstop stop-color='%237e6286' offset='0.9'%3e%3c/stop%3e%3c/linearGradient%3e%3c/defs%3e%3c/svg%3e"); */ color: #fff; font-size: 16px; } - .login-logo { padding: 2%; } - .login-logo img { vertical-align: middle; } - .login-logo img:first-child { width: 10%; max-width: 97px; } - .login-logo img:last-child { width: 18%; max-width: 294px; } - /* .login-logo span { margin: 0px 1%; display: inline-block; @@ -147,7 +164,6 @@ export default { word-break: break-all; overflow: hidden; } - /* 打印效果 */ @keyframes login-slogan { from { @@ -161,7 +177,6 @@ export default { /* 光标 */ @keyframes blink-caret { - from, to { border-color: transparent; @@ -171,7 +186,6 @@ export default { border-color: currentColor; } } - .login-area { position: fixed; right: 6%; @@ -194,7 +208,6 @@ export default { /* background-image: linear-gradient(to top, #4481eb 0%, #04befe 100%); */ padding: 90px 60px; } - .login-divider { position: absolute !important; top: 10px; @@ -202,7 +215,6 @@ export default { right: 0px; text-align: center; } - .login-title { /* position: absolute; top: 10px; @@ -212,7 +224,6 @@ export default { font-size: 18px; color: #3d69e1; } - .login-area input.el-input__inner { margin-bottom: 5px; padding-left: 45px; @@ -222,26 +233,21 @@ export default { color: #2591ed; font-size: 15px; } - .login-area input.el-input__inner::placeholder { color: #2591ed; font-size: 15px; } - .login-area .el-input__icon { padding-left: 10px; color: #2591ed; font-size: 20px; } - .login-area .el-checkbox { color: #fff; } - .login-psw { margin: 20px 0 !important; } - .login-btn { width: 100%; font-size: 16px !important; @@ -250,7 +256,6 @@ export default { background: #3d69e1; margin-top: 50px !important; } - .login-btn:hover { background: #3457b2 !important; } diff --git a/src/pages/sbfxbb/detail.vue b/src/pages/sbfxbb/detail.vue new file mode 100644 index 0000000..52408a7 --- /dev/null +++ b/src/pages/sbfxbb/detail.vue @@ -0,0 +1,557 @@ + + + + + + diff --git a/src/pages/sbfxbb/index.vue b/src/pages/sbfxbb/index.vue new file mode 100644 index 0000000..f3adea9 --- /dev/null +++ b/src/pages/sbfxbb/index.vue @@ -0,0 +1,531 @@ + + + + + diff --git a/src/pages/zdhjy/index.vue b/src/pages/zdhjy/index.vue index a3a6a8b..c4eb4b3 100644 --- a/src/pages/zdhjy/index.vue +++ b/src/pages/zdhjy/index.vue @@ -118,12 +118,12 @@ export default { { label: "样品名称", value: "ypmc",width:"200" }, { label: "批号", value: "ph",width:"200" }, { label: "检测结果", value: "jcjg",width:"200" }, - { label: "浓度", value: "nd",width:"200" }, - { label: "径距", value: "jj",width:"200" }, - { label: "一致性", value: "yzx",width:"200"}, - { label: "比表面积", value: "bbmj",width:"200" }, - { label: "D[3,2]", value: "f1",width:"200",isState:true }, - { label: "D[4,3]", value: "f2",width:"200",isState:true }, + // { label: "浓度", value: "nd",width:"200" }, + // { label: "径距", value: "jj",width:"200" }, + // { label: "一致性", value: "yzx",width:"200"}, + // { label: "比表面积", value: "bbmj",width:"200" }, + // { label: "D[3,2]", value: "f1",width:"200",isState:true }, + // { label: "D[4,3]", value: "f2",width:"200",isState:true }, { label: "Dv(10)", value: "f3",width:"200",isState:true }, { label: "Dv(50)", value: "f4",width:"200",isState:true }, { label: "Dv(90)", value: "f5",width:"200",isState:true }, diff --git a/src/router/staticRoute.js b/src/router/staticRoute.js index 8a3616b..5a2b4d2 100644 --- a/src/router/staticRoute.js +++ b/src/router/staticRoute.js @@ -4611,6 +4611,17 @@ const staticRoute = [ /* webpackChunkName: 'equipment' */ "../pages/khgxgl/shgl/detail.vue" ) }, + { + path: "wlbb", + name: "wlbb", + meta: { + name: "物流报表" + }, + component: () => + import( + /* webpackChunkName: 'equipment' */ "../pages/khgxgl/wlbb/index.vue" + ) + }, { path: "wlps", name: "wlps",