Browse Source

样式修改

liying333 1 week ago
parent
commit
f505c15bda

+ 10 - 2
.env.development

@@ -1,3 +1,11 @@
1
+###
2
+ # @Author: liying333 2698127913@qq.com
3
+ # @Date: 2024-11-14 15:41:20
4
+ # @LastEditors: liying333 2698127913@qq.com
5
+ # @LastEditTime: 2024-11-15 09:21:38
6
+ # @FilePath: \ruoyi\.env.development
7
+ # @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
8
+### 
1
 # 页面标题
9
 # 页面标题
2
 VUE_APP_TITLE = 双重预防综合管理系统
10
 VUE_APP_TITLE = 双重预防综合管理系统
3
 
11
 
@@ -5,8 +13,8 @@ VUE_APP_TITLE = 双重预防综合管理系统
5
 ENV = 'development'
13
 ENV = 'development'
6
 
14
 
7
 # 双重防御系统开发环境后台接口地址配置
15
 # 双重防御系统开发环境后台接口地址配置
8
-# VUE_APP_BASE_API = 'http://101.42.248.108:17005'
9
-VUE_APP_BASE_API = 'http://192.168.3.200:18080'
16
+VUE_APP_BASE_API = 'http://101.42.248.108:17005'
17
+# VUE_APP_BASE_API = 'http://192.168.3.200:18080'
10
 # VUE_APP_BASE_API = 'http://localhost:18080'
18
 # VUE_APP_BASE_API = 'http://localhost:18080'
11
 
19
 
12
 
20
 

File diff suppressed because it is too large
+ 16758 - 1
package-lock.json


+ 3 - 3
src/assets/styles/modules/el-cardCom.scss

@@ -19,7 +19,7 @@
19
     color: #fff;
19
     color: #fff;
20
   }
20
   }
21
 
21
 
22
-  .el-tabs__item.is-active {
23
-    color: #031527;
24
-  }
22
+  // .el-tabs__item.is-active {
23
+  //   color: #031527;
24
+  // }
25
 }
25
 }

+ 12 - 13
src/views/flowable/task/finished/detail/index.vue

@@ -1,29 +1,25 @@
1
 <template>
1
 <template>
2
   <div class="app-container">
2
   <div class="app-container">
3
-    <el-card class="box-card" >
3
+    <el-card class="box-card">
4
       <div slot="header" class="clearfix">
4
       <div slot="header" class="clearfix">
5
         <span class="el-icon-document">已办任务</span>
5
         <span class="el-icon-document">已办任务</span>
6
         <el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
6
         <el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
7
       </div>
7
       </div>
8
-      <el-tabs  tab-position="top" v-model="activeName" @tab-click="handleClick">
8
+      <el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
9
         <!--表单信息-->
9
         <!--表单信息-->
10
         <el-tab-pane label="表单信息" name="1">
10
         <el-tab-pane label="表单信息" name="1">
11
           <el-col :span="16" :offset="4">
11
           <el-col :span="16" :offset="4">
12
-              <v-form-render ref="vFormRef"/>
12
+            <v-form-render ref="vFormRef" />
13
           </el-col>
13
           </el-col>
14
         </el-tab-pane>
14
         </el-tab-pane>
15
         <!--流程流转记录-->
15
         <!--流程流转记录-->
16
         <el-tab-pane label="流转记录" name="2">
16
         <el-tab-pane label="流转记录" name="2">
17
-          <el-col :span="16" :offset="4" >
17
+          <el-col :span="16" :offset="4">
18
             <div class="block">
18
             <div class="block">
19
               <el-timeline>
19
               <el-timeline>
20
-                <el-timeline-item
21
-                  v-for="(item,index ) in flowRecordList"
22
-                  :key="index"
23
-                  :icon="setIcon(item.finishTime)"
24
-                  :color="setColor(item.finishTime)"
25
-                >
26
-                  <p style="font-weight: 700">{{item.taskName}}</p>
20
+                <el-timeline-item v-for="(item,index ) in flowRecordList" :key="index" :icon="setIcon(item.finishTime)"
21
+                  :color="setColor(item.finishTime)">
22
+                  <p style="font-weight: 700" class="el-timeline-item-p">{{item.taskName}}</p>
27
                   <el-card :body-style="{ padding: '10px' }">
23
                   <el-card :body-style="{ padding: '10px' }">
28
                     <el-descriptions class="margin-top" :column="1" size="small" border>
24
                     <el-descriptions class="margin-top" :column="1" size="small" border>
29
                       <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
25
                       <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
@@ -43,7 +39,7 @@
43
                         <template slot="label"><i class="el-icon-date"></i>处理时间</template>
39
                         <template slot="label"><i class="el-icon-date"></i>处理时间</template>
44
                         {{item.finishTime}}
40
                         {{item.finishTime}}
45
                       </el-descriptions-item>
41
                       </el-descriptions-item>
46
-                      <el-descriptions-item v-if="item.duration"  label-class-name="my-label">
42
+                      <el-descriptions-item v-if="item.duration" label-class-name="my-label">
47
                         <template slot="label"><i class="el-icon-time"></i>耗时</template>
43
                         <template slot="label"><i class="el-icon-time"></i>耗时</template>
48
                         {{item.duration}}
44
                         {{item.duration}}
49
                       </el-descriptions-item>
45
                       </el-descriptions-item>
@@ -59,7 +55,7 @@
59
           </el-col>
55
           </el-col>
60
         </el-tab-pane>
56
         </el-tab-pane>
61
         <el-tab-pane label="流程图" name="3">
57
         <el-tab-pane label="流程图" name="3">
62
-          <Bpmn-viewer :flowData="flowData" :procInsId="taskForm.procInsId"/>
58
+          <Bpmn-viewer :flowData="flowData" :procInsId="taskForm.procInsId" />
63
         </el-tab-pane>
59
         </el-tab-pane>
64
       </el-tabs>
60
       </el-tabs>
65
     </el-card>
61
     </el-card>
@@ -201,4 +197,7 @@ export default {
201
 .my-label {
197
 .my-label {
202
   background: #E1F3D8;
198
   background: #E1F3D8;
203
 }
199
 }
200
+.el-timeline-item-p {
201
+  color: #ffffff;
202
+}
204
 </style>
203
 </style>

+ 14 - 15
src/views/flowable/task/myProcess/detail/index.vue

@@ -1,29 +1,25 @@
1
 <template>
1
 <template>
2
   <div class="app-container">
2
   <div class="app-container">
3
-    <el-card class="box-card" >
3
+    <el-card class="box-card">
4
       <div slot="header" class="clearfix">
4
       <div slot="header" class="clearfix">
5
         <span class="el-icon-document">已发任务</span>
5
         <span class="el-icon-document">已发任务</span>
6
         <el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
6
         <el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
7
       </div>
7
       </div>
8
-      <el-tabs  tab-position="top" v-model="activeName" @tab-click="handleClick">
8
+      <el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
9
         <!--表单信息-->
9
         <!--表单信息-->
10
         <el-tab-pane label="表单信息" name="1">
10
         <el-tab-pane label="表单信息" name="1">
11
           <el-col :span="16" :offset="4">
11
           <el-col :span="16" :offset="4">
12
-            <v-form-render ref="vFormRef"/>
13
-         </el-col>
12
+            <v-form-render ref="vFormRef" />
13
+          </el-col>
14
         </el-tab-pane>
14
         </el-tab-pane>
15
         <!--流程流转记录-->
15
         <!--流程流转记录-->
16
         <el-tab-pane label="流转记录" name="2">
16
         <el-tab-pane label="流转记录" name="2">
17
-          <el-col :span="16" :offset="4" >
17
+          <el-col :span="16" :offset="4">
18
             <div class="block">
18
             <div class="block">
19
               <el-timeline>
19
               <el-timeline>
20
-                <el-timeline-item
21
-                  v-for="(item,index ) in flowRecordList"
22
-                  :key="index"
23
-                  :icon="setIcon(item.finishTime)"
24
-                  :color="setColor(item.finishTime)"
25
-                >
26
-                  <p style="font-weight: 700">{{item.taskName}}</p>
20
+                <el-timeline-item v-for="(item,index ) in flowRecordList" :key="index" :icon="setIcon(item.finishTime)"
21
+                  :color="setColor(item.finishTime)">
22
+                  <p style="font-weight: 700" class="el-timeline-item-p">{{item.taskName}}</p>
27
                   <el-card :body-style="{ padding: '10px' }">
23
                   <el-card :body-style="{ padding: '10px' }">
28
                     <el-descriptions class="margin-top" :column="1" size="small" border>
24
                     <el-descriptions class="margin-top" :column="1" size="small" border>
29
                       <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
25
                       <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
@@ -43,7 +39,7 @@
43
                         <template slot="label"><i class="el-icon-date"></i>处理时间</template>
39
                         <template slot="label"><i class="el-icon-date"></i>处理时间</template>
44
                         {{item.finishTime}}
40
                         {{item.finishTime}}
45
                       </el-descriptions-item>
41
                       </el-descriptions-item>
46
-                      <el-descriptions-item v-if="item.duration"  label-class-name="my-label">
42
+                      <el-descriptions-item v-if="item.duration" label-class-name="my-label">
47
                         <template slot="label"><i class="el-icon-time"></i>耗时</template>
43
                         <template slot="label"><i class="el-icon-time"></i>耗时</template>
48
                         {{item.duration}}
44
                         {{item.duration}}
49
                       </el-descriptions-item>
45
                       </el-descriptions-item>
@@ -60,9 +56,9 @@
60
         </el-tab-pane>
56
         </el-tab-pane>
61
         <!--流程图-->
57
         <!--流程图-->
62
         <el-tab-pane label="流程图" name="3">
58
         <el-tab-pane label="流程图" name="3">
63
-          <bpmn-viewer :flowData="flowData" :procInsId="taskForm.procInsId"/>
59
+          <bpmn-viewer :flowData="flowData" :procInsId="taskForm.procInsId" />
64
         </el-tab-pane>
60
         </el-tab-pane>
65
-    </el-tabs>
61
+      </el-tabs>
66
     </el-card>
62
     </el-card>
67
   </div>
63
   </div>
68
 </template>
64
 </template>
@@ -197,4 +193,7 @@ export default {
197
 .my-label {
193
 .my-label {
198
   background: #E1F3D8;
194
   background: #E1F3D8;
199
 }
195
 }
196
+.el-timeline-item-p {
197
+  color: #ffffff;
198
+}
200
 </style>
199
 </style>

+ 21 - 28
src/views/flowable/task/todo/detail/index.vue

@@ -11,7 +11,7 @@
11
         <!--表单信息-->
11
         <!--表单信息-->
12
         <el-tab-pane label="表单信息" name="1">
12
         <el-tab-pane label="表单信息" name="1">
13
           <el-col :span="16" :offset="4">
13
           <el-col :span="16" :offset="4">
14
-            <v-form-render ref="vFormRef"/>
14
+            <v-form-render ref="vFormRef" />
15
             <div style="margin-left:10%;margin-bottom: 20px;font-size: 14px;">
15
             <div style="margin-left:10%;margin-bottom: 20px;font-size: 14px;">
16
               <el-button type="primary" @click="handleComplete">审 批</el-button>
16
               <el-button type="primary" @click="handleComplete">审 批</el-button>
17
             </div>
17
             </div>
@@ -24,13 +24,9 @@
24
           <el-col :span="16" :offset="4">
24
           <el-col :span="16" :offset="4">
25
             <div class="block">
25
             <div class="block">
26
               <el-timeline>
26
               <el-timeline>
27
-                <el-timeline-item
28
-                  v-for="(item,index ) in flowRecordList"
29
-                  :key="index"
30
-                  :icon="setIcon(item.finishTime)"
31
-                  :color="setColor(item.finishTime)"
32
-                >
33
-                  <p style="font-weight: 700">{{ item.taskName }}</p>
27
+                <el-timeline-item v-for="(item,index ) in flowRecordList" :key="index" :icon="setIcon(item.finishTime)"
28
+                  :color="setColor(item.finishTime)">
29
+                  <p style="font-weight: 700" class="el-timeline-item-p">{{ item.taskName }}</p>
34
                   <el-card :body-style="{ padding: '10px' }">
30
                   <el-card :body-style="{ padding: '10px' }">
35
                     <el-descriptions class="margin-top" :column="1" size="small" border>
31
                     <el-descriptions class="margin-top" :column="1" size="small" border>
36
                       <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
32
                       <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
@@ -67,7 +63,7 @@
67
         </el-tab-pane>
63
         </el-tab-pane>
68
         <!--流程图-->
64
         <!--流程图-->
69
         <el-tab-pane label="流程图" name="3">
65
         <el-tab-pane label="流程图" name="3">
70
-          <bpmn-viewer :flowData="flowData" :procInsId="taskForm.procInsId"/>
66
+          <bpmn-viewer :flowData="flowData" :procInsId="taskForm.procInsId" />
71
         </el-tab-pane>
67
         </el-tab-pane>
72
       </el-tabs>
68
       </el-tabs>
73
       <!--审批任务-->
69
       <!--审批任务-->
@@ -78,8 +74,8 @@
78
             <flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect"></flow-role>
74
             <flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect"></flow-role>
79
           </el-form-item>
75
           </el-form-item>
80
           <el-form-item label="处理意见" label-width="80px" prop="comment"
76
           <el-form-item label="处理意见" label-width="80px" prop="comment"
81
-                        :rules="[{ required: true, message: '请输入处理意见', trigger: 'blur' }]">
82
-            <el-input type="textarea" v-model="taskForm.comment" placeholder="请输入处理意见"/>
77
+            :rules="[{ required: true, message: '请输入处理意见', trigger: 'blur' }]">
78
+            <el-input type="textarea" v-model="taskForm.comment" placeholder="请输入处理意见" />
83
           </el-form-item>
79
           </el-form-item>
84
         </el-form>
80
         </el-form>
85
         <span slot="footer" class="dialog-footer">
81
         <span slot="footer" class="dialog-footer">
@@ -92,36 +88,30 @@
92
         <el-form ref="taskForm" :model="taskForm" label-width="80px">
88
         <el-form ref="taskForm" :model="taskForm" label-width="80px">
93
           <el-form-item label="退回节点" prop="targetKey">
89
           <el-form-item label="退回节点" prop="targetKey">
94
             <el-radio-group v-model="taskForm.targetKey">
90
             <el-radio-group v-model="taskForm.targetKey">
95
-              <el-radio-button
96
-                v-for="item in returnTaskList"
97
-                :key="item.id"
98
-                :label="item.id"
99
-              >{{ item.name }}
91
+              <el-radio-button v-for="item in returnTaskList" :key="item.id" :label="item.id">{{ item.name }}
100
               </el-radio-button>
92
               </el-radio-button>
101
             </el-radio-group>
93
             </el-radio-group>
102
           </el-form-item>
94
           </el-form-item>
103
-          <el-form-item label="退回意见" prop="comment"
104
-                        :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
105
-            <el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见"/>
95
+          <el-form-item label="退回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
96
+            <el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
106
           </el-form-item>
97
           </el-form-item>
107
         </el-form>
98
         </el-form>
108
         <span slot="footer" class="dialog-footer">
99
         <span slot="footer" class="dialog-footer">
109
-              <el-button @click="returnOpen = false">取 消</el-button>
110
-              <el-button type="primary" @click="taskReturn">确 定</el-button>
111
-          </span>
100
+          <el-button @click="returnOpen = false">取 消</el-button>
101
+          <el-button type="primary" @click="taskReturn">确 定</el-button>
102
+        </span>
112
       </el-dialog>
103
       </el-dialog>
113
       <!--驳回流程-->
104
       <!--驳回流程-->
114
       <el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body>
105
       <el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body>
115
         <el-form ref="taskForm" :model="taskForm" label-width="80px">
106
         <el-form ref="taskForm" :model="taskForm" label-width="80px">
116
-          <el-form-item label="驳回意见" prop="comment"
117
-                        :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
118
-            <el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见"/>
107
+          <el-form-item label="驳回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
108
+            <el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
119
           </el-form-item>
109
           </el-form-item>
120
         </el-form>
110
         </el-form>
121
         <span slot="footer" class="dialog-footer">
111
         <span slot="footer" class="dialog-footer">
122
-            <el-button @click="rejectOpen = false">取 消</el-button>
123
-            <el-button type="primary" @click="taskReject">确 定</el-button>
124
-          </span>
112
+          <el-button @click="rejectOpen = false">取 消</el-button>
113
+          <el-button type="primary" @click="taskReject">确 定</el-button>
114
+        </span>
125
       </el-dialog>
115
       </el-dialog>
126
     </el-card>
116
     </el-card>
127
   </div>
117
   </div>
@@ -458,4 +448,7 @@ export default {
458
 .my-label {
448
 .my-label {
459
   background: #E1F3D8;
449
   background: #E1F3D8;
460
 }
450
 }
451
+.el-timeline-item-p {
452
+  color: #ffffff;
453
+}
461
 </style>
454
 </style>