下拉框样式

src/views/components/dialog/index.vue

@@ -207,7 +207,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column
-                  prop="enterColorChart"
+                  prop="entprColor"
                   label="企业分色"
                   show-overflow-tooltip
                   header-align="center"
@@ -215,7 +215,7 @@
                   <template slot-scope="scope">
                     <dict-tag
                       :options="dict.type.entpr_color"
-                      :value="scope.row.enterColorChart ? scope.row.enterColorChart : '未知'"
+                      :value="scope.row.entprColor ? scope.row.entprColor : '/'"
                     >
                     </dict-tag>
                   </template>
@@ -482,7 +482,7 @@ export default {
             obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
           }
         } else {
-          obj = this.pages
+          obj = {...this.pages,...this.form}
         }
       } else {
         // 不是苏州市是乡镇
@@ -494,6 +494,7 @@ export default {
           obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
         // }
       }
+      console.log(obj)
       // obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
       this.getTable(obj);
     },

src/views/yingji/echarts/executive.vue

@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-27 14:01:34
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-27 18:44:53
+ * @LastEditTime: 2023-09-28 17:03:02
 -->
 <template>
   <div >
@@ -82,5 +82,22 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-
+::v-deep .el-cascader {
+  background-color: transparent;
+  width: 210px;
+  .el-input__inner {
+    height: 33px;
+  }
+  .el-input .el-input__suffix .el-input__suffix-inner .el-icon-arrow-down::before {
+    content: "";
+    background: url(../../../assets/images/down2.png) center center no-repeat;
+    background-size: cover;
+    position: absolute;
+    width: 10px;
+    height: 7px;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+}
 </style>

src/views/yingji/enterprise.vue

@@ -149,18 +149,16 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="enterColor"
+          prop="entprColor"
           label="企业分色"
           header-align="center"
         >
           <template slot-scope="scope">
-            <div>
+            <dict-tag
-              {{
+              :options="dict.type.entpr_color"
-                scope.row.enterColorChart != "null"
+              :value="scope.row.entprColor ? scope.row.entprColor : '/'"
-                  ? filterTable(dict.entpr_color, scope.row.enterColor)
+            >
-                  : ""
+            </dict-tag>
-              }}
-            </div>
           </template>
         </el-table-column>
 
@@ -833,70 +831,70 @@ export default {
     // padding: 15px 10px;
     .filtrate {
       padding-bottom: 10px;
-      .select-input {
+      // .select-input {
+      //   // margin-right: 10px;
+      //   margin-top: 20px;
+      //   display: flex;
+      //   align-items: center;
+      //   .select-span {
+      //     font-size: 13px;
+      //     font-family: "Alibaba PuHuiTi";
+      //     font-weight: 400;
+      //     color: #525966;
+      //     // line-height: 40px;
       //     margin-right: 10px;
-        margin-top: 20px;
+      //   }
-        display: flex;
+      //   ::v-deep .el-select,
-        align-items: center;
+      //   .el-cascader {
-        .select-span {
+      //     background-color: transparent;
-          font-size: 13px;
+      //     width: 180px;
-          font-family: "Alibaba PuHuiTi";
+      //     .el-input__inner {
-          font-weight: 400;
+      //       height: 33px;
-          color: #525966;
+      //     }
-          // line-height: 40px;
+      //     // border-radius: 2px;
-          margin-right: 10px;
+      //     .el-input
-        }
+      //       .el-input__suffix
-        ::v-deep .el-select,
+      //       .el-input__suffix-inner
-        .el-cascader {
+      //       .el-icon-arrow-up::before {
-          background-color: transparent;
+      //       content: "";
-          width: 180px;
+      //       background: url(../../assets/images/down2.png) center center
-          .el-input__inner {
+      //         no-repeat;
-            height: 33px;
+      //       background-size: cover;
-          }
+      //       position: absolute;
+      //       width: 10px;
+      //       height: 7px;
+      //       top: 50%;
+      //       left: 50%;
+      //       transform: translate(-50%, -50%);
+      //     }
+      //   }
+      // }
+      // .select-input {
+      //   width: 45%;
+      //   ::v-deep .el-input {
+      //     .el-input__inner {
+      //       height: 33px;
+      //     }
+      //   }
+      // }
+      // .select-btn {
+      //   width: 80px;
+      //   height: 33px;
+      //   background: #2378ec;
       //   border-radius: 2px;
-          .el-input
+      //   display: flex;
-            .el-input__suffix
+      //   align-items: center;
-            .el-input__suffix-inner
+      //   justify-content: center;
-            .el-icon-arrow-up::before {
+      //   font-size: 15px;
-            content: "";
+      //   font-family: Alibaba PuHuiTi;
-            background: url(../../assets/images/down2.png) center center
+      //   font-weight: 500;
-              no-repeat;
+      //   color: #ffffff;
-            background-size: cover;
+      //   cursor: pointer;
-            position: absolute;
+      //   margin-right: 10px;
-            width: 10px;
+      // }
-            height: 7px;
+      // .select-btn1 {
-            top: 50%;
+      //   background: #28b384;
-            left: 50%;
+      // }
-            transform: translate(-50%, -50%);
-          }
-        }
-      }
-      .select-input {
-        width: 45%;
-        ::v-deep .el-input {
-          .el-input__inner {
-            height: 33px;
-          }
-        }
-      }
-      .select-btn {
-        width: 80px;
-        height: 33px;
-        background: #2378ec;
-        border-radius: 2px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-size: 15px;
-        font-family: Alibaba PuHuiTi;
-        font-weight: 500;
-        color: #ffffff;
-        cursor: pointer;
-        margin-right: 10px;
-      }
-      .select-btn1 {
-        background: #28b384;
-      }
     }
   }
 }
@@ -984,6 +982,11 @@ export default {
         .el-input__inner {
           height: 33px;
         }
+        .el-input .el-input__suffix .el-input__suffix-inner .el-icon-arrow-up {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+        }
         // border-radius: 2px;
         .el-input
           .el-input__suffix
@@ -995,9 +998,10 @@ export default {
           position: absolute;
           width: 10px;
           height: 7px;
-          top: 50%;
+          // top: 50%;
-          left: 50%;
+          // left: 50%;
-          transform: translate(-50%, -50%);
+          // transform: translate(-50%, -50%);
+          transform: rotate(180deg);
         }
       }
     }