111

src/components/layout/LayoutHeader.vue

@@ -136,16 +136,16 @@ export default {
   },
   created () {
     this.userInfo = JSON.parse(window.sessionStorage.getItem('user'))
-    if (this.userInfo.projType && this.userInfo.type === '3') {
-      this.isKeyPoint = (this.userInfo.projType == '2' ? true : false)
+    if (this.userInfo.systemType && this.userInfo.type === '3') {
+      this.isKeyPoint = (this.userInfo.systemType == '2' ? true : false)
       this.systemTitle = process.env.VUE_APP_SYSTEM_TITLE
     } else
       this.systemTitle = process.env.VUE_APP_SYSTEM_TITLE
   },
   computed: {
-    projType: {
+    systemType: {
       get () {
-        return this.$store.state.app.projType
+        return this.$store.state.app.systemType
       },
       set () {
       }
@@ -171,14 +171,14 @@ export default {
     toUpdatePwd () {
       this.visibleEdit = true
     },
-    switchType (projType) {
-      if (this.$store.state.app.projType != projType) {
-        this.$changeProjType(projType)
+    switchType (systemType) {
+      if (this.$store.state.app.systemType != systemType) {
+        this.$changeSystemType(systemType)
       }
     }
   },
   watch: {
-    projType: {
+    systemType: {
       handler (value) {
         if (value) {
           this.isKeyPoint = (value == '2' ? true : false)

src/components/layout/LayoutSide.vue

@@ -42,9 +42,9 @@ export default {
       set () {
       }
     },
-    projType: {
+    systemType: {
       get () {
-        return this.$store.state.app.projType
+        return this.$store.state.app.systemType
       },
       set () {
       }
@@ -78,7 +78,7 @@ export default {
     },
   },
   watch: {
-    projType: {
+    systemType: {
       handler (value) {
         if (value) {
           this.menuList = JSON.parse(window.sessionStorage.getItem('menuList'))

src/main.js

 // @ts-nocheck
 import Vue from 'vue'
 import App from './App.vue'
-import router, { changeProjType } from './router'
+import router, { changeSystemType } from './router'
 import store from './store'
 // import 'ant-design-vue/dist/antd.less'
 import '../static/css/antd.css'
@@ -34,7 +34,7 @@ Vue.prototype.$ToDoExcel = ToDoExcel;
 // 系统配置
 // 云南省卫生健康科技项目管理系统
 Vue.prototype.$defaultLength = 5
-Vue.prototype.$changeProjType = changeProjType
+Vue.prototype.$changeSystemType = changeSystemType
 
 
 // 定义全局时间戳过滤器

src/router/index.js

@@ -309,12 +309,12 @@ export function resetRouter () {
   router.matcher = newRouter.matcher
 }
 
-export function changeProjType (type) {
+export function changeSystemType (type) {
   new Promise(async (resolve, reject) => {
     try {
       this.$store.commit('app/clearStore')
       setType(type + '')
-      this.$store.commit('app/setProjType', type)
+      this.$store.commit('app/setsystemType', type)
       let menuList = JSON.parse(window.sessionStorage.getItem('menuList'))
       this.$store.commit('app/initStore', [menuList[0].id])
       this.$router.push('/')
@@ -340,7 +340,7 @@ router.beforeEach(async (to, from, next) => {
         const hasUser = JSON.parse(window.sessionStorage.getItem('user'))
         const hasMenu = JSON.parse(window.sessionStorage.getItem('menuList'))
         if (hasUser && hasMenu) {
-          if (hasUser.type === '3' && !!!hasUser.projType && hasUser.roles != '4') {
+          if (hasUser.type === '3' && !!!hasUser.systemType && hasUser.roles != '4') {
             if (to.path === '/sys') {
               next()
               NProgress.done()

src/store/modules/app.js

@@ -9,7 +9,7 @@ const state = {
     tabsArray: [],
     tabsActive: '',
     cachedViews: [],
-    projType: null,
+    systemType: null,
 }
 const mutations = {
     setTabsActive: (state, payload) => {
@@ -18,8 +18,8 @@ const mutations = {
     setTabsArray: (state, payload) => {
         state.tabsArray = payload
     },
-    setProjType: (state, payload) => {
-        state.projType = payload
+    setsystemType: (state, payload) => {
+        state.systemType = payload
     },
     addTabs: (state, payload) => {
         if (state.tabsArray.some(v => v.key === payload.key)) {
@@ -142,7 +142,7 @@ const mutations = {
         this.commit('app/setTabsArray', [])
         this.commit('app/setTabsActive', '')
         this.commit('app/setCachedViews', [])
-        this.commit('app/setProjType', null)
+        this.commit('app/setsystemType', null)
     },
 }
 

src/views/assign/components/assignDetail.vue

@@ -98,7 +98,7 @@ export default {
   data () {
     return {
       form: this.$form.createForm(this, { name: 'assign_search' }),
-      searchForm: { projName: null, groupId: "", assignYear: null, appUnitName: null, appPersonName: null, personName: null, auditState: "", projType: getType() },
+      searchForm: { projName: null, groupId: "", assignYear: null, appUnitName: null, appPersonName: null, personName: null, auditState: "", systemType: getType() },
       tableData: [],
       columns: [
         { title: "项目名称", scopedSlots: { customRender: 'projName' }, ellipsis: true, width: 300, },
@@ -137,7 +137,7 @@ export default {
   methods: {
     moment,
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1 }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, systemType: getType(), timeType: 1 }).then(({ data = {} }) => {
         if (data) {
           this.searchForm.assignYear = data.year
           this.getListByPage()

src/views/assign/components/expertSelect.vue

@@ -124,7 +124,7 @@ export default {
       for (let j = 0; j < this.expertSelectKeys.length; j++) {
         this.expertSelectedRowKeys.push(this.expertSelectKeys[j].key)
       }
-      let pars = { type: '1', projects: this.projSelectedRowKeys, experts: this.expertSelectedRowKeys, projType: getType() }
+      let pars = { type: '1', projects: this.projSelectedRowKeys, experts: this.expertSelectedRowKeys, systemType: getType() }
       this.$api.projectAssign.assignProject(pars).then(({ data = {} }) => {
         if (data) {
           this.$message.success('分配成功！')

src/views/assign/components/groupExpertSelect.vue

@@ -127,7 +127,7 @@ export default {
       for (let j = 0; j < this.expertSelectKeys.length; j++) {
         this.expertSelectedRowKeys.push(this.expertSelectKeys[j].key)
       }
-      let pars = { projType: getType(), groupIds: this.projGroupSelectedRowKeys, expertIds: this.expertSelectedRowKeys }
+      let pars = { systemType: getType(), groupIds: this.projGroupSelectedRowKeys, expertIds: this.expertSelectedRowKeys }
       this.$api.projectAssign.assignProjectGroup(pars).then(({ data = {} }) => {
         if (data) {
           this.$message.success('分配成功！')

src/views/assign/components/projectAssignDetail.vue

@@ -74,7 +74,7 @@ export default {
   data () {
     return {
       form: this.$form.createForm(this, { name: 'assign_search' }),
-      searchForm: { projId: null, personName: null, certId: null, sex: "", projType: getType() },
+      searchForm: { projId: null, personName: null, certId: null, sex: "", systemType: getType() },
       tableData: [],
       columns: [
         { title: "姓名", scopedSlots: { customRender: 'personName' }, align: 'center' },

src/views/audit/conclusion/index.vue

@@ -84,7 +84,7 @@ export default {
       // 选项卡
       panes: { count1: 0, count2: 0, count3: 0, count4: 0, count5: 0, },
       form: this.$form.createForm(this, { name: 'advanced_search' }),
-      searchForm: { auditType: 4, auditResult: 1, projName: null, projNo: null, appUnitName: null, appPersonName: null, projClass: null, projType: getType() },
+      searchForm: { auditType: 4, auditResult: 1, projName: null, projNo: null, appUnitName: null, appPersonName: null, projClass: null, systemType: getType() },
       activekey: '1',
       tabDate: [
         { key: "1", tab: "待审核" },
@@ -148,7 +148,7 @@ export default {
       }).catch(() => { this.loading = false })
     },
     getCount () {
-      let pars = isEmptyParams({ auditType: 4, projType: getType() });
+      let pars = isEmptyParams({ auditType: 4, systemType: getType() });
       this.$api.audit.getConclusionAuditCount(pars).then(({ data = {} }) => {
         if (data) {
           this.panes = data

src/views/audit/project/Index.vue

@@ -90,7 +90,7 @@ export default {
         knowledgeId: null,
         projClass: null,
         reportYear: null,
-        projType: getType()
+        systemType: getType()
       },
       activekey: '1',
       tabDate: [
@@ -185,7 +185,7 @@ export default {
       this.getListByPage()
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1 }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, systemType: getType(), timeType: 1 }).then(({ data = {} }) => {
         if (data) {
           this.isButten = data.disabled
           this.description = data.description
@@ -218,7 +218,7 @@ export default {
       }).catch(() => { this.loading = false })
     },
     getCount () {
-      let pars = isEmptyParams({ auditType: 1, reportYear: this.searchForm.reportYear, projType: getType() });
+      let pars = isEmptyParams({ auditType: 1, reportYear: this.searchForm.reportYear, systemType: getType() });
       this.$api.audit.getCount(pars).then(({ data = {} }) => {
         if (data) {
           this.panes = data

src/views/audit/project/audit.vue

@@ -11,8 +11,8 @@
         </div>
         <div style="width: 100%;height: calc(100% - 50px);overflow: auto;" ref="main">
           <div class="x_modal_content">
-            <project-info v-model="formData" :tabsData.sync="tabsData" v-if="projType=='1'" />
-            <project-info-Key v-model="formData" :tabsData.sync="tabsData" v-if="projType=='2'" />
+            <project-info v-model="formData" :tabsData.sync="tabsData" v-if="systemType=='1'" />
+            <project-info-Key v-model="formData" :tabsData.sync="tabsData" v-if="systemType=='2'" />
             <a-form-model ref="form" :model="auditObj" :rules="rules" class="from-table font-line-space">
               <audit-edit :auditObj.sync="auditObj" />
             </a-form-model>
@@ -136,7 +136,7 @@ export default {
         auditResult: { required: true, message: '请选择审核结果', trigger: 'change' },
       },
       loading: false,
-      projType: getType()
+      systemType: getType()
     };
   },
   props: {

src/views/audit/project/final.vue

@@ -167,7 +167,7 @@ export default {
         treeCode: JSON.parse(window.sessionStorage.getItem('user')).unitCode,
         projClass: null,
         reportYear: null,
-        projType: getType()
+        systemType: getType()
       },
       activekey: '1',
       tabDate: [
@@ -286,7 +286,7 @@ export default {
       this.getListByPage()
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1 }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, systemType: getType(), timeType: 1 }).then(({ data = {} }) => {
         if (data) {
           this.isButten = data.disabled
           this.description = data.description
@@ -330,7 +330,7 @@ export default {
       }).catch(() => { this.loading = false })
     },
     getCount () {
-      let pars = isEmptyParams({ auditType: 1, reportYear: this.searchForm.reportYear, projType: getType() });
+      let pars = isEmptyParams({ auditType: 1, reportYear: this.searchForm.reportYear, systemType: getType() });
       this.$api.audit.getFinalCount(pars).then(({ data = {} }) => {
         if (data) {
           this.panes = data

src/views/audit/project/finalJudgment.vue

@@ -174,7 +174,7 @@ export default {
   methods: {
     isEmptyParams,
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, systemType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
           this.searchForm.groupYear = data.year

src/views/audit/task/Index.vue

@@ -153,7 +153,7 @@ export default {
       this.getListByPage()
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 2, projType: getType(), timeType: 2  }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 2, systemType: getType(), timeType: 2  }).then(({ data = {} }) => {
         if (data) {
           this.isButten = data.disabled
           this.description = data.description

src/views/audit/thesis/index.vue

@@ -79,7 +79,7 @@ export default {
       // 选项卡
       panes: { count1: 0, count2: 0, count3: 0, count4: 0, count5: 0, },
       form: this.$form.createForm(this, { name: 'advanced_search' }),
-      searchForm: { auditType: 5, auditResult: 1, projName: null, projNo: null, appUnitName: null, appPersonName: null, projClass: null, projType: getType() },
+      searchForm: { auditType: 5, auditResult: 1, projName: null, projNo: null, appUnitName: null, appPersonName: null, projClass: null, systemType: getType() },
       activekey: '1',
       tabDate: [
         { key: "1", tab: "待审核" },
@@ -143,7 +143,7 @@ export default {
       }).catch(() => { this.loading = false })
     },
     getCount () {
-      let pars = isEmptyParams({ auditType: 5, projType: getType() });
+      let pars = isEmptyParams({ auditType: 5, systemType: getType() });
       this.$api.audit.getConclusionAuditCount(pars).then(({ data = {} }) => {
         if (data) {
           this.panes = data

src/views/components/common/baseSelect.vue

@@ -166,7 +166,7 @@ export default {
       this.loadValue()
     },
     getReportYearList () {
-      this.$api.batch.getCurrentReportYearList({ projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentReportYearList({ systemType: getType() }).then(({ data = {} }) => {
         if (data) {
           this.selectArray = data.list
           this.selected = data.value + ''

src/views/conclusion/index.vue

@@ -99,7 +99,7 @@ export default {
       ],
       itemCount: [0, 0, 0, 0, 0],
       // 表单
-      searchForm: { projName: null, projNo: null, reportYear: null, state: 1, projType: getType() },
+      searchForm: { projName: null, projNo: null, reportYear: null, state: 1, systemType: getType() },
       tableData: [],
       columns: [
         { title: "项目名称", scopedSlots: { customRender: 'projName' } },
@@ -126,7 +126,7 @@ export default {
   },
   methods: {
     getCount () {
-      this.$api.conclusion.getCount({ reportYear: this.searchForm.reportYear, projType: getType() }).then(({ data = {} }) => {
+      this.$api.conclusion.getCount({ reportYear: this.searchForm.reportYear, systemType: getType() }).then(({ data = {} }) => {
         if (data) {
           this.itemCount = [data.count1, data.count2, data.count3, data.count4, data.count5]
         }

src/views/evaluation/components/projectView.vue

@@ -11,8 +11,8 @@
       <div class="page-footer">
         <!-- 申报项目详情 -->
         <!-- <a-button type="primary" @click="onExport">导出</a-button> -->
-        <project-info v-model="formData" :tabsData.sync="tabsData" v-if="projType=='1'" />
-        <project-info-Key v-model="formData" :tabsData.sync="tabsData" v-if="projType=='2'" />
+        <project-info v-model="formData" :tabsData.sync="tabsData" v-if="systemType=='1'" />
+        <project-info-Key v-model="formData" :tabsData.sync="tabsData" v-if="systemType=='2'" />
       </div>
     </a-spin>
   </div>
@@ -118,7 +118,7 @@ export default {
         managerDept: "",
       },
       loading: false,
-      projType: getType()
+      systemType: getType()
     };
   },
   props: {

src/views/evaluation/components/score.vue

@@ -277,7 +277,7 @@ export default {
   methods: {
     moment,
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 5, projType: getType(), timeType: 1 }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 5, systemType: getType(), timeType: 1 }).then(({ data = {} }) => {
         if (data) {
           this.comBatch = data
         }

src/views/evaluation/evaluation.vue

@@ -85,7 +85,7 @@ export default {
   methods: {
     moment,
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 5, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 5, systemType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.isButten = data.disabled
           this.description = data.description

src/views/evaluation/index.vue

@@ -79,7 +79,7 @@ export default {
   data () {
     return {
       form: this.$form.createForm(this, { name: 'advanced_search' }),
-      searchForm: { projName: null, appNo: null, assignYear: null, personId: null, projType: getType(), isShow: 1 },
+      searchForm: { projName: null, appNo: null, assignYear: null, personId: null, systemType: getType(), isShow: 1 },
       tableData: [],
       columns: [
         { title: '申请编号', dataIndex: 'appNo', align: 'center' },
@@ -131,7 +131,7 @@ export default {
   methods: {
     moment,
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 5, projType: getType(), timeType: 1 }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 5, systemType: getType(), timeType: 1 }).then(({ data = {} }) => {
         if (data) {
           this.isButten = data.disabled
           this.description = data.description
@@ -143,7 +143,7 @@ export default {
       }).catch(() => { this.loading = false })
     },
     getListByPage () {
-      this.searchForm.projType = getType()
+      this.searchForm.systemType = getType()
       let pars = isEmptyParams(this.searchForm)
       let par = { ...pars, pageIndex: this.pagination.pageIndex, pageSize: this.pagination.pageSize }
       this.$api.projectAssign.getAuditListByPage(par).then(({ data = {} }) => {
@@ -172,7 +172,7 @@ export default {
       this.getListByPage()
     },
     reset () {
-      this.searchForm = { projName: null, projNo: null, assignYear: null, projType: getType(), isShow: 1 }
+      this.searchForm = { projName: null, projNo: null, assignYear: null, systemType: getType(), isShow: 1 }
       this.pagination.pageIndex = 1
       this.getListByPage()
     },

src/views/evaluation/query.vue

@@ -53,7 +53,7 @@ export default {
   data () {
     return {
       form: this.$form.createForm(this, { name: 'advanced_search' }),
-      searchForm: { projName: null, projNo: null, assignYear: null, personId: null, projType: getType() },
+      searchForm: { projName: null, projNo: null, assignYear: null, personId: null, systemType: getType() },
       tableData: [],
       columns: [
         { title: "项目名称", scopedSlots: { customRender: 'projectName', colName: 'projName' }, align: 'left' },

src/views/expert/evaluationStatistic.vue

@@ -115,7 +115,7 @@ export default {
   methods: {
     moment,
     getYearInfo () {
-      let pars = { batch: 1, projType: getType() }
+      let pars = { batch: 1, systemType: getType() }
       this.$api.batch.getBatchList({ ...pars }).then(({ data = {} }) => {
         if (data) {
           this.YearData = data
@@ -125,7 +125,7 @@ export default {
       })
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, systemType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.searchForm.groupYear = data.year
           this.getListByPage()

src/views/home/components/cardCount.vue

@@ -82,9 +82,9 @@ export default {
     this.changeType()
   },
   computed: {
-    projType: {
+    systemType: {
       get () {
-        return this.$store.state.app.projType
+        return this.$store.state.app.systemType
       },
       set () {
       }
@@ -97,7 +97,7 @@ export default {
       }
     },
     geAuditCount () {
-      this.$api.statistical.geFirstAuditCount({ auditType: 1, projType: getType(), reportYear: this.reportYear }).then(({ data = {} }) => {
+      this.$api.statistical.geFirstAuditCount({ auditType: 1, systemType: getType(), reportYear: this.reportYear }).then(({ data = {} }) => {
         if (data) {
           this.setCardDataList(0, data.count5, data.count1, data.count2, data.count3)
         }
@@ -127,7 +127,7 @@ export default {
     },
   },
   watch: {
-    projType: {
+    systemType: {
       handler (value) {
         if (!!value) {
           this.changeType()

src/views/home/components/cardTopCount.vue

@@ -65,8 +65,8 @@ export default {
   },
   created () {
     // this.cardData = this.list1
-    // let projType = getType()
-    // if (projType && projType == '2') {
+    // let systemType = getType()
+    // if (systemType && systemType == '2') {
     //   this.cardData = this.list2
     // } else {
     //   this.cardData = this.list1
@@ -74,9 +74,9 @@ export default {
     // this.changeType()
   },
   computed: {
-    // projType: {
+    // systemType: {
     //   get () {
-    //     return this.$store.state.app.projType
+    //     return this.$store.state.app.systemType
     //   },
     //   set () {
     //   }
@@ -92,28 +92,28 @@ export default {
       }
     },
     geFirstAuditCount () {
-      this.$api.statistical.geFirstAuditCount({ auditType: 1, projType: getType(), reportYear: this.reportYear }).then(({ data = {} }) => {
+      this.$api.statistical.geFirstAuditCount({ auditType: 1, systemType: getType(), reportYear: this.reportYear }).then(({ data = {} }) => {
         if (data) {
           this.setCardDataList(0, data.count5, data.count1, data.count2, data.count3)
         }
       }).catch(() => { })
     },
     getFirstAuditPassCount () {
-      this.$api.statistical.getFirstAuditPassCount({ auditType: 1, projType: getType(), reportYear: this.reportYear }).then(({ data = {} }) => {
+      this.$api.statistical.getFirstAuditPassCount({ auditType: 1, systemType: getType(), reportYear: this.reportYear }).then(({ data = {} }) => {
         if (data) {
           this.setCardDataList(1, data.count5, data.count1, data.count2, data.count3)
         }
       }).catch(() => { })
     },
     getAssignPersonCount () {
-      this.$api.statistical.getAssignPersonCount({ auditType: 1, projType: getType(), reportYear: this.reportYear }).then(({ data = {} }) => {
+      this.$api.statistical.getAssignPersonCount({ auditType: 1, systemType: getType(), reportYear: this.reportYear }).then(({ data = {} }) => {
         if (data) {
           this.setCardDataList(2, data.count1, data.count2, data.count3, data.count4)
         }
       }).catch(() => { })
     },
     geLastAuditCount () {
-      this.$api.statistical.geLastAuditCount({ auditType: 1, projType: getType(), reportYear: this.reportYear }).then(({ data = {} }) => {
+      this.$api.statistical.geLastAuditCount({ auditType: 1, systemType: getType(), reportYear: this.reportYear }).then(({ data = {} }) => {
         if (data) {
           this.setCardDataList(3, data.count5, data.count1, data.count2, data.count3)
         }
@@ -136,7 +136,7 @@ export default {
     },
   },
   watch: {
-    // projType: {
+    // systemType: {
     //   handler (value) {
     //     if (!!value) {
     //       this.changeType()

src/views/home/components/dashboardGov.vue

@@ -75,9 +75,9 @@ export default {
     this.getYear()
   },
   computed: {
-    projType: {
+    systemType: {
       get () {
-        return this.$store.state.app.projType
+        return this.$store.state.app.systemType
       },
       set () {
       }
@@ -92,7 +92,7 @@ export default {
       }).catch(() => { })
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, systemType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
           this.changeType()
@@ -104,14 +104,14 @@ export default {
       this.getKnowledgeCount()
     },
     getTreeCodeProjectCount () {
-      this.$api.statistical.getTreeCodeProjectCount({ auditType: 1, projType: getType(), reportYear: this.reportYear }).then(({ data = {} }) => {
+      this.$api.statistical.getTreeCodeProjectCount({ auditType: 1, systemType: getType(), reportYear: this.reportYear }).then(({ data = {} }) => {
         if (data) {
           this.setBarData(data)
         }
       }).catch(() => { })
     },
     getKnowledgeCount () {
-      this.$api.statistical.getKnowledgeCount({ auditType: 1, projType: getType(), reportYear: this.reportYear }).then(({ data = {} }) => {
+      this.$api.statistical.getKnowledgeCount({ auditType: 1, systemType: getType(), reportYear: this.reportYear }).then(({ data = {} }) => {
         if (data) {
           this.setPieData(data)
         }
@@ -151,7 +151,7 @@ export default {
     }
   },
   watch: {
-    projType: {
+    systemType: {
       handler (value) {
         if (value) {
           this.changeType()

src/views/home/components/dashboardTop.vue

@@ -75,9 +75,9 @@ export default {
     this.getYear()
   },
   computed: {
-    projType: {
+    systemType: {
       get () {
-        return this.$store.state.app.projType
+        return this.$store.state.app.systemType
       },
       set () {
       }
@@ -92,7 +92,7 @@ export default {
       }).catch(() => { })
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, systemType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
           this.changeType()
@@ -104,14 +104,14 @@ export default {
       this.getKnowledgeCount()
     },
     getTreeCodeProjectCount () {
-      this.$api.statistical.getTreeCodeProjectCount({ auditType: 1, projType: getType(), reportYear: this.reportYear }).then(({ data = {} }) => {
+      this.$api.statistical.getTreeCodeProjectCount({ auditType: 1, systemType: getType(), reportYear: this.reportYear }).then(({ data = {} }) => {
         if (data) {
           this.setBarData(data)
         }
       }).catch(() => { })
     },
     getKnowledgeCount () {
-      this.$api.statistical.getKnowledgeCount({ auditType: 1, projType: getType(), reportYear: this.reportYear }).then(({ data = {} }) => {
+      this.$api.statistical.getKnowledgeCount({ auditType: 1, systemType: getType(), reportYear: this.reportYear }).then(({ data = {} }) => {
         if (data) {
           this.setPieData(data)
         }
@@ -151,7 +151,7 @@ export default {
     }
   },
   watch: {
-    projType: {
+    systemType: {
       handler (value) {
         if (value) {
           this.changeType()

src/views/home/components/dashboardUnit.vue

@@ -50,9 +50,9 @@ export default {
     this.getYear()
   },
   computed: {
-    projType: {
+    systemType: {
       get () {
-        return this.$store.state.app.projType
+        return this.$store.state.app.systemType
       },
       set () {
       }
@@ -67,7 +67,7 @@ export default {
       }).catch(() => { })
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() , timeType: 1 }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, systemType: getType() , timeType: 1 }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
         }
@@ -79,7 +79,7 @@ export default {
     }
   },
   watch: {
-    projType: {
+    systemType: {
       handler (value) {
         
       }

src/views/manager/project/index.vue

@@ -84,7 +84,7 @@ export default {
     return {
       form: this.$form.createForm(this, { name: 'advanced_search' }),
       // 表单
-      searchForm: { projName: null, projNo: null, appUnitName: null, appPersonName: null, projClass: null, reportYear: null, projState: null, projType: null },
+      searchForm: { projName: null, projNo: null, appUnitName: null, appPersonName: null, projClass: null, reportYear: null, projState: null, systemType: null },
       tableData: [],
       columns: [
         { title: "项目名称", scopedSlots: { customRender: 'projName' } },

src/views/peAssign/components/evaluationStatistic.vue

@@ -38,7 +38,7 @@ export default {
   },
   methods: {
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, systemType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
           this.getEvaluationStatistic()

src/views/peAssign/components/groupEdit.vue

@@ -135,7 +135,7 @@ export default {
   methods: {
     moment,
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, systemType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.formData.groupYear = data.year + ''
         }

src/views/peAssign/components/knowledgeSelect.vue

@@ -60,7 +60,7 @@ export default {
   },
   methods: {
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, systemType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
           this.totalTitle = this.reportYear + '项目二级学科选择'
@@ -69,7 +69,7 @@ export default {
       }).catch(() => { })
     },
     getKnowledgeSelectedList () {
-      this.$api.statistical.getKnowledgeSelectedList({ reportYear: this.reportYear, auditType: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.statistical.getKnowledgeSelectedList({ reportYear: this.reportYear, auditType: 1, systemType: getType() }).then(({ data = {} }) => {
         if (data) {
           this.tableData = data
         }

src/views/peAssign/components/projectSelect.vue

@@ -76,7 +76,7 @@ export default {
   },
   methods: {
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1 }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, systemType: getType(), timeType: 1 }).then(({ data = {} }) => {
         if (data) {
           this.searchForm.reportYear = data.year
           this.getListByPage()

src/views/peAssign/components/projectSelectIntoGroup.vue

@@ -73,7 +73,7 @@ export default {
         { title: '证件号', dataIndex: 'certId', align: 'center', width: 150 },
         { title: '申报人', dataIndex: 'appPersonName', align: 'center', width: 80 }
       ],
-      searchForm: { groupId: null, appPersonName: null, reportYear: null, knowledgeCode: null, knowledgeId: null, knowledgeParentId: null, projName: null, appNo: null, projType: getType(), appUnitName: null, projClass: "" },
+      searchForm: { groupId: null, appPersonName: null, reportYear: null, knowledgeCode: null, knowledgeId: null, knowledgeParentId: null, projName: null, appNo: null, systemType: getType(), appUnitName: null, projClass: "" },
       pagination: {
         pageIndex: 1,
         pageSize: this.$defaultPageSize,
@@ -90,7 +90,7 @@ export default {
   },
   methods: {
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, systemType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.searchForm.reportYear = data.year
           this.getListByPage()

src/views/peAssign/components/projectStatistic.vue

@@ -49,7 +49,7 @@ export default {
   },
   methods: {
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, systemType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
           this.getProjectExpertGroupStatistic()
@@ -57,7 +57,7 @@ export default {
       }).catch(() => { })
     },
     getProjectExpertGroupStatistic () {
-      this.$api.statistical.getProjectExpertGroupStatistic({ reportYear: this.reportYear, auditType: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.statistical.getProjectExpertGroupStatistic({ reportYear: this.reportYear, auditType: 1, systemType: getType() }).then(({ data = {} }) => {
         if (data) {
           this.tableData = data
         }

src/views/peAssign/index.vue

@@ -172,7 +172,7 @@ export default {
   methods: {
     isEmptyParams,
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, systemType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
           this.searchForm.groupYear = data.year
@@ -182,7 +182,7 @@ export default {
       }).catch(() => { })
     },
     getKnowledgeStatistic () {
-      this.$api.statistical.getKnowledgeStatistic({ reportYear: this.reportYear, auditType: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.statistical.getKnowledgeStatistic({ reportYear: this.reportYear, auditType: 1, systemType: getType() }).then(({ data = {} }) => {
         if (data) {
           this.tableData1 = data
         }

src/views/peAssign/projAssign.vue

 <template>
   <div class="app-content">
-    <proj-key-assign v-if="projType"/>
+    <proj-key-assign v-if="systemType"/>
     <proj-knowledge-assign v-else/>
   </div>
 </template>
@@ -17,7 +17,7 @@ export default {
   },
   data() {
     return {
-      projType: getType() == "1"
+      systemType: getType() == "1"
     };
   },
 };

src/views/peAssign/projKeyAssign.vue

@@ -171,7 +171,7 @@ export default {
   methods: {
     isEmptyParams,
     getYearInfo () {
-      let pars = { batch: 1, projType: getType() }
+      let pars = { batch: 1, systemType: getType() }
       this.$api.batch.getBatchList({ ...pars }).then(({ data = {} }) => {
         if (data) {
           this.YearData = data
@@ -181,7 +181,7 @@ export default {
       })
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1 }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, systemType: getType(), timeType: 1 }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
           this.searchForm.groupYear = data.year

src/views/peAssign/projKnowledgeAssign.vue

@@ -186,7 +186,7 @@ export default {
   methods: {
     isEmptyParams,
     getYearInfo () {
-      let pars = { batch: 1, projType: getType() }
+      let pars = { batch: 1, systemType: getType() }
       this.$api.batch.getBatchList({ ...pars }).then(({ data = {} }) => {
         if (data) {
           this.YearData = data
@@ -196,7 +196,7 @@ export default {
       })
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() , timeType: 1 }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, systemType: getType() , timeType: 1 }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
           this.searchForm.groupYear = data.year

src/views/query/project/Index.vue

@@ -56,7 +56,7 @@ export default {
     return {
       form: this.$form.createForm(this, { name: 'advanced_search' }),
       // 表单
-      searchForm: { projName: null, projNo: null, projClass: null, reportYear: null, projState: null, projType: getType() },
+      searchForm: { projName: null, projNo: null, projClass: null, reportYear: null, projState: null, systemType: getType() },
       tableData: [],
       columns: [
         { title: "项目名称", scopedSlots: { customRender: 'projName' } },

src/views/query/task/Index.vue

@@ -50,7 +50,7 @@ export default {
     return {
       form: this.$form.createForm(this, { name: 'advanced_search' }),
       // 表单
-      searchForm: { projName: null, projNo: null, projClass: null, reportYear: null, taskState: null, projType: getType() },
+      searchForm: { projName: null, projNo: null, projClass: null, reportYear: null, taskState: null, systemType: getType() },
       tableData: [],
       columns: [
         { title: '项目名称', dataIndex: 'projName', align: 'center' },

src/views/report/project/Index.vue

@@ -89,7 +89,7 @@ export default {
       ],
       itemCount: [0, 0, 0, 0, 0],
       // 表单
-      searchForm: { projName: null, projNo: null, projState: 1, reportYear: null, projType: getType(), knowledgeId: null },
+      searchForm: { projName: null, projNo: null, projState: 1, reportYear: null, systemType: getType(), knowledgeId: null },
       tableData: [],
       columns: [
         { title: "项目名称", scopedSlots: { customRender: 'projName' } },
@@ -142,7 +142,7 @@ export default {
       this.visibleEdit = true
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1 }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, systemType: getType(), timeType: 1 }).then(({ data = {} }) => {
         if (data) {
           this.isButten = data.disabled
           this.description = data.description
@@ -172,7 +172,7 @@ export default {
       }).catch(() => { this.loading = false })
     },
     getCount () {
-      this.$api.project.getCount({ reportYear: this.searchForm.reportYear, projType: getType() }).then(({ data = {} }) => {
+      this.$api.project.getCount({ reportYear: this.searchForm.reportYear, systemType: getType() }).then(({ data = {} }) => {
         if (data) {
           this.itemCount = [data.count1, data.count2, data.count3, data.count4, data.count5]
         }

src/views/report/project/components/keyProject/projectEdit.vue

@@ -1091,7 +1091,7 @@ export default {
           this.$emit('load', false)
         })
       } else {
-        this.$api.project.getNewProject({ projType: getType() }).then(({ data = {} }) => {
+        this.$api.project.getNewProject({ systemType: getType() }).then(({ data = {} }) => {
           if (data) {
             this.formData = data
             this.loadList()

src/views/report/project/components/projectCreate.vue

@@ -32,7 +32,7 @@ export default {
   data () {
     return {
       loading: false,
-      projType: getType() == "1",
+      systemType: getType() == "1",
       current: 10,
       currSteps: 0,
       stepsArray: [

src/views/report/project/components/projectEdit.vue

@@ -838,7 +838,7 @@ export default {
           this.$emit('load', false)
         })
       } else {
-        this.$api.project.getNewProject({ projType: getType() }).then(({ data = {} }) => {
+        this.$api.project.getNewProject({ systemType: getType() }).then(({ data = {} }) => {
           if (data) {
             this.formData = data
             this.$emit('onStepChange', { step: 0, state: data.completeStatus })
@@ -914,7 +914,7 @@ export default {
       switch (step) {
         case 0: {
           obj = {
-            id: null, reportYear: null, batch: null, projState: null, appPersonId: null, appUnitId: null, projType: null,
+            id: null, reportYear: null, batch: null, projState: null, appPersonId: null, appUnitId: null, systemType: null,
             jobTime: null, address: null, mainResearchAreas: null,
             unitLinkName: null, unitLinkMobile: null, unitLinkEmail: null, unitLinkFax: null,
             projName: null, knowledgeId: null, startDate: null, endDate: null,

src/views/report/project/components/projectView.vue

@@ -10,8 +10,8 @@
       <div class="page-footer">
         <!-- 申报项目详情 -->
         <a-button type="primary" @click="onProjectExport">导出</a-button>
-        <project-info v-model="formData" :tabsData.sync="tabsData" v-if="projType=='1'" />
-        <project-info-Key v-model="formData" :tabsData.sync="tabsData" v-if="projType=='2'" />
+        <project-info v-model="formData" :tabsData.sync="tabsData" v-if="systemType=='1'" />
+        <project-info-Key v-model="formData" :tabsData.sync="tabsData" v-if="systemType=='2'" />
       </div>
     </a-spin>
   </div>
@@ -121,7 +121,7 @@ export default {
         managerDept: "",
       },
       loading: false,
-      projType: getType()
+      systemType: getType()
     };
   },
   props: {

src/views/report/project/components/taskView.vue

@@ -120,7 +120,7 @@ export default {
         managerDept: "",
       },
       loading: false,
-      projType: getType()
+      systemType: getType()
     };
   },
   props: {

src/views/report/task/Index.vue

@@ -103,7 +103,7 @@ export default {
   },
   methods: {
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 2 }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, systemType: getType(), timeType: 2 }).then(({ data = {} }) => {
         if (data) {
           this.isButten = data.disabled
           this.description = data.description

src/views/report/task/components/taskView.vue

@@ -120,7 +120,7 @@ export default {
         managerDept: "",
       },
       loading: false,
-      projType: getType()
+      systemType: getType()
     };
   },
   props: {

src/views/statistic/project/Index.vue

@@ -74,7 +74,7 @@ export default {
     return {
       form: this.$form.createForm(this, { name: 'advanced_search' }),
       // 表单
-      searchForm: { projName: null, projNo: null, appUnitName: null, appPersonName: null, treeCode: JSON.parse(window.sessionStorage.getItem('user')).unitCode, projClass: null, reportYear: null, projState: null, auditType: 1, knowledgeId: null, knowledgeParentId: null, projType: getType() },
+      searchForm: { projName: null, projNo: null, appUnitName: null, appPersonName: null, treeCode: JSON.parse(window.sessionStorage.getItem('user')).unitCode, projClass: null, reportYear: null, projState: null, auditType: 1, knowledgeId: null, knowledgeParentId: null, systemType: getType() },
       tableData: [],
       columns: [
         { title: "项目名称", scopedSlots: { customRender: 'projName' } },

src/views/system/set/index.vue

@@ -23,8 +23,8 @@
               </a-radio>
             </a-radio-group>
           </a-form-model-item>
-          <a-form-model-item label="申报项目类型" prop="projType" class="text_line">
-            <a-radio-group v-model="formData.projType">
+          <a-form-model-item label="申报项目类型" prop="systemType" class="text_line">
+            <a-radio-group v-model="formData.systemType">
               <a-radio value="1" name="type">
                 科研项目
               </a-radio>
@@ -62,14 +62,14 @@ export default {
         // imgPath: null,
         SMSApiUrl: null,
         loginType: null,
-        projType: null,
+        systemType: null,
       },
       rules: {
         // filePath: [{ required: true, message: '请输入文件上传路径', trigger: 'blur' },],
         // imgPath: [{ required: true, message: '请输入图片上传路径', trigger: 'blur' },],
         SMSApiUrl: [{ required: true, message: '请输入短信发送接口地址', trigger: 'blur' },],
         loginType: [{ required: true, message: '请选择登录设置', trigger: 'change' }],
-        projType: [{ required: true, message: '请选择申报项目类型', trigger: 'change' }],
+        systemType: [{ required: true, message: '请选择申报项目类型', trigger: 'change' }],
       },
       loading: true
     }

src/views/systemType/index.vue

@@ -78,7 +78,7 @@ export default {
   methods: {
     onChangeType (type) {
       this.loading = true
-      this.$changeProjType(type)
+      this.$changeSystemType(type)
       this.loading = false
     },
     logout () {

src/views/thesis/index.vue

@@ -61,7 +61,7 @@ export default {
     return {
       form: this.$form.createForm(this, { name: 'advanced_search' }),
       // 表单
-      searchForm: { projName: null, projNo: null, projType: getType() },
+      searchForm: { projName: null, projNo: null, systemType: getType() },
       tableData: [],
       columns: [
         { title: "论文名称", scopedSlots: { customRender: 'name' } },

src/views/timeSet/batch/Index.vue

@@ -29,7 +29,7 @@ export default {
   components: { batchEdit },
   data () {
     return {
-      searchForm: { projType: getType(), timeType: 1, },
+      searchForm: { systemType: getType(), timeType: 1, },
       form: this.$form.createForm(this, { name: 'advanced_search' }),
       tableData: [],
       columns: [

src/views/timeSet/batch/components/batchEdit.vue

@@ -98,7 +98,7 @@ export default {
         reportRange: [],
         auditRange: [],
         expertRange: [],
-        projType: getType()
+        systemType: getType()
       },
       formRules: {
         id: [{ required: false }],
@@ -136,7 +136,7 @@ export default {
           this.formData.id = data.id
           this.formData.year = data.year + ''
           this.formData.timeType = data.timeType
-          this.formData.projType = data.projType
+          this.formData.systemType = data.systemType
           this.formData.reportStart = data.reportStart
           this.formData.reportEnd = data.reportEnd
           this.formData.auditStart = data.auditStart

src/views/timeSet/batch/components/talentBatchEdit.vue

@@ -98,7 +98,7 @@ export default {
         reportRange: [],
         auditRange: [],
         expertRange: [],
-        projType: null,
+        systemType: null,
       },
       formRules: {
         id: [{ required: false }],
@@ -136,7 +136,7 @@ export default {
           this.formData.id = data.id
           this.formData.year = data.year + ''
           this.formData.timeType = data.timeType
-          this.formData.projType = null
+          this.formData.systemType = null
           this.formData.reportStart = data.reportStart
           this.formData.reportEnd = data.reportEnd
           this.formData.auditStart = data.auditStart

src/views/timeSet/taskTimeSet/Index.vue

@@ -29,7 +29,7 @@ export default {
   components: { timeEdit },
   data () {
     return {
-      searchForm: { projType: getType(), timeType: 2, },
+      searchForm: { systemType: getType(), timeType: 2, },
       form: this.$form.createForm(this, { name: 'advanced_search' }),
       tableData: [],
       columns: [

src/views/timeSet/taskTimeSet/components/timeEdit.vue

@@ -87,7 +87,7 @@ export default {
         remark: '',
         reportRange: [],
         auditRange: [],
-        projType: getType()
+        systemType: getType()
       },
       formRules: {
         id: [{ required: false }],
@@ -122,7 +122,7 @@ export default {
           this.formData.id = data.id
           this.formData.year = data.year + ''
           this.formData.timeType = data.timeType
-          this.formData.projType = data.projType
+          this.formData.systemType = data.systemType
           this.formData.reportStart = data.reportStart
           this.formData.reportEnd = data.reportEnd
           this.formData.auditStart = data.auditStart

src/views/utils/auth.js

@@ -18,7 +18,7 @@ export function getType () {
   let type = ''
   let user = window.sessionStorage.getItem('user')
   if (user)
-    type = JSON.parse(user).projType
+    type = JSON.parse(user).systemType
   return type
 }
 
@@ -26,7 +26,7 @@ export function setType (type) {
   let user = window.sessionStorage.getItem('user')
   if (user) {
     let obj = JSON.parse(user)
-    obj.projType = type
+    obj.systemType = type
     window.sessionStorage.setItem('user', JSON.stringify(obj))
   }
   return type