Quellcode durchsuchen

证书人员去掉特种作业

yanghao vor 1 Woche
Ursprung
Commit
69ba0bad9e

+ 0 - 119
src/views/pms/qhse/certPerson/CertPersonForm.vue

@@ -35,112 +35,6 @@
 
       <el-divider>是否需要相关证书</el-divider>
 
-      <!-- <div class="flex flex-wrap items-center justify-between">
-        <el-form-item label="硫化氢证" prop="lsh">
-          <el-select v-model="formData.lsh" placeholder="请选择" clearable style="width: 150px">
-            <el-option
-              v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value" />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="井控证" prop="jk">
-          <el-select v-model="formData.jk" placeholder="请选择" clearable style="width: 150px">
-            <el-option
-              v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value" />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="HSE证" prop="hse">
-          <el-select v-model="formData.hse" placeholder="请选择" clearable style="width: 150px">
-            <el-option
-              v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value" />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="司钻证" prop="sz">
-          <el-select v-model="formData.sz" placeholder="请选择" clearable style="width: 150px">
-            <el-option
-              v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value" />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="高处作业证" prop="gczy">
-          <el-select v-model="formData.gczy" placeholder="请选择" clearable style="width: 150px">
-            <el-option
-              v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value" />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="电工证" prop="dg">
-          <el-select v-model="formData.dg" placeholder="请选择" clearable style="width: 150px">
-            <el-option
-              v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value" />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item
-          label="连续油管主操证"
-          prop="lxygzc"
-          label-width="auto"
-          style="margin-left: -5px">
-          <el-select v-model="formData.lxygzc" placeholder="请选择" clearable style="width: 150px">
-            <el-option
-              v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value" />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="吊装证" prop="dz">
-          <el-select v-model="formData.dz" placeholder="请选择" clearable style="width: 150px">
-            <el-option
-              v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value" />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="特种作业证" prop="tzzy">
-          <el-select v-model="formData.tzzy" placeholder="请选择" clearable style="width: 150px">
-            <el-option
-              v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value" />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="安全管理证" prop="aqgl">
-          <el-select v-model="formData.aqgl" placeholder="请选择" clearable style="width: 150px">
-            <el-option
-              v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value" />
-          </el-select>
-        </el-form-item>
-      </div> -->
-
       <div class="flex flex-wrap items-center justify-between">
         <el-form-item label="硫化氢证" prop="lsh">
           <el-radio-group v-model="formData.lsh">
@@ -234,17 +128,6 @@
           </el-radio-group>
         </el-form-item>
 
-        <el-form-item label="特种作业证" prop="tzzy">
-          <el-radio-group v-model="formData.tzzy">
-            <el-radio
-              v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-              :key="dict.value"
-              :value="dict.value">
-              {{ dict.label }}
-            </el-radio>
-          </el-radio-group>
-        </el-form-item>
-
         <el-form-item label="安全管理证" prop="aqgl">
           <el-radio-group v-model="formData.aqgl">
             <el-radio
@@ -299,7 +182,6 @@ const formData = ref({
   dg: undefined,
   lxygzc: undefined,
   dz: undefined,
-  tzzy: undefined,
   aqgl: undefined
 })
 const formRules = reactive({
@@ -316,7 +198,6 @@ const formRules = reactive({
   dg: [{ required: true, message: '请选择', trigger: 'blur' }],
   lxygzc: [{ required: true, message: '请选择', trigger: 'blur' }],
   dz: [{ required: true, message: '请选择', trigger: 'blur' }],
-  tzzy: [{ required: true, message: '请选择', trigger: 'blur' }],
   aqgl: [{ required: true, message: '请选择', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref

+ 2 - 2
src/views/pms/qhse/certPerson/index.vue

@@ -166,7 +166,7 @@
               <span v-else></span>
             </template>
           </zm-table-column>
-
+          <!-- 
           <zm-table-column label="特种作业证" align="center">
             <template #default="scope">
               <el-button circle type="success" style="border: none" plain v-if="scope.row.tzzy">
@@ -176,7 +176,7 @@
               </el-button>
               <span v-else></span>
             </template>
-          </zm-table-column>
+          </zm-table-column> -->
 
           <zm-table-column label="安全管理证" align="center">
             <template #default="scope">

+ 36 - 56
src/views/pms/qhse/kanban/index.vue

@@ -591,33 +591,6 @@ function getSocChartOption(): echarts.EChartsOption {
           }
         }))
       }
-    ],
-    graphic: [
-      {
-        type: 'text',
-        left: '29%',
-        top: '43%',
-        style: {
-          text: 'SOC卡',
-          fill: '#6b7f9c',
-          fontSize: 18,
-          fontWeight: 700,
-          fontFamily: FONT_FAMILY
-        }
-      },
-      {
-        type: 'text',
-        left: '26.5%',
-        top: '50%',
-        textAlign: 'center',
-        style: {
-          text: `${permitStats.value.reduce((sum, item) => sum + item.value, 0)}`,
-          fill: '#114a9b',
-          fontSize: 30,
-          fontWeight: 700,
-          fontFamily: 'YouSheBiaoTiHei, sans-serif'
-        }
-      }
     ]
   }
 }
@@ -928,42 +901,48 @@ onUnmounted(() => {
             </div>
 
             <div class="right-column">
-              <section class="panel board-panel kb-stage-card kb-stage-card--5">
-                <div class="panel-title">
+              <section class="panel board-panel board-panel--center kb-stage-card kb-stage-card--4">
+                <div class="panel-title panel-title--center">
                   <span class="icon-decorator"><span></span><span></span></span>
                   行为安全与风险预警
                 </div>
-                <div ref="socChartRef" class="soc-chart-panel"></div>
-              </section>
+                <section class="board-panel kb-stage-card kb-stage-card--5 pt-2">
+                  <div class="panel-title">
+                    <!-- <span class="icon-decorator"><span></span><span></span></span> -->
+                    SOC卡类型
+                  </div>
+                  <div ref="socChartRef" class="soc-chart-panel"></div>
+                </section>
 
-              <section class="panel board-panel kb-stage-card kb-stage-card--6">
-                <div class="panel-title">
-                  <span class="icon-decorator"><span></span><span></span></span>
-                  人员资质风险预警
-                </div>
-                <div class="qualification-panel">
-                  <div class="qualification-icon">
-                    <el-icon>
-                      <CollectionTag />
-                    </el-icon>
+                <section class="board-panel kb-stage-card kb-stage-card--6 pl-4">
+                  <div class="panel-title">
+                    <span class="icon-decorator"><span></span><span></span></span>
+                    人员资质风险预警
                   </div>
-                  <div class="qualification-list">
-                    <div
-                      v-for="item in qualificationWarnings"
-                      :key="item.label"
-                      class="qualification-item">
-                      <span class="qualification-item__label">{{ item.label }}:</span>
-                      <strong :style="{ color: item.accent }">
-                        <CountTo
-                          :duration="2600"
-                          :end-val="item.value"
-                          :start-val="0"
-                          :style="{ color: item.accent }" />
-                        <span class="pl-2">人</span>
-                      </strong>
+                  <div class="qualification-panel">
+                    <div class="qualification-icon">
+                      <el-icon>
+                        <CollectionTag />
+                      </el-icon>
+                    </div>
+                    <div class="qualification-list">
+                      <div
+                        v-for="item in qualificationWarnings"
+                        :key="item.label"
+                        class="qualification-item">
+                        <span class="qualification-item__label">{{ item.label }}:</span>
+                        <strong :style="{ color: item.accent }">
+                          <CountTo
+                            :duration="2600"
+                            :end-val="item.value"
+                            :start-val="0"
+                            :style="{ color: item.accent }" />
+                          <span class="pl-2">人</span>
+                        </strong>
+                      </div>
                     </div>
                   </div>
-                </div>
+                </section>
               </section>
             </div>
           </div>
@@ -1375,6 +1354,7 @@ onUnmounted(() => {
   margin-top: 26px;
   padding: 28px;
   grid-template-columns: 140px 1fr;
+  padding-left: 120px;
   align-items: center;
   gap: 26px;
 }