Pārlūkot izejas kodu

修改项目界面的列宽,修改项目详情的一些错误

余思翰 10 mēnešus atpakaļ
vecāks
revīzija
fc929d4829

+ 25
- 30
oa-ui/src/views/monitor/online/index.vue Parādīt failu

2
   <div class="app-container">
2
   <div class="app-container">
3
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
3
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
4
       <el-form-item label="登录地址" prop="ipaddr">
4
       <el-form-item label="登录地址" prop="ipaddr">
5
-        <el-input
6
-          v-model="queryParams.ipaddr"
7
-          placeholder="请输入登录地址"
8
-          clearable
9
-          @keyup.enter.native="handleQuery"
10
-        />
5
+        <el-input v-model="queryParams.ipaddr" placeholder="请输入登录地址" clearable @keyup.enter.native="handleQuery" />
11
       </el-form-item>
6
       </el-form-item>
12
       <el-form-item label="用户名称" prop="userName">
7
       <el-form-item label="用户名称" prop="userName">
13
-        <el-input
14
-          v-model="queryParams.userName"
15
-          placeholder="请输入用户名称"
16
-          clearable
17
-          @keyup.enter.native="handleQuery"
18
-        />
8
+        <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter.native="handleQuery" />
19
       </el-form-item>
9
       </el-form-item>
20
       <el-form-item>
10
       <el-form-item>
21
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
11
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
23
       </el-form-item>
13
       </el-form-item>
24
 
14
 
25
     </el-form>
15
     </el-form>
26
-    <el-table
27
-      v-loading="loading"
28
-      :data="list.slice((pageNum-1)*pageSize,pageNum*pageSize)"
29
-      style="width: 100%;"
30
-    >
16
+    <el-table v-loading="loading" :data="list.slice((pageNum - 1) * pageSize, pageNum * pageSize)" style="width: 100%;">
31
       <el-table-column label="序号" type="index" align="center">
17
       <el-table-column label="序号" type="index" align="center">
32
         <template slot-scope="scope">
18
         <template slot-scope="scope">
33
-          <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
19
+          <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
34
         </template>
20
         </template>
35
       </el-table-column>
21
       </el-table-column>
36
       <el-table-column label="会话编号" align="center" prop="tokenId" :show-overflow-tooltip="true" />
22
       <el-table-column label="会话编号" align="center" prop="tokenId" :show-overflow-tooltip="true" />
37
-      <el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" />
23
+      <el-table-column label="登录账号" align="center" prop="userName" :show-overflow-tooltip="true">
24
+        <template slot-scope="scope">
25
+          {{ getNickName(scope.row) }}
26
+        </template>
27
+      </el-table-column>
28
+      <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
38
       <el-table-column label="部门名称" align="center" prop="deptName" />
29
       <el-table-column label="部门名称" align="center" prop="deptName" />
39
       <el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
30
       <el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
40
       <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
31
       <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
47
       </el-table-column>
38
       </el-table-column>
48
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
39
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
49
         <template slot-scope="scope">
40
         <template slot-scope="scope">
50
-          <el-button
51
-            size="mini"
52
-            type="text"
53
-            icon="el-icon-delete"
54
-            @click="handleForceLogout(scope.row)"
55
-            v-hasPermi="['monitor:online:forceLogout']"
56
-          >强退</el-button>
41
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleForceLogout(scope.row)"
42
+            v-hasPermi="['monitor:online:forceLogout']">强退</el-button>
57
         </template>
43
         </template>
58
       </el-table-column>
44
       </el-table-column>
59
     </el-table>
45
     </el-table>
60
 
46
 
61
-    <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
47
+    <pagination v-show="total > 0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
62
   </div>
48
   </div>
63
 </template>
49
 </template>
64
 
50
 
65
 <script>
51
 <script>
66
 import { list, forceLogout } from "@/api/monitor/online";
52
 import { list, forceLogout } from "@/api/monitor/online";
53
+import { listUser } from "@/api/system/user"
67
 
54
 
68
 export default {
55
 export default {
69
   name: "Online",
56
   name: "Online",
109
     },
96
     },
110
     /** 强退按钮操作 */
97
     /** 强退按钮操作 */
111
     handleForceLogout(row) {
98
     handleForceLogout(row) {
112
-      this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户?').then(function() {
99
+      this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户?').then(function () {
113
         return forceLogout(row.tokenId);
100
         return forceLogout(row.tokenId);
114
       }).then(() => {
101
       }).then(() => {
115
         this.getList();
102
         this.getList();
116
         this.$modal.msgSuccess("强退成功");
103
         this.$modal.msgSuccess("强退成功");
117
-      }).catch(() => {});
104
+      }).catch(() => { });
105
+    },
106
+    getNickName(row) {
107
+      let userName = row.userName;
108
+      listUser({ userName }).then(data => {
109
+        if (data.total == 1) {
110
+          this.$set(row, 'nickName', data.rows[0].nickName)
111
+        }
112
+      })
113
+      return userName
118
     }
114
     }
119
   }
115
   }
120
 };
116
 };
121
 </script>
117
 </script>
122
-

+ 16
- 1
oa-ui/src/views/monitor/operlog/index.vue Parādīt failu

120
           <dict-tag :options="dict.type.sys_oper_type" :value="scope.row.businessType"/>
120
           <dict-tag :options="dict.type.sys_oper_type" :value="scope.row.businessType"/>
121
         </template>
121
         </template>
122
       </el-table-column>
122
       </el-table-column>
123
-      <el-table-column label="操作人员" align="center" prop="operName" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
123
+      <el-table-column label="操作人员" align="center" prop="operName" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']">
124
+        <template slot-scope="scope">
125
+          {{ getNickName(scope.row) }}
126
+        </template>
127
+      </el-table-column>
128
+      <el-table-column label="用户姓名" align="center" prop="nickName"/>
124
       <el-table-column label="操作地址" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
129
       <el-table-column label="操作地址" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
125
       <el-table-column label="操作地点" align="center" prop="operLocation" :show-overflow-tooltip="true" />
130
       <el-table-column label="操作地点" align="center" prop="operLocation" :show-overflow-tooltip="true" />
126
       <el-table-column label="操作状态" align="center" prop="status">
131
       <el-table-column label="操作状态" align="center" prop="status">
208
 
213
 
209
 <script>
214
 <script>
210
 import { list, delOperlog, cleanOperlog } from "@/api/monitor/operlog";
215
 import { list, delOperlog, cleanOperlog } from "@/api/monitor/operlog";
216
+import { listUser } from "@/api/system/user"
211
 
217
 
212
 export default {
218
 export default {
213
   name: "Operlog",
219
   name: "Operlog",
316
       this.download('monitor/operlog/export', {
322
       this.download('monitor/operlog/export', {
317
         ...this.queryParams
323
         ...this.queryParams
318
       }, `operlog_${new Date().getTime()}.xlsx`)
324
       }, `operlog_${new Date().getTime()}.xlsx`)
325
+    },
326
+    getNickName(row) {
327
+      let userName = row.operName;
328
+      listUser({ userName }).then(data => {
329
+        if (data.total == 1) {
330
+          this.$set(row, 'nickName', data.rows[0].nickName)
331
+        }
332
+      })
333
+      return userName
319
     }
334
     }
320
   }
335
   }
321
 };
336
 };

+ 5
- 5
oa-ui/src/views/oa/brand/brandProject.vue Parādīt failu

36
 
36
 
37
     <el-table v-loading="loading" :data="brandProjectList" @selection-change="handleSelectionChange">
37
     <el-table v-loading="loading" :data="brandProjectList" @selection-change="handleSelectionChange">
38
       <el-table-column type="selection" width="55" align="center" />
38
       <el-table-column type="selection" width="55" align="center" />
39
-      <el-table-column label="项目进度" align="center">
39
+      <el-table-column label="项目进度" align="center"  width="120px">
40
         <template slot-scope="scope">
40
         <template slot-scope="scope">
41
           <el-progress :text-inside="true" :stroke-width="26" :status="formartProjectProgress(scope.row.percentage)"
41
           <el-progress :text-inside="true" :stroke-width="26" :status="formartProjectProgress(scope.row.percentage)"
42
             :percentage="scope.row.percentage" text-color="#fff"></el-progress>
42
             :percentage="scope.row.percentage" text-color="#fff"></el-progress>
43
         </template>
43
         </template>
44
       </el-table-column>
44
       </el-table-column>
45
-      <el-table-column label="项目编号" align="center" prop="projectNumber" />
46
-      <el-table-column label="项目名称" align="center" prop="projectName" width="200px" />
47
-      <el-table-column label="甲方单位" align="center" prop="partyA.partyAName" width="200px" />
45
+      <el-table-column label="项目编号" align="center" prop="projectNumber" width="120px"/>
46
+      <el-table-column label="项目名称" align="center" prop="projectName"/>
47
+      <el-table-column label="甲方单位" align="center" prop="partyA.partyAName"/>
48
       <!-- <el-table-column label="甲方单位联系人" align="center" prop="aPerson" />
48
       <!-- <el-table-column label="甲方单位联系人" align="center" prop="aPerson" />
49
       <el-table-column label="甲方单位联系电话" align="center" prop="aPhone" /> -->
49
       <el-table-column label="甲方单位联系电话" align="center" prop="aPhone" /> -->
50
       <el-table-column label="合作单位" align="center" prop="partner.partnerName" />
50
       <el-table-column label="合作单位" align="center" prop="partner.partnerName" />
51
       <!-- <el-table-column label="合作单位联系人" align="center" prop="contactPerson" />
51
       <!-- <el-table-column label="合作单位联系人" align="center" prop="contactPerson" />
52
       <el-table-column label="合作单位联系电话" align="center" prop="telephone" /> -->
52
       <el-table-column label="合作单位联系电话" align="center" prop="telephone" /> -->
53
       <el-table-column label="项目工期" align="center" prop="duration" />
53
       <el-table-column label="项目工期" align="center" prop="duration" />
54
-      <el-table-column label="合同金额" align="center" prop="amount" />
54
+      <el-table-column label="合同金额" align="center" prop="amount"  width="100px"/>
55
       <!-- <el-table-column label="项目概况" align="center" prop="content" /> -->
55
       <!-- <el-table-column label="项目概况" align="center" prop="content" /> -->
56
       <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
56
       <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
57
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
57
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

+ 6
- 5
oa-ui/src/views/oa/project/index.vue Parādīt failu

1
 <!--
1
 <!--
2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-02-27 14:49:15
3
  * @Date: 2024-02-27 14:49:15
4
- * @LastEditors: wrh
5
- * @LastEditTime: 2024-07-10 15:09:11
4
+ * @LastEditors: Please set LastEditors
5
+ * @LastEditTime: 2024-07-18 13:54:18
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <div class="project-wrapper">
8
   <div class="project-wrapper">
93
               :percentage="scope.row.percentage" text-color="#fff"></el-progress>
93
               :percentage="scope.row.percentage" text-color="#fff"></el-progress>
94
           </template>
94
           </template>
95
         </el-table-column>
95
         </el-table-column>
96
-        <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" />
96
+        <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" width="120px"/>
97
         <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" />
97
         <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" />
98
-        <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderUser.nickName" />
99
-        <el-table-column label="项目级别" align="center" key="projectLevel" prop="projectLevel">
98
+        <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderUser.nickName" width="120px" />
99
+        <el-table-column label="项目级别" align="center" key="projectLevel" prop="projectLevel" width="120px">
100
           <template slot-scope="scope">
100
           <template slot-scope="scope">
101
             <el-tag :type="scope.row.projectLevel ? (scope.row.projectLevel === '0' ? 'info' : 'danger') : 'info'"
101
             <el-tag :type="scope.row.projectLevel ? (scope.row.projectLevel === '0' ? 'info' : 'danger') : 'info'"
102
               disable-transitions>
102
               disable-transitions>
104
             </el-tag>
104
             </el-tag>
105
           </template>
105
           </template>
106
         </el-table-column>
106
         </el-table-column>
107
+        <el-table-column label="项目类型" align="center" key="projectType" prop="projectType" width="120px"/>
107
         <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
108
         <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
108
           <template slot-scope="scope" v-if="scope.row.userId !== 1">
109
           <template slot-scope="scope" v-if="scope.row.userId !== 1">
109
             <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
110
             <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"

+ 2
- 2
oa-ui/src/views/oa/project/info.vue Parādīt failu

457
       <budget-tab :taskForm="taskForm"></budget-tab>
457
       <budget-tab :taskForm="taskForm"></budget-tab>
458
     </el-dialog>
458
     </el-dialog>
459
     <el-dialog title="技术方案审批表" :visible.sync="openPlan" width="1000px" append-to-body>
459
     <el-dialog title="技术方案审批表" :visible.sync="openPlan" width="1000px" append-to-body>
460
-      <plan-tab :taskForm="taskForm"></plan-tab>
460
+      <technical-tab :taskForm="taskForm"></technical-tab>
461
     </el-dialog>
461
     </el-dialog>
462
     <el-dialog title="安全交底记录表" :visible.sync="openSafe" width="1000px" append-to-body>
462
     <el-dialog title="安全交底记录表" :visible.sync="openSafe" width="1000px" append-to-body>
463
       <safe-tab :taskForm="taskForm"></safe-tab>
463
       <safe-tab :taskForm="taskForm"></safe-tab>
464
     </el-dialog>
464
     </el-dialog>
465
     <el-dialog title="技术交底记录表" :visible.sync="openTech" width="1000px" append-to-body>
465
     <el-dialog title="技术交底记录表" :visible.sync="openTech" width="1000px" append-to-body>
466
-      <technical-tab :taskForm="taskForm"></technical-tab>
466
+      <plan-tab :taskForm="taskForm"></plan-tab>
467
     </el-dialog>
467
     </el-dialog>
468
     <el-dialog title="更换项目负责人" :visible.sync="prLeaderOpen" width="1000px" append-to-body>
468
     <el-dialog title="更换项目负责人" :visible.sync="prLeaderOpen" width="1000px" append-to-body>
469
       <choose-people :multiple="false" @chooseUser="changeProjectLeader"></choose-people>
469
       <choose-people :multiple="false" @chooseUser="changeProjectLeader"></choose-people>

Notiek ielāde…
Atcelt
Saglabāt