修改一些小问题

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -79,7 +79,7 @@
     <select id="selectCmcProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
         <where>
-            (p.project_number REGEXP '^[0-9]+W[0-9]' or p.project_number REGEXP '^[0-9]+C[0-9]') and p.project_number REGEXP '^((?![\\\/\\*\\-]).)*$'
+            (p.project_number REGEXP '^[0-9]+W[0-9]' or p.project_number REGEXP '^[0-9]+C[0-9]') AND NOT (p.project_number REGEXP '[/\\*-]')
             <if test="projectId != null  and projectId != ''"> and p.project_id = #{projectId}</if>
             <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
             <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
@@ -111,7 +111,7 @@
     <select id="selectCmcProjectByProjectNumber" parameterType="String" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
         where
-        (p.project_number REGEXP '^[0-9]+W[0-9]' or p.project_number REGEXP '^[0-9]+C[0-9]') and p.project_number REGEXP '^((?![\\\/\\*\\-]).)*$' and p.project_number = #{projectNumber}
+        (p.project_number REGEXP '^[0-9]+W[0-9]' or p.project_number REGEXP '^[0-9]+C[0-9]') AND NOT (p.project_number REGEXP '[/\\*-]') and p.project_number = #{projectNumber}
     </select>
 
     <insert id="insertCmcProject" parameterType="CmcProject">

oa-ui/src/assets/styles/ruoyi.scss

@@ -118,7 +118,7 @@
 /** 表格布局 **/
 .pagination-container {
   position: relative;
-  height: 25px;
+  height: 32px;
   margin-bottom: 10px;
   margin-top: 15px;
   padding: 10px 20px !important;

oa-ui/src/views/flowable/form/oa/deviceForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-17 17:31:44
+ * @LastEditTime: 2024-07-25 14:05:49
 -->
 
 <template>
@@ -370,6 +370,7 @@ export default {
           }
           if (res.data.modifyDevices == null || res.data.modifyDevices == undefined || res.data.modifyDevices == "") {
             data.modifyDevices = []
+            this.modifyDeviceList = []
           } else {
             data.modifyDevices = data.modifyDevices.split(',');
             let arr = []

oa-ui/src/views/oa/project/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-24 16:28:58
+ * @LastEditTime: 2024-07-25 16:35:45
 -->
 <template>
   <div class="project-wrapper">
@@ -37,33 +37,32 @@
     <!-- 项目统计 -->
     <!-- <el-row>
       <el-col>
-        <el-row :gutter="10">
-          <el-col :span="8">
-            <el-card>
-              <el-col :span="12">
-                <div>项目数量</div>
-                <h2>127</h2>
-              </el-col>
-              <el-col :span="12"></el-col>
-            </el-card>
+        <el-row :gutter="20">
+          <el-col :span="8" :xs="24">
+            <div class="static-box">
+              <div class="title">今年项目数量</div>
+              <div class="box-content">
+                <div class="box-left">
+                  <div class="number">48</div>
+                </div>
+                <dir class="box-right">
+                  <div style="display: flex;">
+                    <div>院内</div>
+                    <div class="progress"><el-progress :percentage="100" :stroke-width="14"></el-progress></div>
+                  </div>
+                  <div style="display: flex;" class="mt10">
+                    <div>院外</div>
+                    <div class="progress"><el-progress :percentage="100" :stroke-width="14"></el-progress></div>
+                  </div>
+                </dir>
+              </div>
+            </div>
           </el-col>
-          <el-col :span="8">
-            <el-card>
-              <el-col :span="12">
-                <div>预算金额</div>
-                <h2>679999</h2>
-              </el-col>
-              <el-col :span="12"></el-col>
-            </el-card>
+          <el-col :span="8" :xs="24">
+
           </el-col>
-          <el-col :span="8">
-            <el-card>
-              <el-col :span="12">
-                <div>项目成本</div>
-                <h2>679999</h2>
-              </el-col>
-              <el-col :span="12"></el-col>
-            </el-card>
+          <el-col :span="8" :xs="24">
+
           </el-col>
         </el-row>
       </el-col>
@@ -118,7 +117,7 @@
         </el-table-column>
       </el-table>
       <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        @pagination="getList" />
+        :autoScroll="false" @pagination="getList" />
     </el-card>
     <!-- 新建项目 -->
     <el-dialog :title="title" :visible.sync="addOpen" append-to-body>
@@ -539,6 +538,7 @@ export default {
 <style lang="scss" scoped>
 .project-wrapper {
   padding: 25px;
+  background-color: #f5f5f5;
 }
 
 .table-header {
@@ -561,4 +561,45 @@ table {
   /*设置背景颜色*/
   /* background-color: #bfa; */
 }
+
+.static-box {
+  width: 100%;
+  height: 120px;
+  background-color: #fff;
+  border-radius: 6px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+
+  .title {
+    padding-left: 30px;
+    padding-top: 10px;
+    font-size: 18px;
+  }
+
+  .box-content {
+    display: flex;
+
+    .box-left {
+      padding: 10px;
+
+      .number {
+        padding-left: 20px;
+        font-size: 36px;
+        font-family: Arial, Helvetica, sans-serif;
+        line-height: 70px;
+        min-width: 100px;
+      }
+    }
+
+    .box-right {
+      flex: 1;
+      padding: 0 10px;
+
+      .progress {
+        flex: 1;
+        padding-left: 10px;
+      }
+    }
+  }
+
+}
 </style>