Merge branch 'sdp-v1'

src/api/interface.js

@@ -29,3 +29,6 @@ export const querySupervisionNotifyManagement =
 // 架构督查- 督查问题整改列表
 export const querySupervisionProblem =
   EADC_ARRCHITECTURE + '/rectifyReform/selectRectifyReform'
+
+// 概设评审基础管理
+export const queryConceptualBaseManagement = EADC_ARRCHITECTURE + '/int-info/'

src/router/index.js

@@ -290,6 +290,16 @@ const routes = [
         name: 'supervisionProblemEdit',
         component: () => import('@/views/supervisionProblemEdit/index.vue'),
       },
+      {
+        path: '/main/architectureFollowExamine', // 架构督查架构遵从检查
+        name: 'architectureFollowExamine',
+        component: () => import('@/views/architectureFollowExamine/index.vue'),
+      },
+      {
+        path: '/main/artPolicyExamine', // 架构督查-技术政策审查
+        name: 'artPolicyExamine',
+        component: () => import('@/views/artPolicyExamine/index.vue'),
+      },
     ],
   },
 ]

src/views/Main/menu.js

@@ -214,11 +214,11 @@ export const menuOptions = [
           },
           {
             name: '架构遵从检查',
-            path: '',
+            path: '/main/architectureFollowExamine',
           },
           {
             name: '技术政策审查',
-            path: '',
+            path: '/main/artPolicyExamine',
           },
         ],
       },

src/views/architectureFollowExamine/index.vue

+<!--
+ * @Description: 架构督查-架构遵从检查
+ * @Version: 2.0
+ * @Autor: pan
+ * @Date: 2024-03-26 18:27:18
+ * @LastEditors: pan
+ * @LastEditTime: 2024-03-26 18:28:54
+-->
+<template>
+  <div></div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {}
+  },
+  components: {},
+  mounted() {},
+  methods: {},
+}
+</script>
+<style scoped lang="scss"></style>

src/views/artPolicyExamine/index.vue

+<!--
+ * @Description: 架构督查-技术政策审查
+ * @Version: 2.0
+ * @Autor: pan
+ * @Date: 2024-03-26 18:27:18
+ * @LastEditors: pan
+ * @LastEditTime: 2024-03-26 18:29:56
+-->
+<template>
+  <div></div>
+</template>
+
+<script>
+export default {
+  name: 'artPolicyExamine',
+  data() {
+    return {}
+  },
+  components: {},
+  mounted() {},
+  methods: {},
+}
+</script>
+<style scoped lang="scss"></style>

src/views/conceptualBaseManagement/index.vue

 <!--
- * @Description: integration-info-controller
+ * @Description: 概设评审基础管理 integration-info-controller
  * @Version: 2.0
  * @Autor: pan
  * @Date: 2024-03-21 20:58:31
  * @LastEditors: pan
- * @LastEditTime: 2024-03-22 16:48:05
+ * @LastEditTime: 2024-03-26 17:31:29
 -->
 <template>
   <div class="searchTable">
@@ -68,7 +68,7 @@ import ListPage from '@/components/ListPage.vue'
 import SearchForm from '@/components/SearchForm.vue'
 import TableConfig from '@/components/TableConfig.vue'
 
-import { queryDemandManagement } from '@/api/interface'
+import { queryConceptualBaseManagement } from '@/api/interface'
 import { editNeedInfo } from '@/api'
 import { buildType, approvalStatusOptions } from '@/utils/dictionary'
 export default {
@@ -76,7 +76,7 @@ export default {
   data() {
     return {
       query: {
-        url: queryDemandManagement,
+        url: queryConceptualBaseManagement,
         method: 'post',
         queryParam: {},
       },

src/views/supervisionNotifyManagement/index.vue

@@ -4,7 +4,7 @@
  * @Autor: pan
  * @Date: 2024-03-26 10:53:48
  * @LastEditors: pan
- * @LastEditTime: 2024-03-26 16:34:20
+ * @LastEditTime: 2024-03-26 16:56:57
 -->
 <template>
   <div class="searchTable">
@@ -17,7 +17,6 @@
       <template #tableWrap>
         <table-config
           ref="searchTable"
-          @selection-change="selectionChange"
           :query="query"
           :columns="columns"
           id-key="elementId"
@@ -152,10 +151,6 @@ export default {
   },
   created() {},
   methods: {
-    // 表格勾选的数据
-    selectionChange(data) {
-      this.selectRows = data
-    },
     querySearch(data) {
       this.query.queryParam = {
         ...this.query.queryParam,
@@ -163,11 +158,6 @@ export default {
       }
       this.$refs.searchTable.queryData()
     },
-    fnAdd() {
-      this.rowData = {}
-      this.dialogTitle = '新增批次计划'
-      this.visible = true
-    },
     /**
      * @description: 操作按钮
      * @param {Object} row 当前操作行数据

src/views/supervisionProblemEdit/index.vue

@@ -4,7 +4,7 @@
  * @Autor: pan
  * @Date: 2024-03-26 10:53:48
  * @LastEditors: pan
- * @LastEditTime: 2024-03-26 16:42:10
+ * @LastEditTime: 2024-03-26 17:27:33
 -->
 <template>
   <div class="searchTable">
@@ -86,19 +86,27 @@ export default {
     columns() {
       return [
         { label: '序号', type: 'index', width: '80px' },
-        { label: '项目名称', prop: 'prjName' },
-        { label: '归属部门', prop: 'buildOrg', width: '300px' },
+        { label: '项目名称', prop: 'prjName', width: '200px' },
         {
           label: '承建单位',
           width: '160px',
-          prop: 'reportTime',
+          prop: 'buildOrg',
         },
-        { label: '问题类型', width: '100px', prop: 'version' },
-        { label: '问题描述', prop: 'opinion' },
+        { label: '督查名称', width: '200px', prop: 'supervName' },
+        { label: '项目总评价', prop: 'prjOpinion', width: '200px' },
+        { label: '项目总评分', prop: 'prjScore', width: '120px' },
+
+        { label: '指标名称', prop: 'indexName', width: '120px' },
+        { label: '指标评价', prop: 'indexOpinion' },
+        { label: '指标评分', prop: 'score' },
+        { label: '整改日期', prop: 'createTime', width: '120px' },
+        { label: '整改情况', prop: 'state' },
+        { label: '是否典型问题', prop: 'typical' },
+        { label: '问题等级', prop: 'level' },
         {
           label: '操作',
           type: 'operation',
-          width: '520px',
+          width: '380px',
           actionButtons: [
             {
               title: '编辑',
@@ -115,20 +123,6 @@ export default {
               icon: 'el-icon-view',
             },
             {
-              title: '提交',
-              size: 'mini',
-              icon: 'el-icon-circle-check',
-              type: 'primary',
-              plain: true,
-            },
-            {
-              title: '审批',
-              size: 'mini',
-              icon: 'el-icon-s-check',
-              type: 'primary',
-              plain: true,
-            },
-            {
               title: '发布',
               size: 'mini',
               icon: 'el-icon-s-check',