cpms优化

ruoyi-ui/src/utils/ruoyi.js

@@ -70,7 +70,7 @@ export function addDateRange(params, dateRange, propName) {
 
 // 回显数据字典
 export function selectDictLabel(datas, value) {
-  if (value === undefined) {
+  if (value === undefined || value === null ) {
     return "";
   }
   var actions = [];
@@ -88,7 +88,7 @@ export function selectDictLabel(datas, value) {
 
 // 回显数据字典（字符串、数组）
 export function selectDictLabels(datas, value, separator) {
-  if (value === undefined || value.length ===0) {
+  if (value === undefined || value === null || value.length ===0) {
     return "";
   }
   if (Array.isArray(value)) {

ruoyi-ui/src/views/asset/asset/index.vue

@@ -29,7 +29,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/asset/fixedAsset/index.vue

@@ -38,7 +38,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/asset/specMain/index.vue

@@ -48,7 +48,7 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/plant/organization/index.vue

@@ -6,35 +6,35 @@
         <el-form-item label="部门" prop="units">
           <el-select v-model="units" placeholder="请选择部门" clearable multiple size="small">
             <el-option
-                v-for="dict in unitOptions"
-                :key="dict.dictValue"
-                label="dict.dictLabel"
-                :value="dict.dictValue"
+              v-for="dict in dict.type.staff_unit"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
             />
           </el-select>
         </el-form-item>
         <el-form-item label="班组" prop="teams">
           <el-select v-model="teams" placeholder="请选择班组" clearable multiple size="small">
             <el-option
-                v-for="dict in teamOptions"
-                :key="dict.dictValue"
-                label="dict.dictLabel"
-                :value="dict.dictValue"
+              v-for="dict in dict.type.team_divide"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
             />
           </el-select>
         </el-form-item>
         <el-form-item label="岗位" label-width="200" prop="actualposts">
           <el-select v-model="actualposts" placeholder="请选择岗位" clearable multiple size="small">
             <el-option
-                v-for="dict in actualpostOptions"
-                :key="dict.dictValue"
-                :label="dict.dictLabel"
-                :value="dict.dictValue"
+                v-for="dict in dict.type.actualpost"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
             />
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+          <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
         </el-form-item>
       </el-form>
@@ -71,22 +71,22 @@
         title="详情">
       <div style="margin: 0px 10px">
         <el-descriptions :column="1" border size="normal">
-          <el-descriptions-item label="部门"></el-descriptions-item>
+          <el-descriptions-item label="部门">{{unitFormat(staffData.unit)}}</el-descriptions-item>
           <el-descriptions-item label="员工编号">{{ staffData.staffid }}</el-descriptions-item>
           <el-descriptions-item label="员工姓名">{{ staffData.name }}</el-descriptions-item>
-          <el-descriptions-item label="性别"></el-descriptions-item>
+          <el-descriptions-item label="性别">{{sexFormat(staffData.sex)}}</el-descriptions-item>
           <el-descriptions-item v-hasPermi="['plant:staffmgr:detail']" label="身份证号">{{ staffData.idCard }}
           </el-descriptions-item>
           <el-descriptions-item label="联系方式">{{ staffData.contact }}</el-descriptions-item>
-          <el-descriptions-item label="岗位"></el-descriptions-item>
+          <el-descriptions-item label="岗位">{{postFormat(staffData.actualpost)}}</el-descriptions-item>
           <el-descriptions-item label="邮箱">{{ staffData.email }}</el-descriptions-item>
-          <el-descriptions-item label="班组"></el-descriptions-item>
+          <el-descriptions-item label="班组">{{teamFormat(staffData.team)}}</el-descriptions-item>
           <el-descriptions-item v-hasPermi="['plant:staffmgr:detail']" label="住址">{{ staffData.address }}
           </el-descriptions-item>
-          <el-descriptions-item label="学历"></el-descriptions-item>
+          <el-descriptions-item label="学历">{{eduFormat(staffData.education)}}</el-descriptions-item>
           <el-descriptions-item v-hasPermi="['plant:staffmgr:detail']" label="专业">{{ staffData.speciality }}
           </el-descriptions-item>
-          <el-descriptions-item label="特殊职能"></el-descriptions-item>
+          <el-descriptions-item label="特殊职能">{{dutyFormat(staffData.specialDuty)}}</el-descriptions-item>
         </el-descriptions>
       </div>
     </el-drawer>
@@ -101,6 +101,7 @@ import {getToken} from "@/utils/auth";
 import html2canvas from 'html2canvas'
 
 export default {
+  dicts:['actualpost','staff_unit','team_divide','sys_user_sex','education','special_duty'],
   components: {Branch, VueDraggableResizable},
   data() {
     return {
@@ -175,24 +176,6 @@ export default {
     }
   },
   created() {
-    this.getDicts("actualpost").then(response => {
-      this.actualpostOptions = response.data;
-    });
-    this.getDicts("staff_unit").then(response => {
-      this.unitOptions = response.data;
-    });
-    this.getDicts("team_divide").then(response => {
-      this.teamOptions = response.data;
-    });
-    this.getDicts("sys_user_sex").then(response => {
-      this.sexOptions = response.data;
-    });
-    this.getDicts("education").then(response => {
-      this.educationOptions = response.data;
-    });
-    this.getDicts("special_duty").then(response => {
-      this.specialDutyOptions = response.data;
-    });
     this.getChartData()
   },
   mounted() {
@@ -207,22 +190,22 @@ export default {
   },
   methods: {
     postFormat(post) {
-      return this.selectDictLabel(this.actualpostOptions, post);
+      return this.selectDictLabel(this.dict.type.actualpost, post)
     },
-    sexFormat(sex) {
-      return this.selectDictLabel(this.sexOptions, sex);
+    sexFormat(val) {
+      return this.selectDictLabel(this.dict.type.sys_user_sex, val)
     },
-    unitFormat(unit) {
-      return this.selectDictLabel(this.unitOptions, unit);
+    unitFormat(val) {
+      return this.selectDictLabel(this.dict.type.staff_unit, val)
     },
     teamFormat(val) {
-      return this.selectDictLabel(this.teamOptions, val);
+      return this.selectDictLabel(this.dict.type.team_divide, val)
     },
     eduFormat(val) {
-      return this.selectDictLabel(this.educationOptions, val);
+      return this.selectDictLabel(this.dict.type.education, val)
     },
     dutyFormat(val) {
-      return this.selectDictLabels(this.specialDutyOptions, val);
+      return this.selectDictLabels(this.dict.type.special_duty, val)
     },
     handleTableWheel(event) {
       let obj = this.$refs['branch']
@@ -262,7 +245,7 @@ export default {
         this.list2 = []
 
         for (let i = 0; i < this.staffmgrList.length; i++) {
-          let post = this.selectDictLabel(this.actualpostOptions, this.staffmgrList[i].actualpost)
+          let post = this.selectDictLabel(this.dict.type.actualpost, this.staffmgrList[i].actualpost)
           if (this.staffmgrList[i].pId == 0) {
             let nodeData = {
               id: this.staffmgrList[i].id,

ruoyi-ui/src/views/plant/staffmgr/index.vue

@@ -72,7 +72,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specAqf/bf.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specAqf/fc.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specAqf/index.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specAqf/ty.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specCc/bf.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specCc/index.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specCc/ty.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specCc/zx.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specDt/bf.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specDt/index.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specDt/ty.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specDt/zx.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specDzsb/bf.vue

@@ -22,7 +22,7 @@
 
 
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specDzsb/index.vue

@@ -22,7 +22,7 @@
 
 
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specDzsb/ty.vue

@@ -22,7 +22,7 @@
 
 
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specDzsb/zx.vue

@@ -22,7 +22,7 @@
 
 
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specGl/bf.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specGl/index.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specGl/ty.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specGl/zx.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specYlgd/bf.vue

@@ -21,7 +21,7 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specYlgd/index.vue

@@ -21,7 +21,7 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specYlgd/ty.vue

@@ -21,7 +21,7 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specYlgd/zx.vue

@@ -21,7 +21,7 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specYlrq/bf.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specYlrq/index.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specYlrq/ty.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>

ruoyi-ui/src/views/sems/specYlrq/zx.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery"> 搜索 </el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"> 搜索 </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"> 重置 </el-button>
       </el-form-item>
     </el-form>