MOC

master/src/main/java/com/ruoyi/project/process/controller/TMocController.java

@@ -631,7 +631,6 @@ public class TMocController extends BaseController
         List<SysDictData> mocRiskLevelDict = iSysDictTypeService.selectDictDataByType("MOC_RISKLEVEL");
         List<SysDictData> tempStateDict = iSysDictTypeService.selectDictDataByType("TEMP_STATE");
         List<SysDictData> mocStatusDict = iSysDictTypeService.selectDictDataByType("MOC_STATUS");
-        List<SysDictData> yesNoEnDict = iSysDictTypeService.selectDictDataByType("YES_NO_EN");
         // 遍历总表数据，插入临时MOC表
         for (TMoc moc : mocList) {
             TemporaryMoc temporaryMoc = new TemporaryMoc();
@@ -707,7 +706,6 @@ public class TMocController extends BaseController
         List<SysDictData> mocRiskLevelDict = iSysDictTypeService.selectDictDataByType("MOC_RISKLEVEL");
         List<SysDictData> tempStateDict = iSysDictTypeService.selectDictDataByType("TEMP_STATE");
         List<SysDictData> mocStatusDict = iSysDictTypeService.selectDictDataByType("MOC_STATUS");
-        List<SysDictData> yesNoEnDict = iSysDictTypeService.selectDictDataByType("YES_NO_EN");
         //部门查询
         List<SysDept> dept = iSysDeptService.selectDeptList(new SysDept());
         int rowNum = sheet.getPhysicalNumberOfRows();
@@ -857,7 +855,7 @@ public class TMocController extends BaseController
         List<SysDictData> mocTypeDict = iSysDictTypeService.selectDictDataByType("MOC_TYPE");
         List<SysDictData> mcDetailDict = iSysDictTypeService.selectDictDataByType("MC_DETAIL");
         List<SysDictData> mocRiskLevelDict = iSysDictTypeService.selectDictDataByType("MOC_RISKLEVEL");
-        List<SysDictData> yesNoEnDict = iSysDictTypeService.selectDictDataByType("YES_NO_EN");
+        List<SysDictData> yesNoEnDict = iSysDictTypeService.selectDictDataByType("MOC_UPDATE");
         // 遍历总表数据，插入永久MOC表
         for (TMoc moc : mocList) {
             PermanentMoc permanentMoc = new PermanentMoc();
@@ -934,7 +932,7 @@ public class TMocController extends BaseController
         List<SysDictData> mocTypeDict = iSysDictTypeService.selectDictDataByType("MOC_TYPE");
         List<SysDictData> mcDetailDict = iSysDictTypeService.selectDictDataByType("MC_DETAIL");
         List<SysDictData> mocRiskLevelDict = iSysDictTypeService.selectDictDataByType("MOC_RISKLEVEL");
-        List<SysDictData> yesNoEnDict = iSysDictTypeService.selectDictDataByType("YES_NO_EN");
+        List<SysDictData> yesNoEnDict = iSysDictTypeService.selectDictDataByType("MOC_UPDATE");
         //部门查询
         List<SysDept> dept = iSysDeptService.selectDeptList(new SysDept());
         int rowNum = sheet.getPhysicalNumberOfRows();

master/src/main/java/com/ruoyi/project/process/controller/vo/TempStateVO.java

@@ -11,6 +11,17 @@ public class TempStateVO {
     /** 临时/永久 */
     private String timeliness;
 
+    /** 临时MOC类别 */
+    private String tempCategory;
+
+    public String getTempCategory() {
+        return tempCategory;
+    }
+
+    public void setTempCategory(String tempCategory) {
+        this.tempCategory = tempCategory;
+    }
+
     public String getTimeliness() {
         return timeliness;
     }

master/src/main/resources/mybatis/process/TMocMapper.xml

@@ -515,6 +515,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT count(1) as dataNum, TEMP_STATE as dataName FROM t_moc d
         <where>
             and d.timeliness = #{timeliness}
+            and d.temp_category = #{tempCategory}
             and d.del_flag = 0
         </where>
         GROUP BY TEMP_STATE

ui/.env.development

@@ -2,8 +2,8 @@
 ENV = 'development'
 
 # CPMS管理系统/开发环境
-#VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://47.114.101.16:8090'
+VUE_APP_BASE_API = '/dev-api'
+#VUE_APP_BASE_API = 'http://47.114.101.16:8090'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

ui/src/views/process/moc/chart/areaChart.vue

@@ -49,7 +49,7 @@
           series: [
             {
               label: {
-                formatter: '{b}: ({d}%)'
+                formatter: '{b}: {c} ({d}%)'
               },
               name: this.$t('区域'),
               type: 'pie',

ui/src/views/process/moc/chart/departmentChart.vue

@@ -50,9 +50,9 @@
           series: [
             {
               label: {
-                formatter: '{b}: ({d}%)'
+                formatter: '{b}: {c} ({d}%)'
               },
-              name: this.$t('区域'),
+              name: this.$t('部门'),
               type: 'pie',
               radius: ['50%', '70%'],
               selectedMode: 'single',

ui/src/views/process/moc/chart/leakLocationChart.vue

@@ -50,9 +50,9 @@
           series: [
             {
               label: {
-                formatter: '{b}: ({d}%)'
+                formatter: '{b}: {c} ({d}%)'
               },
-              name: this.$t('区域'),
+              name: this.$t('泄露位置'),
               type: 'pie',
               radius: ['50%', '70%'],
               selectedMode: 'single',

ui/src/views/process/moc/chart/materialTypeChart.vue

@@ -50,9 +50,9 @@
           series: [
             {
               label: {
-                formatter: '{b}: ({d}%)'
+                formatter: '{b}: {c} ({d}%)'
               },
-              name: this.$t('区域'),
+              name: this.$t('泄露介质'),
               type: 'pie',
               radius: ['50%', '70%'],
               selectedMode: 'single',

ui/src/views/process/moc/chart/materialTypeChart2.vue

@@ -50,9 +50,9 @@
           series: [
             {
               label: {
-                formatter: '{b}: ({d}%)'
+                formatter: '{b}: {c} ({d}%)'
               },
-              name: this.$t('区域'),
+              name: this.$t('泄露介质'),
               type: 'pie',
               radius: ['50%', '70%'],
               selectedMode: 'single',

ui/src/views/process/moc/chart/mcDetailChart.vue

@@ -49,9 +49,9 @@
           series: [
             {
               label: {
-                formatter: '{b}: ({d}%)'
+                formatter: '{b}: {c} ({d}%)'
               },
-              name: this.$t('区域'),
+              name: this.$t('MC情况'),
               type: 'pie',
               radius: ['50%', '70%'],
               selectedMode: 'single',

ui/src/views/process/moc/chart/mocTypeChart.vue

@@ -49,9 +49,9 @@
           series: [
             {
               label: {
-                formatter: '{b}: ({d}%)'
+                formatter: '{b}: {c} ({d}%)'
               },
-              name: this.$t('区域'),
+              name: this.$t('MOC类型'),
               type: 'pie',
               radius: ['50%', '70%'],
               selectedMode: 'single',

ui/src/views/process/moc/chart/riskLevelChart.vue

@@ -49,9 +49,9 @@
           series: [
             {
               label: {
-                formatter: '{b}: ({d}%)'
+                formatter: '{b}: {c} ({d}%)'
               },
-              name: this.$t('区域'),
+              name: this.$t('风险等级'),
               type: 'pie',
               radius: ['50%', '70%'],
               selectedMode: 'single',

ui/src/views/process/moc/chart/statusChart.vue

@@ -50,9 +50,9 @@
           series: [
             {
               label: {
-                formatter: '{b}: ({d}%)'
+                formatter: '{b}: {c} ({d}%)'
               },
-              name: this.$t('区域'),
+              name: this.$t('卡具状态'),
               type: 'pie',
               radius: ['50%', '70%'],
               selectedMode: 'single',

ui/src/views/process/moc/chart/tempStateChart.vue

@@ -10,6 +10,7 @@
   export default {
     props: {
       timeliness: null,
+      tempCategory: null,
       width: {
         type: String,
         default: '100%'
@@ -49,9 +50,9 @@
           series: [
             {
               label: {
-                formatter: '{b}: ({d}%)'
+                formatter: '{b}: {c} ({d}%)'
               },
-              name: this.$t('区域'),
+              name: this.$t('临时MOC状态'),
               type: 'pie',
               radius: ['50%', '70%'],
               selectedMode: 'single',
@@ -71,6 +72,7 @@
         // 查询参数
         queryParams: {
           timeliness: null,
+          tempCategory: null,
         },
         chart: null,
         chartData : []
@@ -79,6 +81,7 @@
     mounted() {
       this.$nextTick(() => {
         this.queryParams.timeliness = this.timeliness;
+        this.queryParams.tempCategory = this.tempCategory;
         tempStateData(this.queryParams).then(response => {
           this.chartData = response
           for(let i = 0 ; i <this.chartData.length ; i++){

ui/src/views/process/moc/facility/index.vue

@@ -299,7 +299,7 @@
 
     <!-- 临时MOC状态统计对话框 -->
     <el-dialog v-dialogDrag :title="tempStateChart.title" :visible.sync="tempStateChart.open" width="500px" append-to-body>
-      <temp-state-chart :timeliness="2"></temp-state-chart>
+      <temp-state-chart :timeliness="2" :tempCategory="2"></temp-state-chart>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="tempStateChart.open = false">{{ $t('确 定') }}</el-button>
       </div>

ui/src/views/process/moc/interlock/index.vue

@@ -303,7 +303,7 @@
 
     <!-- 临时MOC状态统计对话框 -->
     <el-dialog v-dialogDrag :title="tempStateChart.title" :visible.sync="tempStateChart.open" width="500px" append-to-body>
-      <temp-state-chart :timeliness="2"></temp-state-chart>
+      <temp-state-chart :timeliness="2" :tempCategory="3"></temp-state-chart>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="tempStateChart.open = false">{{ $t('确 定') }}</el-button>
       </div>

ui/src/views/process/moc/permanentMoc/index.vue

@@ -1,6 +1,15 @@
 <template>
   <div class="app-container-list">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item :label="$t('MOC编号')" label-width="50" prop="projectNo">
+        <el-input
+          v-model="queryParams.mocNo"
+          :placeholder="$t('请输入') + $t('MOC编号')"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item :label="$t('项目号')" label-width="50" prop="projectNo">
         <el-input
           v-model="queryParams.projectNo"
@@ -742,9 +751,9 @@ export default {
         mocNo: [
           { required: true, message: this.$t('MOC编号') + this.$t('不能为空'), trigger: "change" }
         ],
-        mcDetail: [
-          { validator: validateMcDetailUpdate, trigger: 'change' }
-        ],
+        // mcDetail: [
+        //   { validator: validateMcDetailUpdate, trigger: 'change' }
+        // ],
         deptId: [
           { required: true, message: this.$t('归属部门') + this.$t('不能为空'), trigger: "change" }
         ],
@@ -779,7 +788,7 @@ export default {
     this.getDicts("MOC_AREA").then(response => {
       this.areaOptions = response.data;
     });
-    this.getDicts("YES_NO_EN").then(response => {
+    this.getDicts("MOC_UPDATE").then(response => {
       this.pidMasterOptions = response.data;
       this.sopUpdateOptions = response.data;
       this.docUpdateOptions = response.data;

ui/src/views/process/moc/summary/index.vue

@@ -1,6 +1,15 @@
 <template>
   <div class="app-container-list">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item :label="$t('MOC编号')" label-width="50" prop="projectNo">
+        <el-input
+          v-model="queryParams.mocNo"
+          :placeholder="$t('请输入') + $t('MOC编号')"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item :label="$t('项目号')" label-width="50" prop="projectNo">
         <el-input
           v-model="queryParams.projectNo"
@@ -56,7 +65,16 @@
         :height="clientHeight" border
         :default-sort = "{prop: 'mocNo', order: 'descending'}">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('MOC编号')" align="center" width="120" prop="mocNo" :show-overflow-tooltip="true" sortable/>
+      <el-table-column align="center" width="120" prop="mocNo" :show-overflow-tooltip="true" sortable>
+        <template slot="header">
+          <span
+            @click="mocNoChart.open = true"
+            id="moc-no">
+            MOC编号
+            <i class="el-icon-s-data"></i>
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('公司MOC编号')" align="center" width="120" prop="companyMocNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('时效性')" align="center" width="80" prop="timeliness" :show-overflow-tooltip="true">
         <template slot-scope="scope">
@@ -126,6 +144,14 @@
         <el-button type="primary" @click="mocTypeInfo.open = false">{{ $t('确 定') }}</el-button>
       </div>
     </el-dialog>
+
+    <!-- MOC编号统计对话框 -->
+    <el-dialog v-dialogDrag :title="mocNoChart.title" :visible.sync="mocNoChart.open" width="500px" append-to-body>
+      <moc-no-chart></moc-no-chart>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="mocNoChart.open = false">{{ $t('确 定') }}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -136,12 +162,17 @@
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import {addCommonfile, allFileList, delCommonfile, updateCommonfile} from "@/api/common/commonfile";
+  import mocNoChart from "../chart/mocNoChart";
 
   export default {
     name: "Summary",
-    components: { Treeselect },
+    components: { mocNoChart, Treeselect },
     data() {
       return {
+        mocNoChart: {
+          open: false,
+          title: 'MOC编号数据统计'
+        },
         mocTypeInfo: {
           open: false,
           title: 'MOC类型说明'

ui/src/views/process/moc/temporaryMoc/index.vue

@@ -1,6 +1,15 @@
 <template>
   <div class="app-container-list">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item :label="$t('MOC编号')" label-width="50" prop="projectNo">
+        <el-input
+          v-model="queryParams.mocNo"
+          :placeholder="$t('请输入') + $t('MOC编号')"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item :label="$t('项目号')" label-width="50" prop="projectNo">
         <el-input
           v-model="queryParams.projectNo"