Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
7199e188 by 任超
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

2 parents 148e4bde 4346028a
Inline Side-by-side
Showing 6 changed files with 11 additions and 14 deletions
...@@ -310,6 +310,7 @@ table td { ...@@ -310,6 +310,7 @@ table td {
310 } 310 }
311 311
312 .el-picker-panel__footer { 312 .el-picker-panel__footer {
313 display: none;
313 background-color: #031a46; 314 background-color: #031a46;
314 } 315 }
315 316
...@@ -388,10 +389,6 @@ table td { ...@@ -388,10 +389,6 @@ table td {
388 background-color: #031a46; 389 background-color: #031a46;
389 } 390 }
390 391
391 .el-picker-panel__footer {
392 background-color: #031a46;
393 }
394
395 .el-time-panel { 392 .el-time-panel {
396 background-color: #074487 !important; 393 background-color: #074487 !important;
397 color: #E3F1FF; 394 color: #E3F1FF;
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
9 </el-form-item> 9 </el-form-item>
10 <el-row> 10 <el-row>
11 <el-col :span="6"> 11 <el-col :span="6">
12 <el-form-item label="行政区"> 12 <el-form-item label="行政区">
13 <el-select v-model="form.areacode" class="width100" filterable placeholder="行政区"> 13 <el-select v-model="form.areacode" class="width100" clearable placeholder="行政区">
14 <el-option v-for="item in dicData['XZQ']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 14 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
15 </el-option> 15 </el-option>
16 </el-select> 16 </el-select>
17 </el-form-item> 17 </el-form-item>
......
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
56 name: "jktj", 56 name: "jktj",
57 data () { 57 data () {
58 return { 58 return {
59 // 开始结束日期限制 59 // 开始日期限制
60 pickerOptionsStart: { 60 pickerOptionsStart: {
61 disabledDate: (time) => { 61 disabledDate: (time) => {
62 if (this.form.endTime) { 62 if (this.form.endTime) {
......
...@@ -74,7 +74,7 @@ export default { ...@@ -74,7 +74,7 @@ export default {
74 name: "jktj", 74 name: "jktj",
75 data () { 75 data () {
76 return { 76 return {
77 // 开始结束日期限制 77 // 开始日期限制
78 pickerOptionsStart: { 78 pickerOptionsStart: {
79 disabledDate: (time) => { 79 disabledDate: (time) => {
80 if (this.form.endTime) { 80 if (this.form.endTime) {
...@@ -141,7 +141,7 @@ export default { ...@@ -141,7 +141,7 @@ export default {
141 let myChart = this.$echarts.init(document.getElementById("myChart")); 141 let myChart = this.$echarts.init(document.getElementById("myChart"));
142 // 绘制图表 142 // 绘制图表
143 myChart.setOption({ 143 myChart.setOption({
144 color: ["#fff", "#ff6e6e", "#3f99ff", "#ffaf48"], 144 color: ["#13E5FF", "#C99E68", "#E873B2", "#ffaf48"],
145 tooltip: { 145 tooltip: {
146 trigger: "axis", 146 trigger: "axis",
147 formatter: '{b}<br/>{a0}：{c0}个<br/>{a1}：{c1}个<br/>{a2}：{c2}%', 147 formatter: '{b}<br/>{a0}：{c0}个<br/>{a1}：{c1}个<br/>{a2}：{c2}%',
......
...@@ -74,7 +74,7 @@ export default { ...@@ -74,7 +74,7 @@ export default {
74 name: "jktj", 74 name: "jktj",
75 data () { 75 data () {
76 return { 76 return {
77 // 开始结束日期限制 77 // 开始日期限制
78 pickerOptionsStart: { 78 pickerOptionsStart: {
79 disabledDate: (time) => { 79 disabledDate: (time) => {
80 if (this.form.endTime) { 80 if (this.form.endTime) {
...@@ -136,7 +136,7 @@ export default { ...@@ -136,7 +136,7 @@ export default {
136 let myChart = this.$echarts.init(document.getElementById("myChart")); 136 let myChart = this.$echarts.init(document.getElementById("myChart"));
137 // 绘制图表 137 // 绘制图表
138 myChart.setOption({ 138 myChart.setOption({
139 color: ["#00bdb1", "#ff6e6e", "#3f99ff", "#ffaf48"], 139 color: ["#13E5FF"],
140 tooltip: { 140 tooltip: {
141 show: true, 141 show: true,
142 trigger: "axis", 142 trigger: "axis",
......
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
32 </el-col> 32 </el-col>
33 <el-col :span="6"> 33 <el-col :span="6">
34 <el-form-item label="汇交状态" prop="state"> 34 <el-form-item label="汇交状态" prop="state">
35 <el-select v-model="form.state" class="width100" clearable placeholder="汇交状态"> 35 <el-select v-model="form.hjjg" class="width100" clearable placeholder="汇交状态">
36 <el-option v-for="item in dicData['sbhjzt']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 36 <el-option v-for="item in dicData['sbhjzt']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
37 </el-option> 37 </el-option>
38 </el-select> 38 </el-select>
39 </el-form-item> 39 </el-form-item>
......