diff --git a/public/static/luckysheet/plugins.css b/public/static/luckysheet/plugins.css index 246b2508..8b5a2205 100644 --- a/public/static/luckysheet/plugins.css +++ b/public/static/luckysheet/plugins.css @@ -2330,7 +2330,7 @@ } /*! jQuery UI - v1.12.1 - 2017-02-14 * http://jqueryui.com * Includes: core.css, button.css, controlgroup.css, checkboxradio.css, menu.css, selectmenu.css, slider.css, spinner.css, theme.css -* To view and modify this theme, visit http://jqueryui.com/themeroller/?scope=&folderName=base&cornerRadiusShadow=8px&offsetLeftShadow=0px&offsetTopShadow=0px&thicknessShadow=5px&opacityShadow=30&bgImgOpacityShadow=0&bgTextureShadow=flat&bgColorShadow=666666&opacityOverlay=30&bgImgOpacityOverlay=0&bgTextureOverlay=flat&bgColorOverlay=aaaaaa&iconColorError=cc0000&fcError=5f3f3f&borderColorError=f1a899&bgTextureError=flat&bgColorError=fddfdf&iconColorHighlight=777620&fcHighlight=777620&borderColorHighlight=dad55e&bgTextureHighlight=flat&bgColorHighlight=fffa90&iconColorActive=ffffff&fcActive=ffffff&borderColorActive=003eff&bgTextureActive=flat&bgColorActive=007fff&iconColorHover=555555&fcHover=2b2b2b&borderColorHover=cccccc&bgTextureHover=flat&bgColorHover=ededed&iconColorDefault=777777&fcDefault=454545&borderColorDefault=c5c5c5&bgTextureDefault=flat&bgColorDefault=f6f6f6&iconColorContent=444444&fcContent=333333&borderColorContent=dddddd&bgTextureContent=flat&bgColorContent=ffffff&iconColorHeader=444444&fcHeader=333333&borderColorHeader=dddddd&bgTextureHeader=flat&bgColorHeader=e9e9e9&cornerRadius=3px&fwDefault=normal&fsDefault=1em&ffDefault=Arial%2CHelvetica%2Csans-serif +* To view and modify this theme, visit http://jqueryui.com/themeroller/?scope=&folderName=base&cornerRadiusShadow=8px&offsetLeftShadow=0px&offsetTopShadow=0px&thicknessShadow=5px&opacityShadow=30&bgImgOpacityShadow=0&bgTextureShadow=flat&bgColorShadow=666666&opacityOverlay=30&bgImgOpacityOverlay=0&bgTextureOverlay=flat&bgColorOverlay=aaaaaa&iconColorError=A52a2a&fcError=5f3f3f&borderColorError=f1a899&bgTextureError=flat&bgColorError=fddfdf&iconColorHighlight=777620&fcHighlight=777620&borderColorHighlight=dad55e&bgTextureHighlight=flat&bgColorHighlight=fffa90&iconColorActive=ffffff&fcActive=ffffff&borderColorActive=003eff&bgTextureActive=flat&bgColorActive=007fff&iconColorHover=555555&fcHover=2b2b2b&borderColorHover=cccccc&bgTextureHover=flat&bgColorHover=ededed&iconColorDefault=777777&fcDefault=454545&borderColorDefault=c5c5c5&bgTextureDefault=flat&bgColorDefault=f6f6f6&iconColorContent=444444&fcContent=333333&borderColorContent=dddddd&bgTextureContent=flat&bgColorContent=ffffff&iconColorHeader=444444&fcHeader=333333&borderColorHeader=dddddd&bgTextureHeader=flat&bgColorHeader=e9e9e9&cornerRadius=3px&fwDefault=normal&fsDefault=1em&ffDefault=Arial%2CHelvetica%2Csans-serif * Copyright jQuery Foundation and other contributors; Licensed MIT */ .ui-helper-hidden { display: none; @@ -2907,7 +2907,7 @@ a.ui-button:active { } .ui-state-error .ui-icon, .ui-state-error-text .ui-icon { - background-image: url(images/ui-icons_cc0000_256x240.png); + background-image: url(images/ui-icons_A52a2a_256x240.png); } .ui-button .ui-icon { background-image: url(images/ui-icons_777777_256x240.png); @@ -3662,7 +3662,7 @@ a.ui-button:active { } .ui-state-error .ui-icon, .ui-state-error-text .ui-icon { - background-image: url(images/ui-icons_cc0000_256x240.png); + background-image: url(images/ui-icons_A52a2a_256x240.png); } .ui-button .ui-icon { background-image: url(images/ui-icons_777777_256x240.png); diff --git a/src/components/echarts/analytics.vue b/src/components/echarts/analytics.vue index 48957cfc..9447c6ca 100644 --- a/src/components/echarts/analytics.vue +++ b/src/components/echarts/analytics.vue @@ -385,7 +385,7 @@ export default { symbol: 'none', sampling: 'lttb', itemStyle: { - color: '#FFCC00' + color: '#DAA520' }, data: adata }, @@ -396,7 +396,7 @@ export default { symbol: 'none', sampling: 'lttb', itemStyle: { - color: '#009900' + color: '#2E8B57' }, data: bdata }, @@ -407,7 +407,7 @@ export default { symbol: 'none', sampling: 'lttb', itemStyle: { - color: '#CC0000' + color: '#A52a2a' }, data: cdata }, diff --git a/src/components/echarts/color.ts b/src/components/echarts/color.ts index f005b21d..649ed395 100644 --- a/src/components/echarts/color.ts +++ b/src/components/echarts/color.ts @@ -10,5 +10,5 @@ export let color = [ '#66FFCC', '#B3B' ] -export const gradeColor3 = ['#339966', '#FFCC33', '#CC0000'] -export const gradeColor5 = ['#00CC00', '#99CC99', '#FF9900', '#996600', '#CC0000'] +export const gradeColor3 = ['#339966', '#FFCC33', '#A52a2a'] +export const gradeColor5 = ['#00CC00', '#99CC99', '#FF9900', '#996600', '#A52a2a'] diff --git a/src/components/echarts/rmsboxi.vue b/src/components/echarts/rmsboxi.vue index d955b373..9ff7e3fe 100644 --- a/src/components/echarts/rmsboxi.vue +++ b/src/components/echarts/rmsboxi.vue @@ -772,7 +772,7 @@ export default { zhou = waveDatas[0].RMSSMinDetail.secondeZhou; } - colors.push("#FFCC00"); + colors.push("#DAA520"); colors.push("#fff"); colors.push("#fff"); break; @@ -810,8 +810,8 @@ export default { rmsvY = waveDatas[0].RMSSMinDetail.rmsvSecondY; zhou = waveDatas[0].RMSSMinDetail.secondeZhou; } - colors.push("#FFCC00"); - colors.push("#009900"); + colors.push("#DAA520"); + colors.push("#2E8B57"); colors.push("#fff"); break; case 3: @@ -849,9 +849,9 @@ export default { rmsvY = waveDatas[0].RMSSMinDetail.rmsvSecondY; zhou = waveDatas[0].RMSSMinDetail.secondeZhou; } - colors.push("#FFCC00"); - colors.push("#009900"); - colors.push("#CC0000"); + colors.push("#DAA520"); + colors.push("#2E8B57"); + colors.push("#A52a2a"); break; } if (waveDatas[0].unit === "电压") { @@ -1121,7 +1121,7 @@ export default { symbol: "none", sampling: "average", itemStyle: { - color: "#FFCC00", + color: "#DAA520", }, data: radata, }, @@ -1132,7 +1132,7 @@ export default { symbol: "none", sampling: "average", itemStyle: { - color: "#009900", + color: "#2E8B57", }, data: rbdata, }, @@ -1143,7 +1143,7 @@ export default { symbol: "none", sampling: "average", itemStyle: { - color: "#CC0000", + color: "#A52a2a", }, data: rcdata, }, @@ -1542,7 +1542,7 @@ export default { symbol: "none", sampling: "average", itemStyle: { - color: "#FFCC00", + color: "#DAA520", }, data: radata, }, @@ -1553,7 +1553,7 @@ export default { symbol: "none", sampling: "average", itemStyle: { - color: "#009900", + color: "#2E8B57", }, data: rbdata, }, @@ -1564,7 +1564,7 @@ export default { symbol: "none", sampling: "average", itemStyle: { - color: "#CC0000", + color: "#A52a2a", }, data: rcdata, }, diff --git a/src/components/echarts/shushiboxi.vue b/src/components/echarts/shushiboxi.vue index c956adc2..48842a18 100644 --- a/src/components/echarts/shushiboxi.vue +++ b/src/components/echarts/shushiboxi.vue @@ -488,7 +488,7 @@ export default { adata = waveDatas[0].shunshiS.shunshiSA } - colors.push('#FFCC00') + colors.push('#DAA520') colors.push('#fff') colors.push('#fff') break @@ -508,8 +508,8 @@ export default { adata = waveDatas[0].shunshiS.shunshiSA bdata = waveDatas[0].shunshiS.shunshiSB } - colors.push('#FFCC00') - colors.push('#009900') + colors.push('#DAA520') + colors.push('#2E8B57') colors.push('#fff') break case 3: @@ -532,9 +532,9 @@ export default { cdata = waveDatas[0].shunshiS.shunshiSC } - colors.push('#FFCC00') - colors.push('#009900') - colors.push('#CC0000') + colors.push('#DAA520') + colors.push('#2E8B57') + colors.push('#A52a2a') break } @@ -788,7 +788,7 @@ export default { symbol: 'none', sampling: 'average', itemStyle: { - color: '#FFCC00' + color: '#DAA520' }, data: adata }, @@ -801,7 +801,7 @@ export default { symbol: 'none', sampling: 'average', itemStyle: { - color: '#009900' + color: '#2E8B57' }, data: bdata }, @@ -814,7 +814,7 @@ export default { symbol: 'none', sampling: 'average', itemStyle: { - color: '#CC0000' + color: '#A52a2a' }, data: cdata }, @@ -867,24 +867,24 @@ export default { switch (this.iphasic) { case 1: a = waveDataTemp.title.aTitle - colors.push('#FFCC00') + colors.push('#DAA520') colors.push('#fff') colors.push('#fff') break case 2: a = waveDataTemp.title.aTitle b = waveDataTemp.title.bTitle - colors.push('#FFCC00') - colors.push('#009900') + colors.push('#DAA520') + colors.push('#2E8B57') colors.push('#fff') break case 3: a = waveDataTemp.title.aTitle b = waveDataTemp.title.bTitle c = waveDataTemp.title.cTitle - colors.push('#FFCC00') - colors.push('#009900') - colors.push('#CC0000') + colors.push('#DAA520') + colors.push('#2E8B57') + colors.push('#A52a2a') break } @@ -1151,7 +1151,7 @@ export default { symbol: 'none', sampling: 'average', itemStyle: { - color: '#FFCC00' + color: '#DAA520' }, data: adata }, @@ -1164,7 +1164,7 @@ export default { symbol: 'none', sampling: 'average', itemStyle: { - color: '#009900' + color: '#2E8B57' }, data: bdata }, @@ -1177,7 +1177,7 @@ export default { symbol: 'none', sampling: 'average', itemStyle: { - color: '#CC0000' + color: '#A52a2a' }, data: cdata } diff --git a/src/components/echarts/shushiboxi2.vue b/src/components/echarts/shushiboxi2.vue index 5ce35384..de3b168e 100644 --- a/src/components/echarts/shushiboxi2.vue +++ b/src/components/echarts/shushiboxi2.vue @@ -151,7 +151,7 @@ const info = () => { // top: '30px', // left: '30px' // }, - // color: ['#FFCC00', '#009900', '#CC0000'], + // color: ['#DAA520', '#2E8B57', '#A52a2a'], // series: [ // { // name: 'A相', diff --git a/src/views/cockpit/qualifiedRate.vue b/src/views/cockpit/qualifiedRate.vue index bd08956e..c508cfe0 100644 --- a/src/views/cockpit/qualifiedRate.vue +++ b/src/views/cockpit/qualifiedRate.vue @@ -64,7 +64,7 @@ const itemStyle = { [ { offset: 1, - color: '#CC0000' + color: '#A52a2a' } ], false @@ -190,13 +190,13 @@ const tableStore = new TableStore({ name: '', yAxis: 60, lineStyle: { - color: '#CC0000' + color: '#A52a2a' }, label: { // position: "middle", formatter: '{b}', textStyle: { - color: '#CC0000' + color: '#A52a2a' } } } diff --git a/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue b/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue index d6c98843..626bb8bf 100644 --- a/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue +++ b/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue @@ -369,7 +369,7 @@ const setEChart = (val: any, data: any, text: string, name: string) => { top: '30px', left: '30px' }, - color: ['#FFCC00', '#009900', '#CC0000'], + color: ['#DAA520', '#2E8B57', '#A52a2a'], series: [ { name: 'A相', diff --git a/src/views/pqs/business/terminal/ProgramManagement/index.vue b/src/views/pqs/business/terminal/ProgramManagement/index.vue index 68854cdc..4669913e 100644 --- a/src/views/pqs/business/terminal/ProgramManagement/index.vue +++ b/src/views/pqs/business/terminal/ProgramManagement/index.vue @@ -80,14 +80,14 @@ 热备用 - + 停运