diff --git a/.env.development b/.env.development index e6ab5abd..58b17e13 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ NODE_ENV = development VUE_APP_TITLE = '托克逊能源管理平台' # VUE_APP_TITLE = '中建材光子科技有限公司' # VUE_APP_TITLE = '超低排放系统' -VUE_APP_PJ = 'gx' +VUE_APP_PJ = 'pf' # 接口地址 #VUE_APP_API_BASEURL = http://1.203.161.103:2800/api @@ -16,10 +16,10 @@ VUE_APP_PJ = 'gx' # VUE_APP_API_BASEURL = http://127.0.0.1:2226/api #测试环境 -# VUE_APP_API_BASEURL = http://49.232.14.174:2226/api -VUE_APP_API_BASEURL = http://127.0.0.1:2226/api -# VUE_APP_BASEURL = http://49.232.14.174:2226 -VUE_APP_BASEURL = http://127.0.0.1:2226 + VUE_APP_API_BASEURL = http://49.232.14.174:2226/api +#VUE_APP_API_BASEURL = http://127.0.0.1:2226/api + VUE_APP_BASEURL = http://49.232.14.174:2226 +#VUE_APP_BASEURL = http://127.0.0.1:2226 # #光子 # VUE_APP_API_BASEURL = http://49.232.14.174:2250/api diff --git a/src/api/model/wpm.js b/src/api/model/wpm.js index f4d1883a..56f64454 100644 --- a/src/api/model/wpm.js +++ b/src/api/model/wpm.js @@ -369,8 +369,8 @@ export default { prints: { name: "打印", req: async function (data) { - return await http.post(`${config.API_URL}/prints/`, data); - // return await http.post("http://localhost:8080/prints/", data); + // return await http.post(`${config.API_URL}/prints/`, data); + return await http.post("http://localhost:8080/prints/", data); }, }, }; diff --git a/src/assets/icons/Env.vue b/src/assets/icons/Env.vue new file mode 100644 index 00000000..38519596 --- /dev/null +++ b/src/assets/icons/Env.vue @@ -0,0 +1,5 @@ + diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js index a85f299c..d8fa74ea 100644 --- a/src/assets/icons/index.js +++ b/src/assets/icons/index.js @@ -21,4 +21,5 @@ export { default as Shenpi } from './Shenpi.vue' export { default as Shebei } from './Shebei.vue' export { default as Xiaoshou } from './Xiaoshou.vue' export { default as Zhixing } from './Zhixing.vue' -export { default as Zhizao } from './Zhizao.vue' \ No newline at end of file +export { default as Zhizao } from './Zhizao.vue' +export { default as Env } from './Env.vue' \ No newline at end of file diff --git a/src/config/route.js b/src/config/route.js index 20f6eb4c..baae874f 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -898,7 +898,7 @@ const routes = [ path: "/enp", meta: { title: "环保模块", - icon: "el-icon-grid", + icon: "sc-icon-env", type: "menu", perms: ["enm_hb"], }, @@ -1401,11 +1401,21 @@ const routes = [ }, component: "wpm_gx/qiepian", }, + { + name: "baipianpao", + path: "/wpm_gx/baipianpao", + meta: { + title: "白片抛", + // icon: "el-icon-files", + perms: ["wpm_bpp"], + }, + component: "wpm_gx/baipianpao", + }, { name: "saobian", path: "/wpm_gx/saobian", meta: { - title: "扫边", + title: "扫边A", // icon: "el-icon-cellphone", perms: ["wpm_sb"], }, @@ -1422,25 +1432,45 @@ const routes = [ component: "wpm_gx/heihua", }, { - name: "shaojie", - path: "/wpm_gx/shaojie", + name: "tuihuo", + path: "/wpm_gx/tuihuo", meta: { - title: "烧结", + title: "退火", // icon: "el-icon-cellphone", perms: ["wpm_sj"], }, - component: "wpm_gx/shaojie", + component: "wpm_gx/tuihuo", }, { name: "jianbo", path: "/wpm_gx/jianbo", meta: { - title: "减薄", + title: "减薄A", // icon: "el-icon-cellphone", perms: ["wpm_jb"], }, component: "wpm_gx/jianbo", }, + { + name: "jianbob", + path: "/wpm_gx/jianbob", + meta: { + title: "减薄B", + // icon: "el-icon-cellphone", + perms: ["wpm_jbb"], + }, + component: "wpm_gx/jianbob", + }, + { + name: "pingmo", + path: "/wpm_gx/pingmo", + meta: { + title: "平磨", + // icon: "el-icon-cellphone", + perms: ["wpm_mp"], + }, + component: "wpm_gx/pingmo", + }, { name: "jingdiao", path: "/wpm_gx/jingdiao", @@ -1452,14 +1482,34 @@ const routes = [ component: "wpm_gx/jingdiao", }, { - name: "mopao", - path: "/wpm_gx/mopao", + name: "yicipao", + path: "/wpm_gx/yicipao", meta: { - title: "磨抛", + title: "一次抛", // icon: "el-icon-cellphone", - perms: ["wpm_mp"], + perms: ["wpm_ycp"], }, - component: "wpm_gx/mopao", + component: "wpm_gx/yicipao", + }, + { + name: "saobianb", + path: "/wpm_gx/saobianb", + meta: { + title: "扫边B", + // icon: "el-icon-cellphone", + perms: ["wpm_sbb"], + }, + component: "wpm_gx/saobianb", + }, + { + name: "chengpinpao", + path: "/wpm_gx/chengpinpao", + meta: { + title: "成品抛", + // icon: "el-icon-cellphone", + perms: ["wpm_cpp"], + }, + component: "wpm_gx/chengpinpao", }, { name: "daojiao", @@ -1543,14 +1593,14 @@ const routes = [ component: "qm/process", }, { - name: "qmProcess", - path: "/qm/qmProcess", + name: "qmProcess2", + path: "/qm/qmProcess2", meta: { title: "过程抽检", // icon: "el-icon-cellphone", perms: ["ptest"], }, - component: "qm/process", + component: "qm/process2", }, { name: "qmInm", diff --git a/src/style/dark.scss b/src/style/dark.scss index 805614cf..e02a6954 100644 --- a/src/style/dark.scss +++ b/src/style/dark.scss @@ -10,6 +10,14 @@ html.dark { --el-color-primary-light-5: var(--el-color-primary-dark-4) !important; --el-color-primary-light-3: var(--el-color-primary-dark-3) !important; --el-menu-active-color: #ffffff !important; + // --el-bg-color: #1e789a; + // --el-text-color-regular: #ffffff; + .el-dialog__close { + color: #ffffff; + } + .el-dialog__title { + color: #ffffff; + } .el-tag { background-color: #f8f5f5 !important; diff --git a/src/style/fix.scss b/src/style/fix.scss index ab8212f4..58629f17 100644 --- a/src/style/fix.scss +++ b/src/style/fix.scss @@ -375,4 +375,28 @@ body .el-table th.gutter { .el-dialog__footer { padding: 6px 6px 6px; +} + +.aside_one, +.aside_side { + height: 100%; + background: var(--el-bg-color-overlay); + border-color: var(--el-border-color-light); + // border-radius: 4px; + background: rgb(4, 50, 83); + background-color: rgb(4, 50, 83); + box-shadow: inset 0px 0px 30px 15px rgb(7, 79, 109); + border: 1px solid #1279c3; +} +.el-aside:has(> .aside_one) { + padding: 8px; + border-right: none; +} + +.infoLine { + color: #ffffff; +} + +.typeLine { + color: #ffffff; } \ No newline at end of file diff --git a/src/utils/enum.js b/src/utils/enum.js index cf04fb8e..06ddce2f 100644 --- a/src/utils/enum.js +++ b/src/utils/enum.js @@ -184,4 +184,12 @@ export const schedulePeriodEnum = new EnumFactory({ 'minutes': '分钟', 'hours': '小时', 'days': '天', -}) \ No newline at end of file +}) + +export const wmState = new EnumFactory({ + 10: { text: '合格', type: 'success' }, + 20: { text: '不合格', type: 'warning' }, + 30: { text: '返修', type: 'warning' }, + 40: { text: '检验', type: 'primary' }, + 50: { text: '报废', type: 'danger' }, +}, parseInt) \ No newline at end of file diff --git a/src/views/bigScreen/enpComponents/carlist.vue b/src/views/bigScreen/enpComponents/carlist.vue new file mode 100644 index 00000000..0edd325a --- /dev/null +++ b/src/views/bigScreen/enpComponents/carlist.vue @@ -0,0 +1,166 @@ + + diff --git a/src/views/bigScreen/enpComponents/envirqualmonitor.vue b/src/views/bigScreen/enpComponents/envirqualmonitor.vue index 9d5000c9..d11f2d98 100644 --- a/src/views/bigScreen/enpComponents/envirqualmonitor.vue +++ b/src/views/bigScreen/enpComponents/envirqualmonitor.vue @@ -14,7 +14,7 @@
- @@ -28,7 +28,7 @@
- + @@ -83,6 +83,7 @@ export default { data() { return { + tableLoading: false, tableData: [], metricOptions: [ { label: 'PM2.5', value: 'pm25' }, @@ -131,13 +132,15 @@ export default { } else if (that.time_bucket == 'hour') { exec_search = 'enp_edata_hour_nodrain'; } + that.tableLoading = true; that.$API.bi.dataset.exec.req(exec_search, { query: that.query, raise_exception: true }).then(res => { console.log(res.data2.ds0); this.tableData = res.data2.ds0; - }) + that.tableLoading = false; + }).catch(e=>{that.tableLoading = false;}) }, }, diff --git a/src/views/bigScreen/enpComponents/innerclean.vue b/src/views/bigScreen/enpComponents/innerclean.vue index 4cf13841..6bd199c1 100644 --- a/src/views/bigScreen/enpComponents/innerclean.vue +++ b/src/views/bigScreen/enpComponents/innerclean.vue @@ -53,7 +53,7 @@ export default { query: {}, params: { type: 30, tags: 'carwash' }, cateOptions: [ - { id: 'inner_car', name: '场内运输车辆' }, + { id: 'inner_car', name: '厂内运输车辆' }, { id: 'inner_car2', name: '非路道移动机械' }, ], apiObj: this.$API.em.equipment.list, diff --git a/src/views/bigScreen/enpComponents/orgwryList.vue b/src/views/bigScreen/enpComponents/orgwryList.vue index 868dd389..b5e02dc9 100644 --- a/src/views/bigScreen/enpComponents/orgwryList.vue +++ b/src/views/bigScreen/enpComponents/orgwryList.vue @@ -69,13 +69,13 @@
排放口及关联设备静态信息
-
+
{{ detailItem.name }} @@ -478,6 +478,7 @@ export default { }) }, resizeChart(name) { + console.log(name) var myChart = echarts.getInstanceByDom( document.getElementById(name) ); @@ -487,10 +488,7 @@ export default { }, addListener() { var that = this; - if (this.resizeTimeout) { - clearTimeout(this.resizeTimeout); - } - this.resizeTimeout = setTimeout(function () { + setTimeout(function () { that.resizeChart("dataChart"); that.resizeChart("dataChart2"); that.resizeChart("dataChart3"); diff --git a/src/views/bigScreen/enpComponents/pollutant.vue b/src/views/bigScreen/enpComponents/pollutant.vue index 08c2181f..4330aaac 100644 --- a/src/views/bigScreen/enpComponents/pollutant.vue +++ b/src/views/bigScreen/enpComponents/pollutant.vue @@ -27,15 +27,72 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -100,8 +157,8 @@
生产能力： {{ - eqs.parameter_json.生产能力 - }} + eqs.parameter_json.生产能力 + }}
@@ -119,22 +176,22 @@
风量： {{ - eqz.parameter_json.风量 - }}m³/h + eqz.parameter_json.风量 + }}m³/h
过滤面积： {{ - eqz.parameter_json.过滤面积 - }} m² + eqz.parameter_json.过滤面积 + }} m²
布袋材质： {{ - eqz.parameter_json.布袋材质 - }} + eqz.parameter_json.布袋材质 + }}
@@ -188,9 +245,11 @@ \ No newline at end of file + diff --git a/src/views/bigScreen/enpComponents/transport_old.vue b/src/views/bigScreen/enpComponents/transport_old.vue new file mode 100644 index 00000000..426cef56 --- /dev/null +++ b/src/views/bigScreen/enpComponents/transport_old.vue @@ -0,0 +1,115 @@ + + \ No newline at end of file diff --git a/src/views/bigScreen/index_enp_blue.vue b/src/views/bigScreen/index_enp_blue.vue index dec3753f..68252ea5 100644 --- a/src/views/bigScreen/index_enp_blue.vue +++ b/src/views/bigScreen/index_enp_blue.vue @@ -114,10 +114,12 @@ command="transport" >厂外运输 + @@ -161,9 +163,12 @@