a484c835 by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents 008c1eac 85e3218b
......@@ -84,14 +84,14 @@
</el-form-item>
</el-form>
<div class="handleBtn">
<el-button type="primary" class="w98 import">导入图形</el-button>
<!-- <el-button type="primary" class="w98 import">导入图形</el-button> -->
<el-button type="primary" class="w98 creat" @click="newZd">创建</el-button>
<el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
</div>
</el-tab-pane>
<el-tab-pane class="eltabspane" v-if="!auth" label="宗海" name="zh">
<div class="handleBtn">
<el-button type="primary" class="w98 import">导入图形</el-button>
<!-- <el-button type="primary" class="w98 import">导入图形</el-button> -->
<el-button type="primary" class="w98 creat" @click="todo">创建</el-button>
<el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
</div>
......@@ -106,7 +106,7 @@
</el-form-item>
</el-form>
<div class="handleBtn">
<el-button type="primary" class="w98 import">导入图形</el-button>
<!-- <el-button type="primary" class="w98 import">导入图形</el-button> -->
<el-button type="primary" class="w98 creat" @click="newZrz">创建</el-button>
<el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
</div>
......@@ -121,14 +121,14 @@
</el-form-item>
</el-form>
<div class="handleBtn">
<el-button type="primary" class="w98 import">导入图形</el-button>
<!-- <el-button type="primary" class="w98 import">导入图形</el-button> -->
<el-button type="primary" class="w98 creat" @click="newDz">创建</el-button>
<el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
</div>
</el-tab-pane>
<el-tab-pane class="eltabspane" v-if="!createZrz" label="林权" name="lq">
<div class="handleBtn">
<el-button type="primary" class="w98 import">导入图形</el-button>
<!-- <el-button type="primary" class="w98 import">导入图形</el-button> -->
<el-button type="primary" class="w98 creat" @click="todo">创建</el-button>
<el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
</div>
......@@ -143,7 +143,7 @@
</el-form-item>
</el-form>
<div class="handleBtn">
<el-button type="primary" class="w98 import">导入图形</el-button>
<!-- <el-button type="primary" class="w98 import">导入图形</el-button> -->
<el-button type="primary" class="w98 creat" @click="newGzw">创建</el-button>
<el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
</div>
......@@ -673,7 +673,7 @@ export default {
position: absolute;
bottom: 0;
left: 50%;
margin-left: -250px;
// margin-left: -250px;
.w98{
width: 98px;
}
......
......@@ -584,7 +584,7 @@ export default {
// 绘制指标数字
chart.annotation().text({
position: ['80%', '55%'],
content: '合格率',
content: '及时率',
style: {
fontSize: 20,
fill: '#545454',
......