+
+
+
@@ -324,12 +328,13 @@ import debounce from 'lodash.debounce'
import enginChart from './engin/enginChart.vue'
import workTrainListDlg from './safe/workTrainListDlg.vue'
import ProblemmodifyList from './components/ProblemmodifyList.vue'
+import SpecialList from './safe/SpecialList.vue'
export default {
components: {
worktrainDlg,
projectSpecialDlg,
ProblemmodifyDetail, AttendanceDetailDialog,
- projectInsuranceDlg, JobWorkerDialog, enginChart, workTrainListDlg,ProblemmodifyList
+ projectInsuranceDlg, JobWorkerDialog, enginChart, workTrainListDlg,ProblemmodifyList,SpecialList
},
data() {
return {
@@ -452,7 +457,7 @@ export default {
this.initMe();
}
setTimeout(()=>{
- this.dtChange();
+ this.dtChange(true);
},400);
},
methods: {
@@ -501,6 +506,10 @@ export default {
this.$refs.probDlg.showDialog(a, 0, this.safeNav, this.selDate);
},
doSpecialRowClick(row) {
+ if(this.isTypeBuser()){
+ row=this.$root.projects[1];
+ row.projectId=row.id;
+ }
row.title = row.projectName + "特种作业人员清单";
this.$refs.projectSpecialDlg.showDialog(row);
},
@@ -702,13 +711,11 @@ export default {
n = "" + n;
return " ".substring(0, 3 - n.length) + n;
},
- dtChange() {
- if(this.isTypeBuser() && this.$refs.probList){
- this.$refs.probList.loadData(0, this.safeNav, this.selDate);
- }
- this.doDeptChane();
+ dtChange(init) {
+
+ this.doDeptChane(init);
},
- doDeptChane() {
+ doDeptChane(init) {
let postData = {
deptId: this.dept?.id || 0,
roleType: this.safeNav,
@@ -721,7 +728,14 @@ export default {
postData.endDate = this.$dt(this.selDate[1]).format("YYYY-MM-DD");
}
this.$api.problemmodify.safetySummary(postData).then(d => {
-
+ if(init){
+ if(this.isTypeBuser() && this.$refs.probList){
+ this.$refs.probList.loadData(0, this.safeNav, this.selDate);
+ }
+ if(this.$refs.specList){
+ this.$refs.specList.initData();
+ }
+ }
this.summary = (d || []).map(it => {
return {
text: it.problemArea,
@@ -823,6 +837,7 @@ export default {
//定时器|一分钟执行一次
this.getWorkFileList();
+
//setInterval(this.getWorkFileList, 60000);
//setInterval(this.getWorkTrainList, 60000);
//setInterval(this.getEmergencyDrillList, 60000);
diff --git a/src/pages/quality/projectChecking.vue b/src/pages/quality/projectChecking.vue
index ed9aa89..064baa6 100644
--- a/src/pages/quality/projectChecking.vue
+++ b/src/pages/quality/projectChecking.vue
@@ -24,7 +24,7 @@
@click="doQueryGroup(it.dictValue, 'a')" v-for="(it, idx) in dict1" :key="it.dictValue">{{
it.dictLabel }}