.env.development

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

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

@@ -19,7 +19,7 @@
     color: #fff;
   }
 
-  .el-tabs__item.is-active {
-    color: #031527;
-  }
+  // .el-tabs__item.is-active {
+  //   color: #031527;
+  // }
 }

src/components/Process/designer.vue

@@ -14,53 +14,34 @@
 
       <!--   任务信息     -->
       <el-collapse-item name="Task" v-if="elementType.indexOf('Task') !== -1">
-        <template slot="title"
-          ><i class="el-icon-s-claim"></i> 任务配置</template
-        >
+        <template slot="title"><i class="el-icon-s-claim"></i> 任务配置</template>
         <user-task-panel :id="elementId" />
       </el-collapse-item>
 
       <!--   表单     -->
       <el-collapse-item name="form" v-if="formVisible">
-        <template slot="title"
-          ><i class="el-icon-s-order"></i> 表单配置</template
-        >
+        <template slot="title"><i class="el-icon-s-order"></i> 表单配置</template>
         <form-panel :id="elementId" />
       </el-collapse-item>
 
       <!--   执行监听器     -->
       <el-collapse-item name="executionListener">
-        <template slot="title"
-          ><i class="el-icon-s-promotion"></i> 执行监听器
-          <el-badge
-            :value="executionListenerCount"
-            class="item"
-            type="primary"
-          />
+        <template slot="title"><i class="el-icon-s-promotion"></i> 执行监听器
+          <el-badge :value="executionListenerCount" class="item" type="primary" />
         </template>
-        <execution-listener
-          :id="elementId"
-          @getExecutionListenerCount="getExecutionListenerCount"
-        />
+        <execution-listener :id="elementId" @getExecutionListenerCount="getExecutionListenerCount" />
       </el-collapse-item>
 
       <!--   任务监听器     -->
       <el-collapse-item name="taskListener" v-if="elementType === 'UserTask'">
-        <template slot="title"
-          ><i class="el-icon-s-flag"></i> 任务监听器
+        <template slot="title"><i class="el-icon-s-flag"></i> 任务监听器
           <el-badge :value="taskListenerCount" class="item" type="primary" />
         </template>
-        <task-listener
-          :id="elementId"
-          @getTaskListenerCount="getTaskListenerCount"
-        />
+        <task-listener :id="elementId" @getTaskListenerCount="getTaskListenerCount" />
       </el-collapse-item>
 
       <!--   多实例     -->
-      <el-collapse-item
-        name="multiInstance"
-        v-if="elementType.indexOf('Task') !== -1"
-      >
+      <el-collapse-item name="multiInstance" v-if="elementType.indexOf('Task') !== -1">
         <template slot="title"><i class="el-icon-s-grid"></i> 多实例</template>
         <multi-instance :id="elementId" />
       </el-collapse-item>
@@ -72,9 +53,7 @@
 
       <!--   扩展属性     -->
       <el-collapse-item name="properties">
-        <template slot="title"
-          ><i class="el-icon-circle-plus"></i> 扩展属性</template
-        >
+        <template slot="title"><i class="el-icon-circle-plus"></i> 扩展属性</template>
         <properties-panel :id="elementId" />
       </el-collapse-item>
     </el-collapse>
@@ -112,7 +91,7 @@ export default {
     FlowRole,
     FlowExp,
   },
-  data() {
+  data () {
     return {
       activeName: "common",
       executionListenerCount: 0,
@@ -133,22 +112,22 @@ export default {
   /** 传值监听 */
   watch: {
     elementId: {
-      handler() {
+      handler () {
         this.activeName = "common";
       },
     },
   },
-  created() {
+  created () {
     this.initModels();
   },
   methods: {
     // 初始化流程设计器
-    initModels() {
+    initModels () {
       this.getActiveElement();
     },
 
     // 注册节点事件
-    getActiveElement() {
+    getActiveElement () {
       // 初始第一个选中元素 bpmn:Process
       this.initFormOnChanged(null);
       this.modelerStore.modeler.on("import.done", (e) => {
@@ -167,7 +146,7 @@ export default {
     },
 
     // 初始化数据
-    initFormOnChanged(element) {
+    initFormOnChanged (element) {
       let activatedElement = element;
       if (!activatedElement) {
         activatedElement =
@@ -192,14 +171,14 @@ export default {
     },
 
     /** 获取执行监听器数量 */
-    getExecutionListenerCount(value) {
+    getExecutionListenerCount (value) {
       this.executionListenerCount = value;
     },
     /** 获取任务监听器数量 */
-    getTaskListenerCount(value) {
+    getTaskListenerCount (value) {
       this.taskListenerCount = value;
     },
-    translateNodeName(val) {
+    translateNodeName (val) {
       return translateNodeName(val);
     },
   },
@@ -207,12 +186,13 @@ export default {
 </script>
 
 <style lang="scss">
-.designer-collapse {
-  .el-form-item__label {
-    color: #000000;
-  }
-  .el-collapse-item__header {
-    color: #000000 !important;
-  }
-}
+// .designer-collapse {
+//   .el-form-item__label {
+//     color: #000000;
+//   }
+
+//   .el-collapse-item__header {
+//     color: #000000 !important;
+//   }
+// }
 </style>

src/views/flowable/definition/model.vue

@@ -128,8 +128,6 @@ export default {
 <style lang="scss" scoped>
 .content-box{
   line-height: 10px;
-  background-color: #ffffff;
-  color: #000000;
 }
 // 修改对话框高度
 .showAll_dialog {

src/views/flowable/task/finished/detail/index.vue

@@ -1,29 +1,25 @@
 <template>
   <div class="app-container">
-    <el-card class="box-card" >
+    <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span class="el-icon-document">已办任务</span>
         <el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
       </div>
-      <el-tabs  tab-position="top" v-model="activeName" @tab-click="handleClick">
+      <el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
         <!--表单信息-->
         <el-tab-pane label="表单信息" name="1">
           <el-col :span="16" :offset="4">
-              <v-form-render ref="vFormRef"/>
+            <v-form-render ref="vFormRef" />
           </el-col>
         </el-tab-pane>
         <!--流程流转记录-->
         <el-tab-pane label="流转记录" name="2">
-          <el-col :span="16" :offset="4" >
+          <el-col :span="16" :offset="4">
             <div class="block">
               <el-timeline>
-                <el-timeline-item
-                  v-for="(item,index ) in flowRecordList"
-                  :key="index"
-                  :icon="setIcon(item.finishTime)"
-                  :color="setColor(item.finishTime)"
-                >
-                  <p style="font-weight: 700">{{item.taskName}}</p>
+                <el-timeline-item v-for="(item,index ) in flowRecordList" :key="index" :icon="setIcon(item.finishTime)"
+                  :color="setColor(item.finishTime)">
+                  <p style="font-weight: 700" class="el-timeline-item-p">{{item.taskName}}</p>
                   <el-card :body-style="{ padding: '10px' }">
                     <el-descriptions class="margin-top" :column="1" size="small" border>
                       <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
@@ -43,7 +39,7 @@
                         <template slot="label"><i class="el-icon-date"></i>处理时间</template>
                         {{item.finishTime}}
                       </el-descriptions-item>
-                      <el-descriptions-item v-if="item.duration"  label-class-name="my-label">
+                      <el-descriptions-item v-if="item.duration" label-class-name="my-label">
                         <template slot="label"><i class="el-icon-time"></i>耗时</template>
                         {{item.duration}}
                       </el-descriptions-item>
@@ -59,7 +55,7 @@
           </el-col>
         </el-tab-pane>
         <el-tab-pane label="流程图" name="3">
-          <Bpmn-viewer :flowData="flowData" :procInsId="taskForm.procInsId"/>
+          <Bpmn-viewer :flowData="flowData" :procInsId="taskForm.procInsId" />
         </el-tab-pane>
       </el-tabs>
     </el-card>
@@ -201,4 +197,7 @@ export default {
 .my-label {
   background: #E1F3D8;
 }
+.el-timeline-item-p {
+  color: #ffffff;
+}
 </style>

src/views/flowable/task/myProcess/detail/index.vue

@@ -1,29 +1,25 @@
 <template>
   <div class="app-container">
-    <el-card class="box-card" >
+    <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span class="el-icon-document">已发任务</span>
         <el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
       </div>
-      <el-tabs  tab-position="top" v-model="activeName" @tab-click="handleClick">
+      <el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
         <!--表单信息-->
         <el-tab-pane label="表单信息" name="1">
           <el-col :span="16" :offset="4">
-            <v-form-render ref="vFormRef"/>
-         </el-col>
+            <v-form-render ref="vFormRef" />
+          </el-col>
         </el-tab-pane>
         <!--流程流转记录-->
         <el-tab-pane label="流转记录" name="2">
-          <el-col :span="16" :offset="4" >
+          <el-col :span="16" :offset="4">
             <div class="block">
               <el-timeline>
-                <el-timeline-item
-                  v-for="(item,index ) in flowRecordList"
-                  :key="index"
-                  :icon="setIcon(item.finishTime)"
-                  :color="setColor(item.finishTime)"
-                >
-                  <p style="font-weight: 700">{{item.taskName}}</p>
+                <el-timeline-item v-for="(item,index ) in flowRecordList" :key="index" :icon="setIcon(item.finishTime)"
+                  :color="setColor(item.finishTime)">
+                  <p style="font-weight: 700" class="el-timeline-item-p">{{item.taskName}}</p>
                   <el-card :body-style="{ padding: '10px' }">
                     <el-descriptions class="margin-top" :column="1" size="small" border>
                       <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
@@ -43,7 +39,7 @@
                         <template slot="label"><i class="el-icon-date"></i>处理时间</template>
                         {{item.finishTime}}
                       </el-descriptions-item>
-                      <el-descriptions-item v-if="item.duration"  label-class-name="my-label">
+                      <el-descriptions-item v-if="item.duration" label-class-name="my-label">
                         <template slot="label"><i class="el-icon-time"></i>耗时</template>
                         {{item.duration}}
                       </el-descriptions-item>
@@ -60,9 +56,9 @@
         </el-tab-pane>
         <!--流程图-->
         <el-tab-pane label="流程图" name="3">
-          <bpmn-viewer :flowData="flowData" :procInsId="taskForm.procInsId"/>
+          <bpmn-viewer :flowData="flowData" :procInsId="taskForm.procInsId" />
         </el-tab-pane>
-    </el-tabs>
+      </el-tabs>
     </el-card>
   </div>
 </template>
@@ -197,4 +193,7 @@ export default {
 .my-label {
   background: #E1F3D8;
 }
+.el-timeline-item-p {
+  color: #ffffff;
+}
 </style>

src/views/flowable/task/todo/detail/index.vue

@@ -11,7 +11,7 @@
         <!--表单信息-->
         <el-tab-pane label="表单信息" name="1">
           <el-col :span="16" :offset="4">
-            <v-form-render ref="vFormRef"/>
+            <v-form-render ref="vFormRef" />
             <div style="margin-left:10%;margin-bottom: 20px;font-size: 14px;">
               <el-button type="primary" @click="handleComplete">审 批</el-button>
             </div>
@@ -24,13 +24,9 @@
           <el-col :span="16" :offset="4">
             <div class="block">
               <el-timeline>
-                <el-timeline-item
-                  v-for="(item,index ) in flowRecordList"
-                  :key="index"
-                  :icon="setIcon(item.finishTime)"
-                  :color="setColor(item.finishTime)"
-                >
-                  <p style="font-weight: 700">{{ item.taskName }}</p>
+                <el-timeline-item v-for="(item,index ) in flowRecordList" :key="index" :icon="setIcon(item.finishTime)"
+                  :color="setColor(item.finishTime)">
+                  <p style="font-weight: 700" class="el-timeline-item-p">{{ item.taskName }}</p>
                   <el-card :body-style="{ padding: '10px' }">
                     <el-descriptions class="margin-top" :column="1" size="small" border>
                       <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
@@ -67,7 +63,7 @@
         </el-tab-pane>
         <!--流程图-->
         <el-tab-pane label="流程图" name="3">
-          <bpmn-viewer :flowData="flowData" :procInsId="taskForm.procInsId"/>
+          <bpmn-viewer :flowData="flowData" :procInsId="taskForm.procInsId" />
         </el-tab-pane>
       </el-tabs>
       <!--审批任务-->
@@ -78,8 +74,8 @@
             <flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect"></flow-role>
           </el-form-item>
           <el-form-item label="处理意见" label-width="80px" prop="comment"
-                        :rules="[{ required: true, message: '请输入处理意见', trigger: 'blur' }]">
-            <el-input type="textarea" v-model="taskForm.comment" placeholder="请输入处理意见"/>
+            :rules="[{ required: true, message: '请输入处理意见', trigger: 'blur' }]">
+            <el-input type="textarea" v-model="taskForm.comment" placeholder="请输入处理意见" />
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
@@ -92,36 +88,30 @@
         <el-form ref="taskForm" :model="taskForm" label-width="80px">
           <el-form-item label="退回节点" prop="targetKey">
             <el-radio-group v-model="taskForm.targetKey">
-              <el-radio-button
-                v-for="item in returnTaskList"
-                :key="item.id"
-                :label="item.id"
-              >{{ item.name }}
+              <el-radio-button v-for="item in returnTaskList" :key="item.id" :label="item.id">{{ item.name }}
               </el-radio-button>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="退回意见" prop="comment"
-                        :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
-            <el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见"/>
+          <el-form-item label="退回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
+            <el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
-              <el-button @click="returnOpen = false">取 消</el-button>
-              <el-button type="primary" @click="taskReturn">确 定</el-button>
-          </span>
+          <el-button @click="returnOpen = false">取 消</el-button>
+          <el-button type="primary" @click="taskReturn">确 定</el-button>
+        </span>
       </el-dialog>
       <!--驳回流程-->
       <el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body>
         <el-form ref="taskForm" :model="taskForm" label-width="80px">
-          <el-form-item label="驳回意见" prop="comment"
-                        :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
-            <el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见"/>
+          <el-form-item label="驳回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
+            <el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
-            <el-button @click="rejectOpen = false">取 消</el-button>
-            <el-button type="primary" @click="taskReject">确 定</el-button>
-          </span>
+          <el-button @click="rejectOpen = false">取 消</el-button>
+          <el-button type="primary" @click="taskReject">确 定</el-button>
+        </span>
       </el-dialog>
     </el-card>
   </div>
@@ -458,4 +448,7 @@ export default {
 .my-label {
   background: #E1F3D8;
 }
+.el-timeline-item-p {
+  color: #ffffff;
+}
 </style>