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

@@ -310,6 +310,7 @@ table td {
   }
 
   .el-picker-panel__footer {
+    display: none;
     background-color: #031a46;
   }
 
@@ -388,10 +389,6 @@ table td {
     background-color: #031a46;
   }
 
-  .el-picker-panel__footer {
-    background-color: #031a46;
-  }
-
   .el-time-panel {
     background-color: #074487 !important;
     color: #E3F1FF;

@@ -9,9 +9,9 @@
         </el-form-item>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="行政区">
-              <el-select v-model="form.areacode" class="width100" filterable placeholder="行政区">
-                <el-option v-for="item in dicData['XZQ']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
+            <el-form-item label="行政区">              
+               <el-select v-model="form.areacode" class="width100" clearable placeholder="行政区">
+                  <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>
             </el-form-item>

@@ -56,7 +56,7 @@ export default {
   name: "jktj",
   data () {
     return {
-      // 开始结束日期限制
+      // 开始日期限制
       pickerOptionsStart: {
         disabledDate: (time) => {
           if (this.form.endTime) {

@@ -74,7 +74,7 @@ export default {
   name: "jktj",
   data () {
     return {
-      // 开始结束日期限制
+      // 开始日期限制
       pickerOptionsStart: {
         disabledDate: (time) => {
           if (this.form.endTime) {
@@ -141,7 +141,7 @@ export default {
       let myChart = this.$echarts.init(document.getElementById("myChart"));
       // 绘制图表
       myChart.setOption({
-        color: ["#fff", "#ff6e6e", "#3f99ff", "#ffaf48"],
+        color: ["#13E5FF", "#C99E68", "#E873B2", "#ffaf48"],
         tooltip: {
           trigger: "axis",
           formatter: '{b}<br/>{a0}：{c0}个<br/>{a1}：{c1}个<br/>{a2}：{c2}%',

@@ -74,7 +74,7 @@ export default {
   name: "jktj",
   data () {
     return {
-      // 开始结束日期限制
+      // 开始日期限制
       pickerOptionsStart: {
         disabledDate: (time) => {
           if (this.form.endTime) {
@@ -136,7 +136,7 @@ export default {
       let myChart = this.$echarts.init(document.getElementById("myChart"));
       // 绘制图表
       myChart.setOption({
-        color: ["#00bdb1", "#ff6e6e", "#3f99ff", "#ffaf48"],
+        color: ["#13E5FF"],
         tooltip: {
           show: true,
           trigger: "axis",

@@ -32,8 +32,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="汇交状态" prop="state">
-              <el-select v-model="form.state" class="width100" clearable placeholder="汇交状态">
-                <el-option v-for="item in dicData['sbhjzt']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
+              <el-select v-model="form.hjjg" class="width100" clearable placeholder="汇交状态">
+                 <el-option v-for="item in dicData['sbhjzt']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>
             </el-form-item>