Merge remote-tracking branch 'origin/develop' into develop

src/components/navMenu/index.vue

@@ -144,7 +144,7 @@ export default {
               menuId: 'PCZKM8TQJAH5UP5EAXTJ'
             },
             {
-              title: '未符合项跟踪',
+              title: '未符合项整改',
               path: '/nonConfomity',
               menuId: 'HQSK8WWPDJG7R5F53LTK'
             },

src/components/pagination/index.vue

@@ -7,8 +7,8 @@
         <el-pagination
           :total="total"
           :current-page="page"
-          :page-sizes="[1, 10, 20, 30, 50]"
+          :page-sizes="[10, 20, 30, 50]"
-          :page-size="pageSize"
+          :page-size="_pageSize"
           @current-change="pageChange"
           @size-change="pageSizeChange"
           layout="total, prev, pager, next, sizes, jumper"
@@ -81,12 +81,22 @@ export default {
     isDivider: {
       type: Boolean,
       default: true
+    },
+    pageSize: {
+      type: Number,
+      default: 10
+    },
+    // 不随全局页码改变
+    autoSize: {
+      type: Boolean,
+      default: false
     }
   },
   computed: {
     ...mapGetters(['userInfo', 'getTypeFlag']),
-    pageSize () {
+    _pageSize () {
-      return this.userInfo.configContent === '' || this.userInfo.configContent === undefined || this.userInfo.configContent === null ? 20 : parseInt(this.userInfo.configContent)
+      return this.autoSize ? this.pageSize
+        : this.userInfo.configContent === '' || this.userInfo.configContent === undefined || this.userInfo.configContent === null ? 20 : parseInt(this.userInfo.configContent)
     }
   },
   mounted () {

src/pages/details/otherStandardDetails/index.vue

@@ -23,13 +23,13 @@
           </div>
         </div>
         <div class="basic-information-content">
+          <p><label>中文名称：</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
+          <p><label>英文名称：</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
           <p style="color: #C42626;">
             <label>标准号：</label>
             <span v-if="sarStandardsInfoEO.standYear">{{ sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear }}</span>
             <span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
           </p>
-          <p><label>中文名称：</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
-          <p><label>英文名称：</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
           <p>
             <label
               title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
@@ -1013,7 +1013,7 @@ export default {
       relateDialog: false,
       relateList: [],
       relateNowList: [],
-      loading: true,
+      loading: false,
       showItemInfoModal: false,
       standShowItemEO: {},
       // 提交状态
@@ -1892,7 +1892,7 @@ export default {
     },
     selectStandMessage () {
       return new Promise((resolve, reject) => {
-        this.$http.get('lawss/sarStandardsInfo/getStandInfoById', {id: this.sarStandardsInfoEO.id}, {
+        this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoById', {id: this.sarStandardsInfoEO.id}, {
           _this: this
         }, res => {
           this.sarStandardsInfoEO = res.data || {}
@@ -2387,7 +2387,7 @@ export default {
      */
     getAddFormFieldList (isEdit) {
       return new Promise((resolve, reject) => {
-        this.$http.get('lawss/sarStandAttrDetails/list', {}, {_this: this},
+        this.$http.get('sarStandAttrDetails/sar-stand-attr-details/list', {}, {_this: this},
           res => {
             if (res.ok) {
               // const { data: { STAND: data } } = res
@@ -2674,7 +2674,7 @@ export default {
         location.half = half
         location.showAll = false
       })
-      this.$http.get('lawss/sarSarAccessInfo/selectProTimeInfoByStandId', {
+      this.$http.get('sarSarAccessInfo/sar-sar-access-info/selectProTimeInfoByStandId', {
         standId: this.$route.params.id
       }, {
         _this: this

src/pages/localTool/standardWarning.vue

@@ -36,6 +36,7 @@
                     border
                     :resizable="false"
                     :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+                    v-loading="loading.newItems"
                   >
                     <el-table-column prop="standType" label="类型" align="center">
                       <template slot-scope="scope">
@@ -48,7 +49,7 @@
                     </el-table-column>
                     <el-table-column prop="standCode" label="编号" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
+                        <a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="standName" label="标准名称" align="center">
@@ -63,24 +64,34 @@
                     </el-table-column>
                     <el-table-column prop="applyType" label="适用车型" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                        <a @click="showStandDetails(scope.row)">{{ scope.row.applyType }}</a>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="standName" label="标准类型" align="center">
+                    <el-table-column prop="standType" label="标准类型" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                        <a @click="showStandDetails(scope.row)">{{ scope.row.standType }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                        <a @click="showStandDetails(scope.row)">{{ scope.row.dutyEngineer }}</a>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="操作" align="center" v-if="isShowBtn">
+                      <template slot-scope="scope">
+                        <el-button
+                          size="mini"
+                          type="danger"
+                          @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>
                       </template>
                     </el-table-column>
                   </el-table>
                   <pagination
                     style="position: static;"
-                    :page="pageConfig.current1"
+                    :page="pageConfig.newItemsPage"
+                    :pageSize="pageConfig.newItemsPageSize"
                     :total="pageConfig.count1"
+                    autoSize
                     @pageChange="page => handlePageChange('newItems', page)"
                     @pageSizeChange="pageSize => handlePageSizeChange('newItems', pageSize)"></pagination>
                   <el-divider content-position="left" class="dynamic-child-title">在产车实施日期预警</el-divider>
@@ -90,6 +101,7 @@
                     border
                     :resizable="false"
                     :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+                    v-loading="loading.oldItems"
                   >
                     <el-table-column prop="sortName" label="类型" align="center">
                       <template slot-scope="scope">
@@ -100,9 +112,9 @@
                         <div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="standNum" label="编号" align="center">
+                    <el-table-column prop="standCode" label="编号" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
+                        <a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="standName" label="标准名称" align="center">
@@ -115,28 +127,38 @@
                         {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
                       </template>
                     </el-table-column>
-                    <el-table-column prop="standName" label="适用车型" align="center">
+                    <el-table-column prop="applyType" label="适用车型" align="center">
                       <template slot-scope="scope">
                         <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="standName" label="标准类型" align="center">
+                    <el-table-column prop="standType" label="标准类型" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                        <a @click="showStandDetails(scope.row)">{{ scope.row.standType }}</a>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="standName" label="标准责任工程师" align="center">
+                    <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                        <a @click="showStandDetails(scope.row)">{{ scope.row.dutyEngineer }}</a>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="操作" align="center" v-if="isShowBtn">
+                      <template slot-scope="scope">
+                        <el-button
+                          size="mini"
+                          type="danger"
+                          @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>
                       </template>
                     </el-table-column>
                   </el-table>
                   <pagination
                     style="position: static;"
-                    :page="pageConfig.current2"
+                    :page="pageConfig.oldItemsPage"
+                    :pageSize="pageConfig.oldItemsPageSize"
                     :total="pageConfig.count2"
-                    @pageChange="page => handlePageChange('newStand', page)"
+                    autoSize
-                    @pageSizeChange="pageSize => handlePageSizeChange('newStand', pageSize)"></pagination>
+                    @pageChange="page => handlePageChange('oldItems', page)"
+                    @pageSizeChange="pageSize => handlePageSizeChange('oldItems', pageSize)"></pagination>
                   <el-divider content-position="left" class="dynamic-child-title">新车型条款预警</el-divider>
                   <el-table
                     :data="newStand"
@@ -144,10 +166,11 @@
                     border
                     :resizable="false"
                     :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+                    v-loading="loading.newStand"
                   >
-                    <el-table-column prop="standNum" label="标准编号" align="center">
+                    <el-table-column prop="standCode" label="标准编号" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
+                        <a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="standName" label="标准名称" align="center">
@@ -155,14 +178,14 @@
                         <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="standNum" label="条款号" align="center">
+                    <el-table-column prop="itemsId" label="条款号" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
+                        <a @click="showStandDetails(scope.row)">{{ scope.row.itemsId }}</a>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="standNum" label="条款要求" align="center">
+                    <el-table-column prop="itemsName" label="条款要求" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
+                        <a @click="showStandDetails(scope.row)">{{ scope.row.itemsName }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="putTime" label="实施日期" align="center" sortable>
@@ -170,33 +193,38 @@
                         {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
                       </template>
                     </el-table-column>
-                    <el-table-column prop="putTime" label="预警日期" align="center" sortable>
+                    <el-table-column prop="applyType" label="适用车型" align="center">
                       <template slot-scope="scope">
-                        {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
+                        <a @click="showStandDetails(scope.row)">{{ scope.row.applyType }}</a>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="standName" label="适用车型" align="center">
+                    <el-table-column prop="mark" label="标准分类" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                        <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="standName" label="标准分类" align="center">
+                    <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                        <a @click="showStandDetails(scope.row)">{{ scope.row.dutyEngineer }}</a>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="standName" label="标准责任工程师" align="center">
+                    <el-table-column label="操作" align="center" v-if="isShowBtn">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                        <el-button
+                          size="mini"
+                          type="danger"
+                          @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>
                       </template>
                     </el-table-column>
                   </el-table>
                   <pagination
                     style="position: static;"
-                    :page="pageConfig.current3"
+                    :page="pageConfig.newStandPage"
+                    :pageSize="pageConfig.newStandPageSize"
                     :total="pageConfig.count3"
-                    @pageChange="page => handlePageChange('oldItems', page)"
+                    autoSize
-                    @pageSizeChange="pageSize => handlePageSizeChange('oldItems', pageSize)"></pagination>
+                    @pageChange="page => handlePageChange('newStand', page)"
+                    @pageSizeChange="pageSize => handlePageSizeChange('newStand', pageSize)"></pagination>
                   <el-divider content-position="left" class="dynamic-child-title">在产车条款预警</el-divider>
                   <el-table
                     :data="oldStand"
@@ -204,10 +232,11 @@
                     border
                     :resizable="false"
                     :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+                    v-loading="loading.oldStand"
                   >
-                    <el-table-column prop="standNum" label="标准编号" align="center">
+                    <el-table-column prop="standCode" label="标准编号" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
+                        <a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="standName" label="标准名称" align="center">
@@ -215,14 +244,14 @@
                         <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="standNum" label="条款号" align="center">
+                    <el-table-column prop="itemsId" label="条款号" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
+                        <a @click="showStandDetails(scope.row)">{{ scope.row.itemsId }}</a>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="standNum" label="条款要求" align="center">
+                    <el-table-column prop="itemsName" label="条款要求" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
+                        <a @click="showStandDetails(scope.row)">{{ scope.row.itemsName }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="putTime" label="实施日期" align="center" sortable>
@@ -230,31 +259,36 @@
                         {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
                       </template>
                     </el-table-column>
-                    <el-table-column prop="putTime" label="预警日期" align="center" sortable>
+                    <el-table-column prop="applyType" label="适用车型" align="center">
                       <template slot-scope="scope">
-                        {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
+                        <a @click="showStandDetails(scope.row)">{{ scope.row.applyType }}</a>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="standName" label="适用车型" align="center">
+                    <el-table-column prop="mark" label="标准分类" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                        <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="standName" label="标准分类" align="center">
+                    <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                        <a @click="showStandDetails(scope.row)">{{ scope.row.dutyEngineer }}</a>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="standName" label="标准责任工程师" align="center">
+                    <el-table-column label="操作" align="center" v-if="isShowBtn">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                        <el-button
+                          size="mini"
+                          type="danger"
+                          @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>
                       </template>
                     </el-table-column>
                   </el-table>
                   <pagination
                     style="position: static;"
-                    :page="pageConfig.current4"
+                    :page="pageConfig.oldStandPage"
+                    :pageSize="pageConfig.oldStandPageSize"
                     :total="pageConfig.count4"
+                    autoSize
                     @pageChange="page => handlePageChange('oldStand', page)"
                     @pageSizeChange="pageSize => handlePageSizeChange('oldStand', pageSize)"></pagination>
                 </div>
@@ -268,20 +302,21 @@
                     <el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
                     <div class="table-wrap">
                       <el-table
-                        :data="newItems"
+                        :data="newPolicy"
                         :height="tableHeight"
                         border
                         :resizable="false"
+                        v-loading="loading.newPolicy"
                         :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                       >
-                        <el-table-column prop="standNum" label="政策编号" align="center">
+                        <el-table-column prop="policyId" label="政策编号" align="center">
                           <template slot-scope="scope">
-                            <a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
+                            <a @click="showStandDetails(scope.row)">{{ scope.row.policyId }}</a>
                           </template>
                         </el-table-column>
-                        <el-table-column prop="standName" label="政策名称" align="center">
+                        <el-table-column prop="policyName" label="政策名称" align="center">
                           <template slot-scope="scope">
-                            <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                            <a @click="showStandDetails(scope.row)">{{ scope.row.policyName }}</a>
                           </template>
                         </el-table-column>
                         <el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>
@@ -289,33 +324,44 @@
                             {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
                           </template>
                         </el-table-column>
+                        <el-table-column label="操作" align="center" width="150" v-if="isShowBtn">
+                          <template slot-scope="scope">
+                            <el-button
+                              size="mini"
+                              type="danger"
+                              @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>
+                          </template>
+                        </el-table-column>
                       </el-table>
                     </div>
                     <pagination
                       style="position: static;"
-                      :page="pageConfig.current1"
+                      :page="pageConfig.newPolicyPage"
-                      :total="pageConfig.count1"
+                      :pageSize="pageConfig.newPolicyPageSize"
-                      @pageChange="page => handlePageChange('newModel', page)"
+                      :total="pageConfig.count5"
-                      @pageSizeChange="pageSize => handlePageSizeChange('newModel', pageSize)"></pagination>
+                      autoSize
+                      @pageChange="page => handlePageChange('newPolicy', page)"
+                      @pageSizeChange="pageSize => handlePageSizeChange('newPolicy', pageSize)"></pagination>
                   </div>
                   <div class="content-group">
                     <el-divider content-position="left" class="dynamic-child-title">在产车实施日期预警</el-divider>
                     <div class="table-wrap">
                       <el-table
-                        :data="newItems"
+                        :data="oldPolicy"
                         :height="tableHeight"
                         border
                         :resizable="false"
+                        v-loading="loading.oldPolicy"
                         :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                       >
-                        <el-table-column prop="standNum" label="政策编号" align="center">
+                        <el-table-column prop="policyId" label="政策编号" align="center">
                           <template slot-scope="scope">
-                            <a @click="showStandDetails(scope.row)">{{ scope.row.standNum }}</a>
+                            <a @click="showStandDetails(scope.row)">{{ scope.row.policyId }}</a>
                           </template>
                         </el-table-column>
-                        <el-table-column prop="standName" label="政策名称" align="center">
+                        <el-table-column prop="policyName" label="政策名称" align="center">
                           <template slot-scope="scope">
-                            <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                            <a @click="showStandDetails(scope.row)">{{ scope.row.policyName }}</a>
                           </template>
                         </el-table-column>
                         <el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>
@@ -323,14 +369,24 @@
                             {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
                           </template>
                         </el-table-column>
+                        <el-table-column label="操作" align="center" width="150"  v-if="isShowBtn">
+                          <template slot-scope="scope">
+                            <el-button
+                              size="mini"
+                              type="danger"
+                              @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>
+                          </template>
+                        </el-table-column>
                       </el-table>
                     </div>
                     <pagination
                       style="position: static;"
-                      :page="pageConfig.current1"
+                      :page="pageConfig.oldPolicyPage"
-                      :total="pageConfig.count1"
+                      :pangSize="pageConfig.oldPolicyPageSize"
-                      @pageChange="page => handlePageChange('newModel', page)"
+                      :total="pageConfig.count6"
-                      @pageSizeChange="pageSize => handlePageSizeChange('newModel', pageSize)"></pagination>
+                      autoSize
+                      @pageChange="page => handlePageChange('oldPolicy', page)"
+                      @pageSizeChange="pageSize => handlePageSizeChange('oldPolicy', pageSize)"></pagination>
                   </div>
                 </div>
               </div>
@@ -350,6 +406,7 @@ export default {
   name: "standardWarning",
   data() {
     return {
+      isShowBtn: true,
       activeName: "STANDARD",   //tab 默认选中值
       // 头部搜索框
       dynamic: {
@@ -358,32 +415,53 @@ export default {
       height: null,
       // 新车型实施日期预警
       newItems: [],
+      //政策新车型实施日期预警
+      newPolicy: [],
       // 新车型条款预警
       newStand: [],
       // 在产车实施日期预警
       oldItems: [],
       // 在产车条款预警
       oldStand: [],
+      //政策在产车实施日期预警
+      oldPolicy: [],
       tableHeight: 0,
       pageConfig: {
-        current1: 1,
+        newItemsPage: 1,
-        pageSize1: 10,
+        newItemsPageSize: 10,
         count1: 0,
-        current2: 1,
+        newStandPage: 1,
-        pageSize2: 10,
+        newStandPageSize: 10,
         count2: 0,
-        current3: 1,
+        oldItemsPage: 1,
-        pageSize3: 10,
+        oldItemsPageSize: 10,
         count3: 0,
-        current4: 1,
+        oldStandPage: 1,
-        pageSize4: 10,
+        oldStandPageSize: 10,
-        count4: 0
+        count4: 0,
-      }
+        newPolicyPage: 1,
+        newPolicyPageSize: 10,
+        count5: 0,
+        oldPolicyPage: 1,
+        oldPolicyPageSize: 10,
+        count6: 0,
+      },
+      loading: {
+        newItems: false,
+        oldItems: false,
+        newStand: false,
+        oldStand: false,
+        newPolicy: false,
+        oldPolicy: false,
+      },
+      // 记录当前分页器是哪个预警信息触发
+      field: ''
     };
   },
   methods: {
-    // 获取数据 (type用于区别分页器切换)
+    // 获取标准预警数据 (type用于区别分页器切换)
     getEarlyDate() {
+      this.loading[this.field] = true
       this.$http.get('sys/EarlyWarning/StandWarning', {
         applyType: '',
         ...this.pageConfig
@@ -391,17 +469,56 @@ export default {
         _this: this
       },res => {
         const result = res.data[0]
-        Object.keys(result).forEach((tableName, index) => {
+        for (const field in result) {
-          const tableRes = result[tableName]
+          this[field] = result[field].records
-          const count = `count${index + 1}`
+          // this.newItems = result.newItems.records
-          this.pageConfig[count] = tableRes.total
+          switch (field) {
-          this[tableName] = tableRes.records
+            case 'newItems':
-        })
+              this.pageConfig.count1 = result.newItems.total
+              break
+            case 'oldItems':
+              this.pageConfig.count2 = result.oldItems.total
+              break
+            case 'newStand':
+              this.pageConfig.count3 = result.newStand.total
+              break
+            case 'oldStand':
+              this.pageConfig.count4 = result.oldStand.total
+              break
+          }
+        }
+        for (const loading in this.loading) { this.loading[loading] = false }
         }, e => {
       });
     },
+    //获取政策预警数据(type用于区别分页器切换)
+    getPolicyDate() {
+      this.loading[this.field] = true
+      this.$http.get('sys/EarlyWarning/PolicyWarning', {
+        applyType: '',
+        ...this.pageConfig
+      },{
+          _this: this
+      }, res => {
+         const policys = res.data[0]
+         for(const field in policys) {
+         this[field] = policys[field].records
+           switch(field) {
+           case 'newPolicy':
+             this.pageConfig.count5 = policys.newPolicy.total
+               break
+             case 'oldPolicy':
+               this.pageConfig.count6 = policys.oldPolicy.total
+               break
+           }
+         }
+         for(const loading in this.loading) {this.loading[loading] = false}
+      }, e => {
+      });
+    },
     // 切换tab
     handleClick(tab, event) {
+      this.getPolicyDate();
       switch (tab.name) {
         case "POLICY":
           const computedHeight = () => {
@@ -418,7 +535,29 @@ export default {
     },
     //查找适用车型
     searchBtnClick() {
-      console.log("查找适用车型");
+        this.$http.get('sys/EarlyWarning/StandWarning', {
+          ...this.pageConfig,
+          applyType: this.dynamic.keyword
+        },{
+           _this: this,
+        }, res=> {
+          const result = res.data[0]
+          for(const type in result) {
+            this[type] = result[type].records
+          }
+          this.newItemsPage = 1
+          this.oldItemsPage = 1
+          this.newStandPage = 1
+          this.oldStandPage = 1
+          this.newPolicyPage = 1
+          this.oldPolicypage = 1
+        }, e => {
+          console.log(e)
+        })
+    },
+    //取消预警
+    cancelWarning (index, row) {
+      console.log(index, row)
     },
     showStandDetails(item) {
       let getStandId = item.sarId;
@@ -515,44 +654,38 @@ export default {
       switch (field) {
         // 新车型实施日期预警
         case 'newItems':
-          this.pageConfig.current1 = page
+          this.pageConfig.newItemsPage = page
           break
         // 新车型条款预警
         case 'newStand':
-          this.pageConfig.current2 = page
+          this.pageConfig.newStandPage = page
           break
         // 在产车实施日期预警
         case 'oldItems':
-          this.pageConfig.current3 = page
+          this.pageConfig.oldItemsPage = page
           break
         // 在产车条款预警
         case 'oldStand':
-          this.pageConfig.current4 = page
+          this.pageConfig.oldStandPage = page
+          break
+        // 政策新车型实施日期预警
+        case 'newPolicy':
+          this.pageConfig.newPolicyPage = page
+          break
+        //政策 在产车实施日期预警
+        case 'oldPolicy':
+          this.pageConfig.oldPolicyPage = page
           break
       }
-      this.getEarlyDate()
+      this.activeName === 'STANDARD' ? this.getEarlyDate() : this.getPolicyDate()
+      this.field = field
     },
     //分页每页显示数改变后方法
     handlePageSizeChange(field, pageSize) {
-      switch (field) {
+      const _pageSize = field + 'PageSize'
-        // 新车型实施日期预警
+      this.pageConfig[_pageSize] = pageSize
-        case 'newItems':
+      this.activeName === 'STANDARD' ? this.getEarlyDate() : this.getPolicyDate()
-          this.pageConfig.pageSize1 = pageSize
+      this.field = field
-          break
-        // 新车型条款预警
-        case 'newStand':
-          this.pageConfig.pageSize2 = pageSize
-          break
-        // 在产车实施日期预警
-        case 'oldItems':
-          this.pageConfig.pageSize3 = pageSize
-          break
-        // 在产车条款预警
-        case 'oldStand':
-          this.pageConfig.pageSize4 = pageSize
-          break
-      }
-      this.getEarlyDate()
     },
     ...mapMutations(["setDetailMap"])
   },
@@ -576,7 +709,10 @@ export default {
     };
     this.queryNewTypeByPage();
     this.queryProductionVehicleByPage();
+    // 四个预警同时查询,loading全部打开
+    for (const loading in this.loading) { this.loading[loading] = true }
     this.getEarlyDate();
+
   }
 };
 </script>

src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue

@@ -0,0 +1,274 @@
+<!--事业部-->
+<template>
+  <div id="business-division">
+    <div class="search-area">
+      <div class="content-top">
+        <el-form :modal="nonConformitySearch" inline class="label-input-form">
+          <el-form-item label="编号/名称" class="search-item">
+            <el-input v-model="nonConformitySearch.standNumOrName"
+                      placeholder="请输入"
+                      clearable
+                      :maxlength="100"></el-input>
+          </el-form-item>
+          <el-form-item label="产品类型" class="search-item">
+            <el-select filterable clearable v-model="nonConformitySearch.productName">
+              <el-option v-for="item1 in productNameList"
+                         :key="item1.value"
+                         :label="item1.label"
+                         :value="item1.value"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="责任部门" class="search-item">
+            <el-input v-model="nonConformitySearch.responseUnit" v-show="false" />
+            <el-popover
+              placement="bottom"
+              popper-class="user-dept-popper"
+              trigger="click"
+              :value="false"
+            >
+              <el-input
+                slot="reference"
+                v-model="nonConformitySearch.responseUnitShow"
+                placeholder="根据责任部门查找"
+                readonly
+                clearable
+                id="searchResp"
+              />
+              <div class="api">
+                <laws-tree
+                  :zNodes="zNodesSItem"
+                  treeDivId="zNodesSItemSearch"
+                  deptSelect
+                  showRMenu
+                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
+                  class="ztree" style="width: 200px;height: 400px;overflow: auto">
+                </laws-tree>
+              </div>
+            </el-popover>
+          </el-form-item>
+          <el-form-item class="search-item btn-box">
+            <el-button
+              type="primary"
+              class="common-button-primary"
+              size="mini"
+              @click="getTableByPage('')">
+              查询
+            </el-button>
+          </el-form-item>
+          <el-form-item class="search-item btn-box">
+            <el-button
+              class="common-button-default"
+              size="mini"
+              @click="clearAllSearch">清空</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <div class="content-center">
+      <el-button
+        class="common-button-primary"
+        type="primary"
+        size="mini"
+        title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
+      ><i class="iconfont">&#xe6e9;</i>导出</el-button>
+      <el-button
+        @click="userCloAll"
+        class="common-button-primary"
+        type="primary"
+        size="mini"
+      ><i class="iconfont">&#xe61b;</i>批量关闭</el-button>
+      <el-button
+        class="common-button-primary btnright"
+        size="mini"
+        type="primary"
+        @click="historyClick"
+      >历史数据</el-button>
+    </div>
+    <div class="container">
+      <loading :loading="loading">数据获取中....</loading>
+      <el-table
+        :data="causeList"
+        tooltip-effect="dark"
+        style="width: 100%;"
+        height="tableHeight"
+        border
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          fixed="left"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="standNum"
+          fixed="left"
+          width="180"
+          label="标准编号">
+          <template slot-scope="scope">
+            <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standNum }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="standName"
+          fixed="left"
+          width="180"
+          label="标准名称">
+          <template slot-scope="scope">
+            <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="productNameShow"
+          width="180"
+          label="产品线">
+        </el-table-column>
+        <el-table-column
+          prop="productNameShow"
+          width="180"
+          label="项目名称">
+        </el-table-column>
+        <el-table-column
+          prop="productNameShow"
+          width="180"
+          label="当前节点">
+        </el-table-column>
+        <el-table-column
+          prop="responseUnitShow"
+          width="180"
+          label="责任部门">
+        </el-table-column>
+        <el-table-column
+          prop="responseEnginShow"
+          width="150"
+          label="责任工程师">
+        </el-table-column>
+        <el-table-column
+          prop="responseEnginShow"
+          width="150"
+          label="认证工程师">
+        </el-table-column>
+        <el-table-column
+          prop="responseEnginShow"
+          width="150"
+          label="质量工程师">
+        </el-table-column>
+        <el-table-column
+          prop="planCloseTime"
+          width="150"
+          sortable="custom"
+          label="要求关闭时间">
+          <template slot-scope="scope">{{(scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11): '')}}</template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="50" fixed="right">
+          <template slot-scope="scope">
+            <div @click.stop style="display: inline-block">
+              <el-dropdown trigger="click" @command="handleCommand">
+                <i class="iconfont">&#xe61e;</i>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'R4FTCUQSXFUZPUSN3W63'">查看</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'G7GL8ZAZ5EYK6LRXW5MT'">编辑</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '关闭']" v-btn-permission="'Q8GPXE8L36KN2XVMZ6Y4'">关闭</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="footer">
+        <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "businessDivision",
+  data() {
+    return {
+      loading: false,
+      causeList: [], //事业部数据
+      nonConformitySearch: {
+        standNumOrName: '', // 编号/名称
+        productName: '', // 产品类型
+        responseUnit: '' // 责任部门
+      },
+      // 产品类型下拉列表数据
+      productNameList: [],
+      zNodesSItem: [],//责任部门
+    }
+  },
+  methods: {
+    //点击批量关闭按钮事件
+    userCloAll() {
+      console.log('至少选择一条数据');
+    },
+    //点击历史数据按钮事件
+    historyClick (){
+       this.$router.push({
+         name:'HistoricalData'
+       })
+    },
+    // 清空 查询条件
+    clearAllSearch (search = true) {
+      this.nonConformitySearch = {
+        standNumOrName: '',
+        productName: '',
+        responseUnit: ''
+      }
+    },
+    // 更多
+    handleCommand (command) {
+      switch (command[1]) {
+        case '查看':
+          this.showUser(command[0])
+          break
+        case '编辑':
+          this.openEditModal(command[0])
+          break
+        case '关闭':
+          this.userClo(command[0])
+          break
+      }
+    },
+    //点击查看按钮事件
+    showUser(row) {
+      console.log(row)
+    },
+    //点击编辑按钮事件
+    openEditModal(item) {
+      console.log(item)
+    },
+    //点击关闭按钮事件
+    userClo(row) {
+      console.log(row)
+    },
+    // 分页事件
+    pageChange (page) {
+      this.pageNo = page
+      this.getTableByPage()
+    },
+    pageSizeChange (pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent
+      this.getTableByPage()
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+#business-division {
+ .content-center {
+   margin-bottom:10px
+ }
+  .btnright {
+    float: right;
+    margin-right:10px;
+  }
+  .footer {
+    margin-bottom: 430px;
+  }
+}
+</style>

src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue

@@ -0,0 +1,44 @@
+<!--重点问题项管控-->
+<template>
+<div id="key-issues">
+  <div class="non-content">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="事业部" name="cause">
+        <business-division></business-division>
+      </el-tab-pane>
+      <el-tab-pane label="产品规划部" name="product">
+       <product-department></product-department>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</div>
+</template>
+
+<script>
+import businessDivision from "@/pages/regulatoryRepository/nonConfomity/pages/businessDivision";
+import productDepartment from "@/pages/regulatoryRepository/nonConfomity/pages/productDepartment";
+
+export default {
+  name: "keyIssues",
+ components: {
+   businessDivision,
+   productDepartment,
+ },
+  data() {
+    return {
+      activeName:'cause',
+    }
+  },
+  methods: {
+    handleClick(tab, event) {
+      console.log(tab, event);
+    }
+  },
+};
+</script>
+
+<style lang="less" scoped>
+#key-issues {
+
+}
+</style>

src/pages/regulatoryRepository/nonConfomity/pages/productDepartment.vue

@@ -0,0 +1,274 @@
+<!--产品规划部-->
+<template>
+<div id="product-department">
+  <div class="search-area">
+    <div class="content-top">
+      <el-form :modal="nonConformitySearch" inline class="label-input-form">
+        <el-form-item label="编号/名称" class="search-item">
+          <el-input v-model="nonConformitySearch.standNumOrName"
+                    placeholder="请输入"
+                    clearable
+                    :maxlength="100"></el-input>
+        </el-form-item>
+        <el-form-item label="产品类型" class="search-item">
+          <el-select filterable clearable v-model="nonConformitySearch.productName">
+            <el-option v-for="item1 in productNameList"
+                       :key="item1.value"
+                       :label="item1.label"
+                       :value="item1.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="责任部门" class="search-item">
+          <el-input v-model="nonConformitySearch.responseUnit" v-show="false" />
+          <el-popover
+            placement="bottom"
+            popper-class="user-dept-popper"
+            trigger="click"
+            :value="false"
+          >
+            <el-input
+              slot="reference"
+              v-model="nonConformitySearch.responseUnitShow"
+              placeholder="根据责任部门查找"
+              readonly
+              clearable
+              id="searchResp"
+            />
+            <div class="api">
+              <laws-tree
+                :zNodes="zNodesSItem"
+                treeDivId="zNodesSItemSearch"
+                deptSelect
+                showRMenu
+                @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
+                class="ztree" style="width: 200px;height: 400px;overflow: auto">
+              </laws-tree>
+            </div>
+          </el-popover>
+        </el-form-item>
+        <el-form-item class="search-item btn-box">
+          <el-button
+            type="primary"
+            class="common-button-primary"
+            size="mini"
+            @click="getTableByPage('')">
+            查询
+          </el-button>
+        </el-form-item>
+        <el-form-item class="search-item btn-box">
+          <el-button
+            class="common-button-default"
+            size="mini"
+            @click="clearAllSearch">清空</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+  <div class="content-center">
+    <el-button
+      class="common-button-primary"
+      type="primary"
+      size="mini"
+      title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
+    ><i class="iconfont">&#xe6e9;</i>导出</el-button>
+    <el-button
+      @click="userCloAll"
+      class="common-button-primary"
+      type="primary"
+      size="mini"
+    ><i class="iconfont">&#xe61b;</i>批量关闭</el-button>
+    <el-button
+      class="common-button-primary btnright"
+      size="mini"
+      type="primary"
+      @click="historyClick"
+    >历史数据</el-button>
+  </div>
+  <div class="container">
+    <loading :loading="loading">数据获取中....</loading>
+    <el-table
+      :data="causeList"
+      tooltip-effect="dark"
+      style="width: 100%;"
+      height="tableHeight"
+      border
+      :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+    >
+      <el-table-column
+        type="selection"
+        width="55"
+        fixed="left"
+        align="center">
+      </el-table-column>
+      <el-table-column
+        prop="standNum"
+        fixed="left"
+        width="180"
+        label="业务">
+        <template slot-scope="scope">
+          <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standNum }}</a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="standName"
+        fixed="left"
+        width="180"
+        label="平台">
+        <template slot-scope="scope">
+          <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="productNameShow"
+        width="180"
+        label="项目">
+      </el-table-column>
+      <el-table-column
+        prop="productNameShow"
+        width="180"
+        label="当前节点">
+      </el-table-column>
+      <el-table-column
+        prop="standName"
+        fixed="left"
+        width="180"
+        label="标准编号/政策编号">
+      </el-table-column>
+      <el-table-column
+        prop="planCloseTime"
+        width="150"
+        sortable="custom"
+        label="实施时间">
+      </el-table-column>
+      <el-table-column
+        prop="responseEnginShow"
+        width="150"
+        label="实施要求">
+      </el-table-column>
+      <el-table-column
+        prop="responseEnginShow"
+        width="150"
+        label="符合性状态">
+      </el-table-column>
+      <el-table-column
+        prop="responseUnitShow"
+        width="180"
+        label="责任部门">
+      </el-table-column>
+      <el-table-column
+        prop="responseEnginShow"
+        width="150"
+        label="责任工程师">
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="50" fixed="right">
+        <template slot-scope="scope">
+          <div @click.stop style="display: inline-block">
+            <el-dropdown trigger="click" @command="handleCommand">
+              <i class="iconfont">&#xe61e;</i>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'R4FTCUQSXFUZPUSN3W63'">查看</el-dropdown-item>
+                <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'G7GL8ZAZ5EYK6LRXW5MT'">编辑</el-dropdown-item>
+                <el-dropdown-item :command="[scope.row, '关闭']" v-btn-permission="'Q8GPXE8L36KN2XVMZ6Y4'">关闭</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="footer">
+      <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+    </div>
+  </div>
+</div>
+</template>
+
+<script>
+export default {
+  name: "productDepartment",
+  data() {
+    return {
+      loading: false,
+      causeList: [], //事业部数据
+      nonConformitySearch: {
+        standNumOrName: '', // 编号/名称
+        productName: '', // 产品类型
+        responseUnit: '' // 责任部门
+      },
+      // 产品类型下拉列表数据
+      productNameList: [],
+      zNodesSItem: [],//责任部门
+    }
+  },
+  methods: {
+    //点击批量关闭按钮事件
+    userCloAll() {
+      console.log('至少选择一条数据');
+    },
+    //点击历史数据按钮事件
+    historyClick (){
+      this.$router.push({
+        name:'HistoricalData'
+      })
+    },
+    // 清空 查询条件
+    clearAllSearch (search = true) {
+      this.nonConformitySearch = {
+        standNumOrName: '',
+        productName: '',
+        responseUnit: ''
+      }
+    },
+    // 更多
+    handleCommand (command) {
+      switch (command[1]) {
+        case '查看':
+          this.showUser(command[0])
+          break
+        case '编辑':
+          this.openEditModal(command[0])
+          break
+        case '关闭':
+          this.userClo(command[0])
+          break
+      }
+    },
+    //点击查看按钮事件
+    showUser(row) {
+      console.log(row)
+    },
+    //点击编辑按钮事件
+    openEditModal(item) {
+      console.log(item)
+    },
+    //点击关闭按钮事件
+    userClo(row) {
+      console.log(row)
+    },
+    // 分页事件
+    pageChange (page) {
+      this.pageNo = page
+      this.getTableByPage()
+    },
+    pageSizeChange (pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent
+      this.getTableByPage()
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+#product-department {
+  .content-center {
+    margin-bottom:10px
+  }
+  .btnright {
+    float: right;
+    margin-right:10px;
+  }
+  .footer {
+    margin-bottom: 430px;
+  }
+}
+</style>

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -0,0 +1,287 @@
+<!--未符合项整改数据库-->
+<template>
+  <div id="rectification-dataBase">
+    <div class="search-area">
+      <div class="content-top">
+        <el-form :modal="nonConformitySearch" inline class="label-input-form">
+          <el-form-item label="标准号/标准名称" class="search-item">
+            <el-input v-model="nonConformitySearch.standNumOrName"
+                      placeholder="请输入"
+                      clearable
+                      :maxlength="100"></el-input>
+          </el-form-item>
+          <el-form-item label="项目名称" class="search-item">
+            <el-select filterable clearable v-model="nonConformitySearch.productName">
+              <el-option v-for="item1 in productNameList"
+                         :key="item1.value"
+                         :label="item1.label"
+                         :value="item1.value"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="责任部门" class="search-item">
+            <el-input v-model="nonConformitySearch.responseUnit" v-show="false" />
+            <el-popover
+              placement="bottom"
+              popper-class="user-dept-popper"
+              trigger="click"
+              :value="false"
+            >
+              <el-input
+                slot="reference"
+                v-model="nonConformitySearch.responseUnitShow"
+                placeholder="根据责任部门查找"
+                readonly
+                clearable
+                id="searchResp"
+              />
+              <div class="api">
+                <laws-tree
+                  :zNodes="zNodesSItem"
+                  treeDivId="zNodesSItemSearch"
+                  deptSelect
+                  showRMenu
+                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
+                  class="ztree" style="width: 200px;height: 400px;overflow: auto">
+                </laws-tree>
+              </div>
+            </el-popover>
+          </el-form-item>
+          <el-form-item class="search-item btn-box">
+            <el-button
+              type="primary"
+              class="common-button-primary"
+              size="mini"
+              @click="getTableByPage('')">
+              查询
+            </el-button>
+          </el-form-item>
+          <el-form-item class="search-item btn-box">
+            <el-button
+              class="common-button-default"
+              size="mini"
+              @click="clearAllSearch">
+              清空
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <div class="content-center">
+      <el-button
+        class="common-button-primary"
+        type="primary"
+        size="mini"
+        title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
+      ><i class="iconfont">&#xe6e9;</i>导出</el-button>
+      <el-button
+        class="common-button-primary"
+        size="mini"
+        type="primary"
+        @click="historyClick"
+      >历史数据</el-button>
+    </div>
+    <div class="container">
+      <loading :loading="loading">数据获取中....</loading>
+      <el-table
+        :data="nonList"
+        tooltip-effect="dark"
+        style="width: 100%;"
+       height="tableHeight"
+        border
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          fixed="left"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="standNum"
+          fixed="left"
+          width="180"
+          label="标准编号">
+          <template slot-scope="scope">
+            <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standNum }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="standName"
+          fixed="left"
+          width="180"
+          label="标准名称">
+          <template slot-scope="scope">
+            <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="standNum"
+          width="180"
+          label="条款号">
+        </el-table-column>
+        <el-table-column
+          prop="standName"
+          width="180"
+          label="条款名称">
+        </el-table-column>
+        <el-table-column
+          prop="productNameShow"
+          width="180"
+          label="产品类型">
+        </el-table-column>
+        <el-table-column
+          prop="productNameShow"
+          width="180"
+          label="产品线">
+        </el-table-column>
+        <el-table-column
+          prop="productNameShow"
+          width="180"
+          label="项目名称">
+        </el-table-column>
+        <el-table-column
+          prop="responseUnitShow"
+          width="180"
+          label="责任部门">
+        </el-table-column>
+        <el-table-column
+          prop="responseEnginShow"
+          width="150"
+          label="责任工程师">
+        </el-table-column>
+        <el-table-column
+          prop="responseEnginShow"
+          width="150"
+          label="认证工程师">
+        </el-table-column>
+        <el-table-column
+          prop="responseEnginShow"
+          width="150"
+          label="质量工程师">
+        </el-table-column>
+        <el-table-column
+          prop="planCloseTime"
+          width="150"
+          sortable="custom"
+          label="计划关闭时间">
+          <template slot-scope="scope">{{(scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11): '')}}</template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="50" fixed="right">
+          <template slot-scope="scope">
+            <div @click.stop style="display: inline-block">
+              <el-dropdown trigger="click" @command="handleCommand">
+                <i class="iconfont">&#xe61e;</i>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'R4FTCUQSXFUZPUSN3W63'">查看</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'G7GL8ZAZ5EYK6LRXW5MT'">编辑</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '关闭']" v-btn-permission="'Q8GPXE8L36KN2XVMZ6Y4'">关闭</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="footer">
+        <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "rectificationDatabase",
+  data () {
+    return {
+      loading: false,
+      tableHeight: null, //table高度
+      nonList:[], //未符合项表格数据
+      // 总数
+      total: 0,
+      // 当前页数
+      pageNo: 1,
+      nonConformitySearch: {
+        standNumOrName: '', // 标准号/名称
+        productName: '', // 项目名称
+        responseUnit: '' // 责任部门
+      },
+      // 项目名称下拉列表数据
+      productNameList: [],
+      // 责任部门
+      zNodesSItem: [],
+    }
+  },
+  methods: {
+    // 查询未符合项table列表
+    getTableByPage () {
+       console.log('查询符合项')
+    },
+    // 点击历史记录按钮事件
+    historyClick () {
+      this.$router.push({
+        name: 'HistoricalData'
+      })
+    },
+    // 清空 查询条件
+    clearAllSearch (search = true) {
+      this.nonConformitySearch = {
+        standNumOrName: '',
+        productName: '',
+        responseUnit: ''
+      }
+    },
+    // 更多
+    handleCommand (command) {
+      switch (command[1]) {
+        case '查看':
+          this.showUser(command[0])
+          break
+        case '编辑':
+          this.openEditModal(command[0])
+          break
+        case '关闭':
+          this.userClo(command[0])
+          break
+      }
+    },
+    //点击查看按钮事件
+    showUser(row) {
+        console.log(row)
+    },
+  //点击编辑按钮事件
+    openEditModal(item) {
+      console.log(item)
+    },
+    //点击关闭按钮事件
+    userClo(row) {
+      console.log(row)
+    },
+    // 分页事件
+    pageChange (page) {
+      this.pageNo = page
+      this.getTableByPage()
+    },
+    pageSizeChange (pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent
+      this.getTableByPage()
+    },
+  },
+  mounted () {},
+};
+</script>
+
+<style lang="less" scoped>
+#rectification-dataBase {
+  //margin: 10px;
+  .content-center{
+    margin:10px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  .footer {
+    margin-bottom: 430px;
+  }
+}
+</style>

src/router/index.js

@@ -683,7 +683,7 @@ const routes = [
           import('@/pages/regulatoryRepository/nonConfomity'),
         meta: {
           requireAuth: true,
-          title: '未符合项跟踪',
+          title: '未符合项整改',
           menuId: 'HQSK8WWPDJG7R5F53LTK'
         }
       },