判定和接口调整

src/views/contingency/contingencystudy/reportEdit.vue

@@ -9,7 +9,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="公司"  ref="gsid" prop="gsid">
+          <el-form-item label="公司"  v-rule="{
+			required: true,
+			rules:rules
+		}"   ref="gsid" prop="gsid">
             <RelSelect  style="width: 100%;" :readonly="readonly" src='jcsj/common/bm/queryGs' :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
           </el-form-item>
         </el-col>
@@ -39,7 +42,10 @@
           </el-form-item>
         </el-col>-->
         <el-col :span="12">
-          <el-form-item label="演练组织部门"  ref="yldwid" prop="yldwid">
+          <el-form-item label="演练组织部门"  v-rule="{
+			required: true,
+			rules:rules
+		}"    ref="yldwid" prop="yldwid">
             <RelSelect  linkage :linkParams="{pid:form.gsid}" :readonly="readonly" style="width: 100%;"  src='jcsj/common/bm/queryBz'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.yldwid' ></RelSelect>
           </el-form-item>
         </el-col>

src/views/threeViolations/homePage/index.vue

@@ -1043,6 +1043,7 @@
                 color: 'white'
               }
             }],
+
             series: [{
               name: '隐患数量',
               type: 'bar',

src/views/train/aqpx/edit.vue

@@ -82,7 +82,7 @@
              <el-row :gutter="24">
                <el-col :span="12">
                    <el-form-item label="培训等级"  ref="pxdj" prop="pxdj">
-                    <RelSelect  style="width: 100%;" :readonly="readonly" src='aqgl/pxgl/uaqpxjh/init/yldj' filterable clearable :match="{value:'id',label:'name'}" v-model='form.pxdj' ></RelSelect>
+                    <RelSelect  style="width: 100%;" :readonly="readonly" src='aqgl/pxgl/uaqpxjh/init/pxdj' filterable clearable :match="{value:'id',label:'name'}" v-model='form.pxdj' ></RelSelect>
                    </el-form-item>
                </el-col>
                 <el-col :span="12">

src/views/train/aqpx/index.vue

@@ -21,9 +21,9 @@
           </el-col>
           <el-col :span="6" class="search-col">
             <div class="search-item">
-              <span class="search-span">演练等级:</span>
-              <RelSelect style="width: 100%;" src='aqgl/pxgl/uaqpxjh/init/yldj' filterable clearable
-                :match="{value:'id',label:'name'}" v-model='queryParams.yldj'></RelSelect>
+              <span class="search-span">培训等级:</span>
+              <RelSelect style="width: 100%;" src='aqgl/pxgl/uaqpxjh/init/pxdj' filterable clearable
+                :match="{value:'id',label:'name'}" v-model='queryParams.pxdj'></RelSelect>
             </div>
           </el-col>
 
@@ -102,7 +102,7 @@
         baseUrl: '/aqgl/pxgl/uaqpxjh',
         /* 查询参数*/
         queryParams: {
-          yldj: '',
+          pxdj: '',
           info: '',
           ksrq: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
           jsrq: new Date().getTime()
@@ -147,7 +147,7 @@
               prop: "pxdj",
               width: 180,
               transform: {
-                url: 'aqgl/pxgl/uaqpxjh/init/yldj',
+                url: 'aqgl/pxgl/uaqpxjh/init/pxdj',
                 label: 'name',
                 value: 'id'
               }

src/views/train/aqpx/report.vue

@@ -97,7 +97,7 @@
          prop: "pxdj",
          width: 180,
          transform: {
-           url: 'aqgl/pxgl/uaqpxjh/init/yldj',
+           url: 'aqgl/pxgl/uaqpxjh/init/pxdj',
            label: 'name',
            value: 'id'
          }

src/views/train/aqpx/reportEdit.vue

@@ -9,7 +9,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="公司"  ref="gsid" prop="gsid">
+          <el-form-item label="公司"  v-rule="{
+			required: true,
+			rules:rules
+		}"   ref="gsid" prop="gsid">
             <RelSelect  style="width: 100%;" :readonly="readonly" src='jcsj/common/bm/queryGs' :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
           </el-form-item>
         </el-col>
@@ -39,7 +42,10 @@
           </el-form-item>
         </el-col>-->
         <el-col :span="12">
-          <el-form-item label="培训组织部门"  ref="pxdwid" prop="pxdwid">
+          <el-form-item  v-rule="{
+			required: true,
+			rules:rules
+		}"   label="培训组织部门"  ref="pxdwid" prop="pxdwid">
             <RelSelect  linkage :linkParams="{pid:form.gsid}" :readonly="readonly" style="width: 100%;"  src='jcsj/common/bm/queryBz'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.pxdwid' ></RelSelect>
           </el-form-item>
         </el-col>
@@ -50,7 +56,7 @@
         </el-col>
        <el-col :span="12">
            <el-form-item label="培训等级"  ref="pxdj" prop="pxdj">
-            <RelSelect  style="width: 100%;" :readonly="readonly" src='aqgl/pxgl/uaqpxjh/init/yldj' filterable clearable :match="{value:'id',label:'name'}" v-model='form.pxdj' ></RelSelect>
+            <RelSelect  style="width: 100%;" :readonly="readonly" src='aqgl/pxgl/uaqpxjh/init/pxdj' filterable clearable :match="{value:'id',label:'name'}" v-model='form.pxdj' ></RelSelect>
            </el-form-item>
        </el-col>
         <el-col :span="12">

src/views/train/aqpxjh/edit.vue

@@ -87,7 +87,7 @@
              <el-row :gutter="24">
                <el-col :span="12">
                    <el-form-item label="培训等级"  ref="pxdj" prop="pxdj">
-                    <RelSelect  style="width: 100%;" :readonly="readonly" src='aqgl/pxgl/uaqpxjh/init/yldj' filterable clearable :match="{value:'id',label:'name'}" v-model='form.pxdj' ></RelSelect>
+                    <RelSelect  style="width: 100%;" :readonly="readonly" src='aqgl/pxgl/uaqpxjh/init/pxdj' filterable clearable :match="{value:'id',label:'name'}" v-model='form.pxdj' ></RelSelect>
                    </el-form-item>
                </el-col>
                 <el-col :span="12">

src/views/train/aqpxjh/index.vue

@@ -128,11 +128,11 @@
             fieldType: "int"
           },
           {
-            label: "培训等级",
+            label: "演练等级",
             prop: "pxdj",
             width: 180,
             transform: {
-              url: 'aqgl/pxgl/uaqpxjh/init/yldj',
+              url: 'aqgl/pxgl/uaqpxjh/init/pxdj',
               label: 'name',
               value: 'id'
             }