Commit 74b85d07 authored by 刘飞's avatar 刘飞

1.进度条样式修改,2.修复打包后字体图标路径出错问题

parent e8f46dc2
...@@ -48,7 +48,7 @@ exports.cssLoaders = function (options) { ...@@ -48,7 +48,7 @@ exports.cssLoaders = function (options) {
return ExtractTextPlugin.extract({ return ExtractTextPlugin.extract({
use: loaders, use: loaders,
fallback: 'vue-style-loader', fallback: 'vue-style-loader',
publicPath:'./' publicPath:'../../'
}) })
} else { } else {
return ['vue-style-loader'].concat(loaders) return ['vue-style-loader'].concat(loaders)
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
const path = require('path') const path = require('path')
var configjson = require("../static/config.json") var configjson = require("../static/config.json")
console.log('process.env.IsNeedConfig'+process.env.IsNeedConfig)
var baseurl=process.env.IsNeedConfig?configjson.config.ProjectName+"/":"FTT.Board/"; var baseurl=process.env.IsNeedConfig?configjson.config.ProjectName+"/":"FTT.Board/";
console.log(baseurl); console.log(baseurl);
module.exports = { module.exports = {
......
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0" />
<title>board</title> <title>board</title>
<style>
.el-progress-bar {
display: flex !important;
align-items: center;
}
.el-progress-bar__innerText {
/* font-size: 23px !important; */
display: flex !important;
align-items: center !important;
justify-content: flex-end !important;
margin: 0 !important;
box-sizing: border-box !important;
/* padding:0 0 0 35px !important; */
padding:0 0 0 18px !important;
}
.el-table .cell, .el-table th div{
overflow: hidden !important;
}
.el-progress-bar__outer{
height: 60% !important;
}
.el-progress-bar__inner{
border-radius: 11px !important;
}
.el-progress-bar__outer{
border-radius: 11px !important;
}
</style>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
:style="{width:getwidth(obj)+'%',border:'1px'+' solid '+getfontcolor(item),borderColor:boardstore.BorderColor==null?'red':boardstore.BorderColor}" :style="{width:getwidth(obj)+'%',border:'1px'+' solid '+getfontcolor(item),borderColor:boardstore.BorderColor==null?'red':boardstore.BorderColor}"
v-if="obj.Key.indexOf('_percent')>0" v-if="obj.Key.indexOf('_percent')>0"
> >
<el-progress :text-inside="true" :stroke-width="20" :color="obj.Key.indexOf('#') ? '#'+obj.Value.split('#')[1] : '#409EFF'" :percentage="obj.Key.indexOf('#') ? parseInt(obj.Value.split('#')[0]) : parseInt(obj.Value)" status="exception"></el-progress> <el-progress :text-inside="true" :style="{color:getfontcolor(item)}" :stroke-width="20" type="line" :color="obj.Key.indexOf('#') ? '#'+obj.Value.split('#')[1] : '#409EFF'" :percentage="obj.Key.indexOf('#') ? parseInt(obj.Value.split('#')[0]) : parseInt(obj.Value)" status="exception"></el-progress>
</td> </td>
</template> </template>
</tr> </tr>
...@@ -329,10 +329,6 @@ export default { ...@@ -329,10 +329,6 @@ export default {
}; };
</script> </script>
<style > <style >
.el-progress-bar{
display: flex;
align-items: center;
}
.seamless-warp { .seamless-warp {
height: 95%; height: 95%;
overflow: hidden; overflow: hidden;
......
...@@ -20,31 +20,11 @@ ...@@ -20,31 +20,11 @@
:key="index1" :key="index1"
class="tableclass" class="tableclass"
:style="{width:getwidth(obj)+'%'}" :style="{width:getwidth(obj)+'%'}"
v-if="obj.Key.indexOf('_')>0 && index1 % 2 == 0" v-if="obj.Key.indexOf('_')>0"
>{{obj.Value}}</td> >{{obj.Value}}</td>
<td
:key="index1"
class="tableclass"
:style="{width:getwidth(obj)+'%'}"
v-if="obj.Key.indexOf('_')>0 && index1 % 2 != 0"
>
<el-progress :text-inside="true" :stroke-width="20" :percentage="index1+20" status="exception"></el-progress>
</td>
</template> </template>
</tr> </tr>
</template> </template>
<!-- <template>
<tr>
<template >
<td class="tableclass" >
<el-progress :text-inside="true" :stroke-width="20" :percentage="50" status="exception"></el-progress>
</td>
<td class="tableclass">
<el-progress :text-inside="true" :stroke-width="20" :percentage="50" status="exception"></el-progress>
</td>
</template>
</tr>
</template>-->
<template v-if="itemdata.length<chart.PageSize"> <template v-if="itemdata.length<chart.PageSize">
<tr <tr
v-for="(tt,index) in (chart.PageSize-itemdata.length)" v-for="(tt,index) in (chart.PageSize-itemdata.length)"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment