Merge branch 'zuhuduan' of http://192.168.60.201/root/dsk-operate-sys into zuhuduan

dsk-admin/src/main/java/com/dsk/web/controller/system/SysTenantController.java

@@ -145,7 +145,7 @@ public class SysTenantController extends BaseController {
     /**
      * 清除动态租户
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckRole({TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY})
     @GetMapping("/dynamic/clear")
     public R<Void> dynamicClear() {
         TenantHelper.clearDynamic();
@@ -158,7 +158,7 @@ public class SysTenantController extends BaseController {
      * @param tenantId  租户id
      * @param packageId 套餐id
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckRole({TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY})
     @SaCheckPermission("system:tenant:edit")
     @Log(title = "租户", businessType = BusinessType.UPDATE)
     @GetMapping("/syncTenantPackage")

dsk-common/src/main/java/com/dsk/common/constant/TenantConstants.java

@@ -37,6 +37,16 @@ public interface TenantConstants {
      */
     String TENANT_ADMIN_ROLE_NAME = "管理员";
 
+    /**
+     * 大司空租户管理员角色
+     */
+    String DSK_TENANT_ADMIN_ROLE_KEY = "accountAdmin";
+
+    /**
+     * 大司空租户管理员角色名称
+     */
+    String DSK_TENANT_ADMIN_ROLE_NAME = "企业账号管理员";
+
     /**
      * 默认租户ID
      */

dsk-operate-ui/src/views/detail/party-b/index.vue

@@ -91,12 +91,12 @@
     iframeLoading() {
       let iframeHeight = document.getElementById("companyIframe").clientHeight, number = 0
       this.iframeTimer = setInterval(()=>{
-        number ++
-        if(document.getElementById("companyIframe").clientHeight != iframeHeight || number == 5000){
+        number = number+1000
+        if(document.getElementById("companyIframe").clientHeight != iframeHeight || number == 3000){
           this.loading = false
           clearInterval(this.iframeTimer)
         }
-      })
+      },1000)
     }
   }
 }

dsk-operate-ui/src/views/enterpriseManagement/programme.vue

@@ -154,7 +154,7 @@
 </template>
 
 <script>
-  import { treeselect as qytreeselect} from "@/api/system/menu";
+  import { qytreeselect} from "@/api/system/menu";
 
 
   import { addTenantPackage ,getTenantPackage,detailTenantPackage,saveTenantPackage,deleteTenantPackage} from "@/api/enterpriseManagement/enterpriseManagement";

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

@@ -24,6 +24,7 @@
         <el-form-item prop="captchaCode" v-if="captchaEnabled">
           <el-input
             v-model="dxform.captchaCode"
+            @focus="getCode"
             auto-complete="off"
             placeholder="请输入图形验证码"
             style="width: 196px;float: left;"
@@ -92,6 +93,7 @@
             v-model="loginForm.code"
             auto-complete="off"
             placeholder="请输入图形验证码"
+            @focus="getCode"
             style="width: 196px;float: left;"
             @keyup.enter.native="handleLogin"
           >
@@ -130,6 +132,7 @@
         <el-form-item prop="captchaCode" v-if="captchaEnabled && showcode">
           <el-input
             v-model="dxform.captchaCode"
+            @focus="getCode"
             auto-complete="off"
             placeholder="请输入验证码"
             style="width: 196px;float: left;"
@@ -272,8 +275,8 @@
       if(this.nosend == true){
         return false
       }
-      // logincaptchaSms(this.dxform).then(res=>{
-      //   if(res.code == 200){
+      logincaptchaSms(this.dxform).then(res=>{
+        if(res.code == 200){
 
           this.$message.success('已发送短信！')
           let _this = this
@@ -288,14 +291,14 @@
               _this.smstime = 60
             }
           },1000)
-      //   }else{
-      //     this.$message.error(res.msg)
-      //     this.getCode()
-      //     this.showcode = true
-      //   }
-      // }).catch(res=>{
-      //   this.$message.error(res.msg)
-      // })
+        }else{
+          this.$message.error(res.msg)
+          this.getCode()
+          this.showcode = true
+        }
+      }).catch(res=>{
+        this.$message.error(res.msg)
+      })
     },
     handleLogin() {
       this.$refs.loginForm.validate(valid => {

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

@@ -167,6 +167,7 @@
       getYears(){
         getYears({}).then(res => {
           this.yearOptions=res.data.reverse();
+          this.queryParams.year=this.yearOptions[0].year
         })
       },
       //地区

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

@@ -31,8 +31,12 @@
                 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
               </el-table-column>
               <el-table-column prop="type" label="供应方式" :formatter="formatStatus"/>
-              <el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable/>
-              <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="100"/>
+              <el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable>
+                <template slot-scope="scope">{{ scope.row.count }}个</template>
+              </el-table-column>
+              <el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90">
+                <template slot-scope="scope">{{ scope.row.rate }}%</template>
+              </el-table-column>
             </el-table>
           </div>
         </div>
@@ -70,8 +74,12 @@
                 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
               </el-table-column>
               <el-table-column prop="type" label="供应方式" :formatter="formatStatus"/>
-              <el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable/>
-              <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="100"/>
+              <el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable>
+                <template slot-scope="scope">{{ scope.row.count }}个</template>
+              </el-table-column>
+              <el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90">
+                <template slot-scope="scope">{{ scope.row.rate }}%</template>
+              </el-table-column>
             </el-table>
           </div>
         </div>
@@ -112,8 +120,12 @@
                 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
               </el-table-column>
               <el-table-column prop="province" label="地区" :formatter="formatStatus"/>
-              <el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable/>
-              <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="100"/>
+              <el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable>
+                <template slot-scope="scope">{{ scope.row.count }}个</template>
+              </el-table-column>
+              <el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90">
+                <template slot-scope="scope">{{ scope.row.rate }}%</template>
+              </el-table-column>
             </el-table>
           </div>
         </div>
@@ -147,8 +159,12 @@
                 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
               </el-table-column>
               <el-table-column prop="type" label="年份" :formatter="formatStatus"/>
-              <el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable/>
-              <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="100"/>
+              <el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable>
+                <template slot-scope="scope">{{ scope.row.count }}个</template>
+              </el-table-column>
+              <el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90">
+                <template slot-scope="scope">{{ scope.row.rate }}%</template>
+              </el-table-column>
             </el-table>
           </div>
         </div>
@@ -789,6 +805,9 @@ export default {
         width: 33%;
         float: right;
         ::v-deep .el-table{
+          .caret-wrapper{
+            width: 13px;
+          }
           .sort-caret.ascending{
             border-bottom-color: rgba(0,129,255,0.5);
           }

dsk-system/src/main/java/com/dsk/system/service/impl/SysMenuServiceImpl.java

@@ -97,7 +97,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
             menuList = baseMapper.selectList(new LambdaQueryWrapper<SysMenu>()
                     .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName())
                     .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible())
-                    .eq(StringUtils.isNotBlank(menu.getStatus()), SysMenu::getStatus, menu.getStatus())
+                    .eq(SysMenu::getStatus, "0")
                     .orderByAsc(SysMenu::getParentId)
                     .orderByAsc(SysMenu::getOrderNum));
             menuList = menuList.stream().filter(menu1 -> !menu1.getMenuName().equals("企业管理")).collect(Collectors.toList());