提交

ruoyi-ui/src/views/monitor/online/index.vue

@@ -36,13 +36,15 @@
                           <el-tooltip class="item" effect="dark" :content="item.userName" placement="top-start">
                           <span class="text_26">{{item.userName}}</span>
                           </el-tooltip>
+                           <el-tooltip class="item" effect="dark" content="强退" placement="top-start">
                           <img
                            @click="handleForceLogout(item)" v-hasPermi="['monitor:online:forceLogout']"
                             class="thumbnail_14"
                             referrerpolicy="no-referrer"
                             style="cursor: pointer;"
-                            src="../../../assets/images/icon_htgl_rylb_bjs.png"
+                            src="../../../assets/images/icon_gjgl_qztc.png"
                           />
+                          </el-tooltip>
                         </div>
                       </div>
                       <!-- <div>
@@ -84,7 +86,7 @@
                       <div style="display: flex">
                         <p class="paragraph_5">登录时间：</p>
                        <el-tooltip class="item" effect="dark" :content="'登录时间:' + item.loginTime" placement="left-start">
-                       <p class="paragraph_5">{{item.loginTime}}</p>
+                       <p class="paragraph_5">{{parseTime(item.loginTime)}}</p>
                        </el-tooltip>
                       </div>
                     </div>
@@ -160,7 +162,7 @@ export default {
       // 表格数据
       list: [],
       pageNum: 1,
-      pageSize: 32,
+      pageSize: 8,
       // 查询参数
       queryParams: {
         ipaddr: undefined,

ruoyi-ui/src/views/shipinggaoj/clockSet/index.vue

@@ -100,7 +100,7 @@
                             class="thumbnail_14"
                             referrerpolicy="no-referrer"
                             style="cursor: pointer;"
-                            src="../../../assets/images/icon_htgl_rylb_bjs.png"
+                            src="../../../assets/images/icon_spgj_rl_jjr.png"
                           />
                         </div>
                       </div>
@@ -288,7 +288,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 8,
+        pageSize: 16,
         clockBeginAm: null,
         clockEndAm: null,
         clockBeginPm: null,

ruoyi-ui/src/views/shipinggaoj/shebecanshuhuabu/index.vue

@@ -23,7 +23,7 @@
                 <div @click="ishg(item,index)"
                   style="display: flex;align-items: center;justify-content: space-between;">
                  <el-tooltip class="item" effect="dark" :content="item.channelNum == null?'暂无数据' : item.channelNum" placement="top-start">
-                                   <div style="font-size: 16px;
+                  <div style="font-size: 16px;
                  color: #333333; overflow:hidden;text-overflow:ellipsis;white-space:nowrap;"> {{item.channelNum == null?'暂无数据' : item.channelNum}}</div>
                  </el-tooltip>
                   <img src="../../../assets/images/icon_htgl_zd.png" alt="" style="width: 10px;height: 12px;">
@@ -834,7 +834,8 @@
       // 通道点击
       ishg(val, row) {
         this.isfse = false
-        this.ishge = row
+        this.ishge = val.channelId
+        console.log(this.ishge)
         getChannelNumber(val.channelId).then(response => {
           if (response.data.isChannel == 'Y') {
             this.form = response.data.parameterSet

ruoyi-ui/src/views/system/user/index.vue

@@ -44,6 +44,15 @@
              <!-- <el-col :span="1.5">
                 <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['system:user:edit']">修改</el-button>
               </el-col> -->
+              <el-col :span="1.5">
+              <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  @click="handleAddtai"
+                  v-hasPermi="['manage:common:getDynamicPassword']"
+                >生成动态码</el-button>
+              </el-col>
               <el-col :span="1.5">
                 <el-button type="danger" plain  size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']">删除</el-button>
               </el-col>
@@ -277,6 +286,7 @@
 
 <script>
 import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user"
+import { getDynamicPassword, listConfig, getConfig, delConfig, addConfig, updateConfig, refreshCache } from "@/api/system/config"
 import { getToken } from "@/utils/auth"
 import Treeselect from "@riophae/vue-treeselect"
 import "@riophae/vue-treeselect/dist/vue-treeselect.css"
@@ -426,6 +436,18 @@ export default {
     	        this.changeTableMaxHeight()
     },
   methods: {
+    // 生成动态码
+    handleAddtai(){
+      getDynamicPassword().then(response => {
+        this.$notify({
+                  title: '动态码为：' + response.data,
+                  message:'操作成功' ,
+                  type: 'success',
+                  duration: 0
+                });
+        // this.getList()
+      })
+    },
     showContent(item) {
       // console.log(item.isHidden,3)
     	this.$set(item,'isHidden',true);