修改

dsk-operate-ui/src/views/login.vue

 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title"><img src="../assets/images/title_icon.png"/>欢迎登录系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
           type="text"
           auto-complete="off"
-          placeholder="账号"
+          placeholder="请输入登录账号"
         >
-          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+          <img class="img" slot="prefix" src="../assets/images/user.png"/>
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
@@ -17,33 +17,33 @@
           v-model="loginForm.password"
           type="password"
           auto-complete="off"
-          placeholder="密码"
+          placeholder="请输入账号密码"
           @keyup.enter.native="handleLogin"
         >
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+          <img class="img" slot="prefix" src="../assets/images/password.png"/>
         </el-input>
       </el-form-item>
       <el-form-item prop="code" v-if="captchaEnabled">
         <el-input
           v-model="loginForm.code"
           auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
+          placeholder="请输入验证码"
+          style="width: 56%;float: left;"
           @keyup.enter.native="handleLogin"
         >
-          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+          <img class="img" slot="prefix" src="../assets/images/validCode.png"/>
         </el-input>
         <div class="login-code">
           <img :src="codeUrl" @click="getCode" class="login-code-img"/>
         </div>
       </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
+      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 48px;">记住密码</el-checkbox>
       <el-form-item style="width:100%;">
         <el-button
           :loading="loading"
           size="medium"
           type="primary"
-          style="width:100%;"
+          style="width:100%;height: 48px;border-radius: 4px;font-size: 16px;"
           @click.native.prevent="handleLogin"
         >
           <span v-if="!loading">登 录</span>
@@ -54,10 +54,6 @@
         </div>
       </el-form-item>
     </el-form>
-    <!--  底部  -->
-    <div class="el-login-footer">
-      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
-    </div>
   </div>
 </template>
 
@@ -161,30 +157,53 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login_background.jpg");
+  background-image: url("../assets/images/login_bg.png");
   background-size: cover;
 }
 .title {
-  margin: 0px auto 30px auto;
-  text-align: center;
-  color: #707070;
+  padding: 46px 0 32px 48px;
+  border-bottom: 1px solid #F0F0F0;
+  font-size: 22px;
+  color: #232323;
+  margin: 0 0 32px 0;
+  img{
+    width: 17px;
+    height: 17px;
+    margin-bottom: 3px;
+  }
 }
 
 .login-form {
   border-radius: 6px;
   background: #ffffff;
-  width: 400px;
-  padding: 25px 25px 5px 25px;
+  width: 420px;
+  /*padding: 25px 25px 5px 25px;*/
+  .el-form-item{
+    padding: 0 48px;
+    margin-bottom:24px;
+  }
   .el-input {
-    height: 38px;
+    width: 324px;
+    height: 48px;
+    background: #F2F4F9;
     input {
-      height: 38px;
+      height: 48px;
+      background: #F2F4F9;
+      font-size: 14px;
+    }
+    .el-input__inner{
+      padding-left: 73px;
     }
   }
-  .input-icon {
-    height: 39px;
-    width: 14px;
-    margin-left: 2px;
+  .el-input__prefix{
+    border-right: 1px solid #D8D8D8;
+    height: 24px;
+    margin: 12px 0;
+  }
+  .img {
+    height: 24px;
+    width: 24px;
+    margin: 0 14px 0 12px;
   }
 }
 .login-tip {
@@ -195,7 +214,8 @@ export default {
 .login-code {
   width: 33%;
   height: 38px;
-  float: right;
+  float: left;
+  margin-left: 16px;
   img {
     cursor: pointer;
     vertical-align: middle;
@@ -214,6 +234,6 @@ export default {
   letter-spacing: 1px;
 }
 .login-code-img {
-  height: 38px;
+  height: 48px;
 }
 </style>

dsk-operate-ui/src/views/macro/enterprises/index.vue

@@ -164,16 +164,30 @@ export default {
       padding: 16px;
       .search{
         ::v-deep .el-cascader{
-          width: 130px;
+          width: 180px;
           margin-right: 12px;
           height: 32px;
           .el-input{
             width: 100%;
+            height: 32px;
+            .el-input__inner{
+              height: 32px !important;
+            }
+          }
+          .el-cascader__tags{
+            flex-wrap: inherit;
+            .el-tag{
+              max-width: 100px;
+              margin: 5px 0 2px 6px;
+            }
           }
         }
         ::v-deep .el-input{
           width: 250px;
           height: 32px;
+          .el-input__inner{
+            height: 32px;
+          }
           .el-input-group__append{
             width: 59px;
             background: #F5F5F5;

dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue

@@ -268,6 +268,14 @@
         .el-form{
           margin-left: 24px;
         }
+        ::v-deep .el-cascader{
+          .el-cascader__tags{
+            flex-wrap: inherit;
+            .el-tag{
+              max-width: 130px;
+            }
+          }
+        }
       }
     }
     .content{

dsk-operate-ui/src/views/macro/nationalEconomies/component/zhaobiao.vue

@@ -139,7 +139,7 @@ export default {
         },
       ],
       glData:['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'],
-      glData1:[103,156,132,186,203,143,189,301,211,195,132,176],
+      glData1:[503,156,132,186,203,143,189,301,211,195,132,176],
       tableData1:[
         {
           area:'1月',
@@ -263,6 +263,7 @@ export default {
     },
     initChart1() {
       let myChart = echarts.init(document.getElementById("gl-echarts"))
+      let dataList=this.glData1;
       let option = {
         tooltip: {
           trigger: 'axis', //坐标轴触发，主要在柱状图，折线图等会使用类目轴的图表中使用
@@ -287,17 +288,41 @@ export default {
         series: [
           {
             data: this.glData1,
-            markPoint:{
-              data:[
-                {type:'max',name:'最大值'},
-              ]
-            },
+            // markPoint:{
+            //   data:[
+            //     {type:'max',name:'最大值'},
+            //     {type:'min',name:'最小值'},
+            //   ]
+            // },
             type: 'bar',
             barWidth: 20,
             itemStyle: {
               normal: {
                 barBorderRadius: [4, 4, 0, 0],
-                color: '#2ECFCF',
+                // color: '#2ECFCF',
+                color: function (params) {
+                  var colorList = []  //定义一个存储颜色的数组
+                  //更改前二位柱形颜色
+                  //定义一个变量 保存柱形图数据 因为sort方法排序会改变原数组 使用JSON方法深拷贝 将原数值暂存
+                  let companyValue1 = JSON.parse(JSON.stringify(dataList))
+                  let arr = dataList.sort((a, b) => {
+                    return b - a
+                  })
+                  //将原数组数据赋值回去  保持数据不变
+                  dataList = JSON.parse(JSON.stringify(companyValue1))
+                  //遍历数据 将原数组和排序后的数组比较
+                  dataList.map(i => {
+                    if (i == arr[0]) {
+                      colorList.push('#F39F35')
+                    } else if (i == arr[1]) {
+                      colorList.push('#6675A5')
+                    }else{
+                      colorList.push('#2ECFCF')
+                    }
+                  })
+                  //返回一个存储着颜色的数组根据数据index顺序渲染到页面
+                  return colorList[params.dataIndex]
+                }
               },
             }
           }