导航

dsk-operate-ui/src/api/login.js

@@ -56,4 +56,12 @@ export function getCodeImg() {
     method: 'get',
     timeout: 20000
   })
-}
+}
\ No newline at end of file
+
+//获取租户企业列表
+export function getTenants(data) {
+  return request({
+    url: '/user/tenants?userName='+data,
+    method: 'post',
+  })
+}

dsk-operate-ui/src/store/modules/user.js

@@ -9,6 +9,7 @@ const user = {
     roles: [],
     permissions: [],
     userId:'',
+    phonenumber:'',
   },
 
   mutations: {
@@ -29,6 +30,9 @@ const user = {
     },
     SET_USERID: (state, userId) => {
       state.userId = userId
+    },
+    SET_USERPHONE: (state, phonenumber) => {
+      state.phonenumber = phonenumber
     }
   },
 
@@ -65,6 +69,7 @@ const user = {
           commit('SET_NAME', user.nickName)
           commit('SET_AVATAR', avatar)
           commit('SET_USERID', user.userId)
+          commit('SET_USERPHONE', user.phonenumber)
           resolve(res)
         }).catch(error => {
           reject(error)

dsk-operate-ui/src/utils/auth.js

 import Cookies from 'js-cookie'
 
 const TokenKey = 'Admin-Token'
+const Tenantid = 'Tenant-Id'
 
 export function getToken() {
   return Cookies.get(TokenKey)
 }
+export function getTenantid() {
+  return Cookies.get(Tenantid)
+}
 
 export function setToken(token) {
   return Cookies.set(TokenKey, token)
 }
+export function setTenantid(id) {
+  return Cookies.set(Tenantid, id)
+}
 
 export function removeToken() {
   return Cookies.remove(TokenKey)
 }
+
+export function removeTenantid() {
+  return Cookies.remove(Tenantid)
+}

dsk-operate-ui/src/utils/request.js

 import axios from 'axios'
 import { Notification, MessageBox, Message, Loading } from 'element-ui'
 import store from '@/store'
-import { getToken } from '@/utils/auth'
+import { getToken,getTenantid } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { tansParams, blobValidate } from "@/utils/ruoyi";
 import cache from '@/plugins/cache'
@@ -28,6 +28,7 @@ service.interceptors.request.use(config => {
   const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
   if (getToken() && !isToken) {
     config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+    config.headers['tenantid'] = getTenantid() //携带租户id
   }
   // get请求映射params参数
   if (config.method === 'get' && config.params) {
@@ -118,8 +119,12 @@ service.interceptors.response.use(res => {
     }else{
       Message({ message: message, type: 'error', duration: 5 * 1000 })
     }
+
+  if(error.message.indexOf('timeout')<0 ){ //超时报错不提示
     return Promise.reject(error)
   }
+    // return Promise.reject(error)
+  }
 )
 
 // 通用下载方法

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

@@ -62,30 +62,25 @@
       <div v-if="islog" class="login-form choose-form">
         <h3 class="title i"><img src="../assets/images/login/title_choose.png"/>请选择你想要登录的企业</h3>
         <div class="enterpriselist">
-          <div class="entername"> <el-radio v-model="radio" label="1">中国华西工程设计建设有限公司中国华西工程设计建设有限公司中国华西工程设计建设有限公司</el-radio></div>
-          <div class="entername"> <el-radio v-model="radio" label="2">中国华西工程设计建设有限公司中国华西工程设计建设有限公司中国华西工程设计建设有限公司</el-radio></div>
-          <div class="entername"> <el-radio v-model="radio" label="3">中国华西工程设计建设有限公司中国华西工程设计建设有限公司中国华西工程设计建设有限公司</el-radio></div>
-          <div class="entername"> <el-radio v-model="radio" label="4">中国华西工程设计建设有限公司中国华西工程设计建设有限公司中国华西工程设计建设有限公司</el-radio></div>
-          <div class="entername"> <el-radio v-model="radio" label="5">中国华西工程设计建设有限公司中国华西工程设计建设有限公司中国华西工程设计建设有限公司</el-radio></div>
-          <div class="entername"> <el-radio v-model="radio" label="6">中国华西工程设计建设有限公司中国华西工程设计建设有限公司中国华西工程设计建设有限公司</el-radio></div>
-          <div class="entername"> <el-radio v-model="radio" label="7">中国华西工程设计建设有限公司中国华西工程设计建设有限公司中国华西工程设计建设有限公司</el-radio></div>
+          <div class="entername" v-for="(item,index) of tenanlist"> <el-radio v-model="tenantId" :label="item.tenantId">{{item.companyName}}</el-radio></div>
         </div>
-        <el-button class="goin" type="primary" :disabled="radio == -1" @click="goin">立即进入</el-button>
+        <el-button class="goin" type="primary" :disabled="tenantId == -1" @click="tochose">立即进入</el-button>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import { getCodeImg } from "@/api/login";
+import { getCodeImg,getTenants } from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from '@/utils/jsencrypt'
+import { setTenantid} from '@/utils/auth'
 
 export default {
   name: "Login",
   data() {
     return {
-      radio:-1,
+      tenantId:-1,
       islog:false,
       codeUrl: "",
       loginForm: {
@@ -109,7 +104,8 @@ export default {
       captchaEnabled: true,
       // 注册开关
       register: false,
-      redirect: undefined
+      redirect: undefined,
+      tenanlist:[],
     };
   },
   watch: {
@@ -158,9 +154,7 @@ export default {
             Cookies.remove('rememberMe');
           }
           this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.islog = true
             this.goin()
-
           }).catch(() => {
             this.loading = false;
             if (this.captchaEnabled) {
@@ -171,8 +165,23 @@ export default {
       });
     },
     goin(){
+      this.tenantId = -1
+      getTenants(this.loginForm.username).then(res=>{
+        if(res.code == 200){
+          this.tenanlist = res.data
+          if(this.tenanlist.length>1){
+            this.islog = true
+          }else{
+            setTenantid(this.tenanlist[0].tenantId)
+            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+          }
+        }
+      })
+    },
+    tochose(){
+      setTenantid(this.tenantId)
       this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
-    }
+    },
   }
 };
 </script>

dsk-operate-ui/src/views/system/dept/index.vue

@@ -154,6 +154,27 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog
+      title="验证信息"
+      :visible.sync="yanzheng"
+      width="30%">
+      <div class="phonecont">
+        <div class="p1"><i class="el-icon-warning"></i>手机号码验证</div>
+        <div>已经向<font color="orange">{{phone}}</font>发送验证码，请注意查收</div>
+        <div>
+        <el-col :span="6">
+          <span>请输入短信验证码</span>
+        </el-col>
+        <el-col :span="18">
+          <el-input v-model="yzm"></el-input>
+        </el-col>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="cancel1">取 消</el-button>
+        <el-button type="primary" @click="subyzm">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -168,6 +189,10 @@ export default {
   components: { Treeselect },
   data() {
     return {
+      yanzheng:false,
+      phone:'',
+      yzm:'',
+      deptId:'',
       // 遮罩层
       loading: true,
       // 显示搜索条件
@@ -221,8 +246,26 @@ export default {
   },
   created() {
     this.getList();
+    this.phone = this.$store.state.user.phonenumber
   },
   methods: {
+    cancel1(){
+      this.yzm = ''
+      this.yanzheng = false
+    },
+    subyzm(){
+       delDept(row.deptId).then(res=>{
+         if(res.code == 200){
+           this.yzm = ''
+           this.yanzheng = false
+           this.$message({
+             type: 'success',
+             message: '删除成功!'
+           });
+         }
+       })
+
+    },
     /** 查询部门列表 */
     getList() {
       this.loading = true;
@@ -328,13 +371,43 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function() {
-        return delDept(row.deptId);
+      this.deptId = row.deptId
+
+      this.$confirm('是否确认删除名称为"' + row.deptName + '"的数据项？', '系统提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
+       this.yanzheng = true
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+      // this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function() {
+      //
+      //   this.open()
+      // }).then(() => {
+      //   this.getList();
+      //   this.$modal.msgSuccess("删除成功");
+      // }).catch(() => {});
+    },
   }
 };
 </script>
+<style lang="scss" scoped>
+  .phonecont{
+    padding-bottom: 20px;
+    .p1{
+      .el-icon-warning{
+        color: #f8ac59;
+        margin-right: 5px;
+      }
+      font-size: 18px;
+    }
+    >div{
+      line-height: 36px;
+    }
+  }
+</style>

dsk-operate-ui/src/views/system/role/index.vue

@@ -38,12 +38,11 @@
         <el-date-picker
           v-model="dateRange"
           style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd"
           type="daterange"
           range-separator="-"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-          :default-time="['00:00:00', '23:59:59']"
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -383,14 +382,14 @@ export default {
     /** 根据角色ID查询菜单树结构 */
     getRoleMenuTreeselect(roleId) {
       return roleMenuTreeselect(roleId).then(response => {
-        this.menuOptions = response.data.menus;
+        this.menuOptions = response.menus;
         return response;
       });
     },
     /** 根据角色ID查询部门树结构 */
     getDeptTree(roleId) {
       return deptTreeSelect(roleId).then(response => {
-        this.deptOptions = response.data.depts;
+        this.deptOptions = response.depts;
         return response;
       });
     },
@@ -515,7 +514,7 @@ export default {
         this.open = true;
         this.$nextTick(() => {
           roleMenu.then(res => {
-            let checkedKeys = res.data.checkedKeys
+            let checkedKeys = res.checkedKeys
             checkedKeys.forEach((v) => {
                 this.$nextTick(()=>{
                     this.$refs.menu.setChecked(v, true ,false);
@@ -541,7 +540,7 @@ export default {
         this.openDataScope = true;
         this.$nextTick(() => {
           deptTreeSelect.then(res => {
-            this.$refs.dept.setCheckedKeys(res.data.checkedKeys);
+            this.$refs.dept.setCheckedKeys(res.checkedKeys);
           });
         });
         this.title = "分配数据权限";
@@ -604,4 +603,3 @@ export default {
   }
 };
 </script>
-

dsk-operate-ui/vue.config.js

@@ -35,7 +35,8 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://47.104.91.229:9099/prod-api`,
-        target: `http://192.168.0.165:9098`,//施
+        // target: `http://192.168.0.165:9098`,//施
+        target: `http://192.168.60.6:9098`,//谭
         // target: `http://139.9.157.49:9099`,//测试
         changeOrigin: true,
         pathRewrite: {