Merge remote-tracking branch 'origin/master'

jero-web/src/config/router.config.js

@@ -337,6 +337,11 @@ export const constantRouterMap = [
     name: 'ProjectDetails',
     component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/ProjectDetails/index')
   },
+  {
+    path: '/ParameterItemCollection',
+    name: 'ParameterItemCollection',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/ParameterItemCollection/ProjectDetails/index')
+  },
   {
     path: '/taskListProcess',
     name: 'taskListProcess',

jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue

@@ -0,0 +1,204 @@
+<template>
+  <div class="doc-detail">
+    <div class="Virtual-detail-header" style="position: fixed;top: 0">
+      <div class="Virtual-detail-title">
+          <span style="line-height: 74px;display: inline-block;float: left">
+            <a-icon type="left-circle" theme="filled" style="margin-right: 6px;font-size: 30px;color: #21c9cc;"/>
+          </span>
+        <span>
+             {{this.title}}
+        </span>
+      </div>
+      <div class="Virtual-detail-text-right" v-if="textTitle === '法规清单'">
+        <div class="operator-text" @click="commentClick">
+          <a-icon type="message"/>
+          {{$t('comment')}}
+        </div>
+        <div class="operator-text" @click="historicalVersionClick">
+          <a-icon type="clock-circle"/>
+          {{$t('historicalVersion')}}
+        </div>
+        <div class="operator-text" @click="UpdateLogClick">
+          <a-icon type="reload"/>
+          {{$t('UpdateLog')}}
+        </div>
+      </div>
+    </div>
+    <div style="padding: 67px 0 0 0;background: #ffffff;height:100%">
+      <div class="detail-content" style="height: 100%">
+        <div class="Virtual-detail-left">
+          <div class="Virtual-detail-left-text" :title="$t('projectDetails')" @click="textClick(0,'项目详情')">
+            <a-icon type="container"/>
+            {{$t('projectDetails')}}
+          </div>
+          <div class="Virtual-detail-left-text" :title="$t('listOfRegulations')" @click="textClick(1,'法规清单')">
+            <a-icon type="container"/>
+            {{$t('listOfRegulations')}}
+          </div>
+          <div class="Virtual-detail-left-text" :title="$t('taskList')" @click="textClick(2,'任务清单')">
+            <a-icon type="container"/>
+            {{$t('taskList')}}
+          </div>
+          <div class="Virtual-detail-left-text" :title="$t('nonConformance')" @click="textClick(3,'未符合项')">
+            <a-icon type="container"/>
+            {{$t('nonConformance')}}
+          </div>
+          <div class="Virtual-detail-left-text" :title="$t('TaskParameterCollection')" @click="textClick(4,'认证参数收集')">
+            <a-icon type="container"/>
+            {{$t('TaskParameterCollection')}}
+          </div>
+        </div>
+        <div class="Virtual-detail-right">
+          <ProjectDetailsName v-if="textTitle === '项目详情'"/>
+          <listOfRegulations v-else-if="textTitle === '法规清单'"/>
+          <TaskList v-else-if="textTitle === '任务清单'"/>
+          <ParameterItemCollectionList item collection v-else-if="textTitle === '认证参数收集'"/>
+          <nonConformance v-else-if="textTitle === '未符合项'"/>
+        </div>
+      </div>
+    </div>
+    <updateLog :url="url" ref="updateLogRef"/>
+    <historicalVersionList ref="historicalVersionListRef"/>
+    <commentList ref="commentListRef"/>
+  </div>
+</template>
+
+<script>
+import TaskList from '@/views/projectManagement/components/TaskList'
+import listOfRegulations from '@/views/projectManagement/components/listOfRegulations'
+import ProjectDetailsName from '@/views/projectManagement/components/ProjectDetails'
+import ParameterItemCollectionList from '../../components/ParameterItemCollectionList'
+import nonConformance from '@/views/projectManagement/components/nonConformance'
+import updateLog from '@/components/UpdateLog/index'
+import historicalVersionList from '@/views/projectManagement/components/historicalVersionList'
+import commentList from '@/views/projectManagement/components/commentList'
+
+export default {
+  name: 'ProjectDetails',
+  components: {
+    TaskList,
+    listOfRegulations,
+    ProjectDetailsName,
+    ParameterItemCollectionList,
+    nonConformance,
+    updateLog,
+    historicalVersionList,
+    commentList
+  },
+  data() {
+    return {
+      title: this.$t('projectDetails'),
+      textTitle: '认证参数收集',
+      url: {
+        logList: '',
+        historicalVersionUrl: ''
+      }
+    }
+  },
+  mounted() {
+    this.textColor()
+  },
+  methods: {
+    textColor() {
+      let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
+      if (textColor && textColor.length > 0) {
+        textColor[0].classList.remove('Virtual-detail-left-text-color')
+      }
+      let text = document.getElementsByClassName('Virtual-detail-left-text')
+      if (text && text.length > 0) {
+        text[4].classList.add('Virtual-detail-left-text-color')
+      }
+    },
+    textClick(num, name) {
+      this.textTitle = name
+      let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
+      if (textColor && textColor.length > 0) {
+        textColor[0].classList.remove('Virtual-detail-left-text-color')
+      }
+      let text = document.getElementsByClassName('Virtual-detail-left-text')
+      text[num].classList.add('Virtual-detail-left-text-color')
+    },
+    UpdateLogClick() {
+      this.$refs.updateLogRef.getList()
+    },
+    historicalVersionClick() {
+      this.$refs.historicalVersionListRef.getList()
+    },
+    commentClick() {
+      this.$refs.commentListRef.getData()
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
+
+.doc-detail {
+  background: #fff;
+  height: 100%;
+
+  .Virtual-detail-header {
+    width: 100%;
+    height: 68px;
+    line-height: 68px;
+    padding: 0 32px 0 32px;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 2px #eff1f3 solid;
+    background: #fff;
+
+    .Virtual-detail-title {
+      display: inline-block;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
+      font-size: 20px;
+      font-weight: 400;
+      color: #040B29;
+      line-height: 68px;
+    }
+
+    .doc-detail-right {
+      width: 800px;
+      line-height: 68px;
+      display: flex;
+    }
+  }
+
+  .Virtual-detail-left {
+    width: 240px;
+    padding: 16px 24px;
+    box-sizing: border-box;
+    font-size: 16px;
+    line-height: 3;
+    float: left;
+
+    .Virtual-detail-left-text {
+      padding: 2px 12px;
+      cursor: pointer;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+
+  .Virtual-detail-right {
+    border-left: 2px #eff1f3 solid;
+    width: calc(100% - 240px);
+    height: 100%;
+    float: left;
+    overflow: auto;
+  }
+}
+
+.Virtual-detail-left-text-color {
+  background: #eff1f3;
+  border-radius: 4px;
+}
+
+.Virtual-detail-text-right {
+
+}
+</style>

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -0,0 +1,470 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-row :gutter="24">
+        <a-col :md="6" :sm="8">
+          <div class="box-title-text">
+            <div class="title-text" :title="$t('NiONumber')">
+              <span>{{$t('NiONumber')}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NiONumber')"
+                     v-model="queryParam.title"></a-input>
+          </div>
+        </a-col>
+        <a-col :md="6" :sm="8">
+          <div class="box-title-text">
+            <div class="title-text" :title="$t('ParameterName')">
+              <span>{{$t('ParameterName')}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterName')"
+                     v-model="queryParam.title"></a-input>
+          </div>
+        </a-col>
+        <a-col :md="6" :sm="8">
+          <div class="box-title-text">
+            <div class="title-text" :title="$t('certificationCategory')">
+              <span>{{$t('certificationCategory')}}</span>
+            </div>
+            <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                               :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="'cert_category'"/>
+          </div>
+        </a-col>
+        <a-col :md="6" :sm="8">
+          <div class="box-title-text">
+            <div class="title-text" :title="$t('areaOfResponsibility')">
+              <span>{{$t('areaOfResponsibility')}}</span>
+            </div>
+            <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                               :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="'duty_territory'"/>
+          </div>
+        </a-col>
+        <a-col :md="6" :sm="8">
+          <div class="box-title-text">
+            <div class="title-text" :title="$t('completedBy')">
+              <span>{{$t('completedBy')}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('completedBy')"
+                     v-model="queryParam.title"></a-input>
+          </div>
+        </a-col>
+        <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+               </a-col>
+            </span>
+      </a-row>
+    </div>
+    <div class="table-operator">
+      <div @click="handleAdd" class="operator-text">
+        <a-icon type="plus"/>
+        {{$t('add')}}{{ $t('detailedList') }}
+      </div>
+      <div @click="handleModule" class="operator-text">
+        <a-icon type="bulb"/>
+        {{$t('changeExtension')}}
+      </div>
+      <div @click="handleCody" class="operator-text">
+        <a-icon type="copy"/>
+        {{$t('copy')}}{{$t('parameter')}}{{ $t('detailedList') }}
+      </div>
+      <div @click="handleDel" class="operator-text" v-has="'document:deleteBatch'">
+        <a-icon type="delete"/>
+        {{$t('BatchDelete')}}
+      </div>
+    </div>
+    <div style="width: 100%">
+      <a-table
+        class='table-area'
+        ref='table'
+        size='middle'
+        rowKey='id'
+        :columns='columns'
+        :dataSource='dataSource'
+        :pagination='false'
+        :loading='loading'
+        :scroll='{x: 600}'
+        :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
+        @change='handleTableChange'>
+        <span slot="paramsManifestClick" slot-scope="text,record">
+          <a @click="paramsManifestClick(record)">{{text}}</a>
+        </span>
+        <span slot="operation" slot-scope="text,record">
+            <a class="text-operation" @click="configure(record)">{{$t('configure')}}</a>
+            <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
+            <a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
+            <a class="text-operation" @click="historicalVersion(record)">{{$t('historicalVersion')}}</a>
+        </span>
+      </a-table>
+    </div>
+    <div class="page">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+    <a-modal v-model="areaVisible" :title="$t('parameterTemplate')" width='750px' :footer="null">
+      <parameter-template v-if='areaVisible' @areaVisible='handleCancel' :templateTitle='templatetitle'
+                          :selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version'></parameter-template>
+    </a-modal>
+    <configure ref="configureRef" :url='url' :itemId='itemId'/>
+  </a-card>
+</template>
+
+<script>
+// import ImportFile from '@/components/ImportFile/index'
+// import ParameterTemplate from '../dialog/ParameterTemplate'
+// import { getAction,postAction } from '../../../api/manage'
+// import Configure from '../dialog/configure'
+import axios from 'axios'
+
+export default {
+  name: 'TaskParameterCollection',
+  // components:{
+  //   ImportFile,
+  //   ParameterTemplate,
+  //   Configure
+  // },
+  data(){
+    return{
+      columns:[
+        {
+          title: this.$t('title'),
+          align: 'center',
+          dataIndex: 'title',
+          scopedSlots: { customRender: 'paramsManifestClick' }
+        },
+        {
+          title: this.$t('status'),
+          align: 'center',
+          dataIndex: 'state',
+        },
+        {
+          title: this.$t('parameterTemplateName'),
+          align: 'center',
+          dataIndex: 'paramsTemplateName',
+        },
+        {
+          title: this.$t('collectionCompletionTime'),
+          align: 'center',
+          dataIndex: 'finishTime',
+        },
+        {
+          title: this.$t('Version'),
+          align: 'center',
+          dataIndex: 'version',
+        },
+        {
+          title: this.$t('creator'),
+          align: 'center',
+          dataIndex: 'createBy',
+        },
+        {
+          title: this.$t('createTime'),
+          align: 'center',
+          dataIndex: 'createTime',
+        },
+        {
+          title: this.$t('operation'),
+          align: 'center',
+          fixed: 'right',
+          width: 200,
+          scopedSlots: { customRender: 'operation' }
+        }
+      ],
+      selectedRowKeys: [],
+      queryParam: {},
+      url: {
+        list: 'params/manifest/page',
+        add: 'params/manifest/add',
+        edit: 'params/manifest/edit',
+        queryById: 'params/manifest/queryById',
+        deleteBatch: 'params/manifest/delete',
+        deleteAll: 'params/manifest/deleteBatch',
+        conAdd: 'params/config/addBatch',
+        conList: 'params/config/list',
+      },
+      loading: false,
+      dataSource: [],
+      areaVisible: false, // 弹框的控制
+      configureareaVisible: false, // 配置的彈框
+      pageNo: 1,
+      pageSize: 10,
+      total: 0,
+      selectedRowKeysArray: '',
+      templatetitle: '',
+      templatetitleId: '',
+      rowId: '',
+      version: 0,
+      itemId: ''
+    }
+  },
+  mounted() {
+    this.getlist()
+  },
+  methods:{
+    paramsManifestClick(item) {
+      // let newUrl = this.$router.resolve({
+      //   path: '/ParameterItemCollection',
+      //   query: item
+      // })
+      // window.open(newUrl.href, '_blank')
+    },
+    deleteLib(val) {
+      let _this = this
+      this.$confirm({
+        content: _this.$t('ConfirmDelete'),
+        onOk() {
+          getAction(_this.url.deleteBatch, { id: val.id }).then((res) => {
+            if (res.success) {
+              _this.$message.success(_this.$t('OperationSuccessful'))
+              _this.getlist()
+            } else {
+              _this.$message.warning(_this.$t('operationFailed'))
+            }
+          })
+        }
+      })
+    },
+    handleTableChange() {
+
+    },
+    //
+    historicalVersion() {
+
+    },
+    // 配置
+    configure(item) {
+      this.itemId = item.id
+      this.$refs.configureRef.addModel(item.id)
+    },
+    handleCancel(val) {
+      this.areaVisible = val
+      this.getlist()
+    },
+    searchQuery() {
+      this.pageNo = 1
+      this.getlist()
+    },
+    searchReset() {
+      this.queryParam = {}
+      this.pageNo = 1
+      this.getlist()
+    },
+    onSelectChange(val) {
+      this.selectedRowKeys = val
+      this.selectedRowKeysArray = val.join(',')
+    },
+    edit(edit){
+      this.areaVisible = true
+      let _this = this
+      let query = {
+        id: edit.id
+      }
+      getAction(_this.url.queryById, query).then((res) => {
+        if (res.success) {
+          console.log(res,'res..')
+          this.templatetitle = res.result.title
+          this.selectedRowKeys = res.result.paramsTemplateId.split(',')
+          this.rowId = res.result.id
+          this.version = res.result.paramsTemplatePublishVersion
+          console.log(this.selectedRowKeys,'this.selectedRowKeys')
+          console.log(typeof this.version)
+        } else {
+        }
+      })
+    },
+    handleAdd(){
+      this.areaVisible = true
+    },
+    handleModule(){
+
+    },
+    handleDel(){
+      let param={
+        ids: this.selectedRowKeysArray
+      }
+      if (this.selectedRowKeys.length > 0) {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('ConfirmBatchDeletion'),
+          onOk() {
+            postAction(_this.url.deleteAll, param).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.getlist()
+              } else {
+                _this.$message.warning(_this.$t('operationFailed'))
+              }
+            })
+          }
+        })
+      } else {
+        this.$message.warning(this.$t('selectLeastOne'))
+      }
+    },
+    handleCody() {
+
+    },
+    getPersonnelList(){
+
+    },
+    pageOnChange() {
+
+    },
+    SizeChange() {
+
+    },
+    getlist() {
+      let query = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.queryParam
+      }
+      console.log(this.$route.query,'this.query')
+      getAction(this.url.list, query).then((res) => {
+        if(res.success) {
+          this.total =  res.result.total
+          this.dataSource = res.result.records || []
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      })
+    }
+  },
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
+
+.doc-detail {
+  background: #fff;
+  height: 100%;
+
+  .Virtual-detail-header {
+    width: 100%;
+    height: 68px;
+    line-height: 68px;
+    padding: 0 32px 0 32px;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 2px #eff1f3 solid;
+    background: #fff;
+
+    .Virtual-detail-title {
+      display: inline-block;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
+      font-size: 20px;
+      font-weight: 400;
+      color: #040B29;
+      line-height: 68px;
+    }
+
+    .doc-detail-right {
+      width: 800px;
+      line-height: 68px;
+      display: flex;
+    }
+  }
+
+  .Virtual-detail-content {
+    padding: 0 38px 0 38px;
+    box-sizing: border-box;
+    font-size: 16px;
+
+    .box-title-text-add {
+      line-height: 1.4;
+    }
+
+    .title-text-add {
+      display: inline-block;
+      font-weight: 500;
+      margin-right: 16px;
+      height: 42px;
+      line-height: 42px;
+    }
+  }
+}
+
+.header-text {
+  font-size: 16px;
+  font-weight: 400;
+  height: 60px;
+  color: #000F16;
+  line-height: 40px;
+}
+
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text {
+  width: 20%;
+  min-width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.box-input {
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.box-button {
+  height: 38px;
+}
+
+.text-operation {
+  margin-right: 8px;
+}
+
+.page {
+  text-align: right;
+  margin-top: 20px;
+}
+
+.operator-text-left {
+  font-size: 14px;
+  margin-right: 20px;
+  background: #eff1f3;
+  padding: 8px 8px;
+  cursor: pointer;
+  border-radius: 4px;
+}
+</style>
+<style>
+.box-input .ant-select-selection {
+  height: 38px !important;
+}
+
+.box-input .ant-select-selection__rendered {
+  line-height: 38px;
+}
+</style>

jero-web/src/views/projectManagement/components/TaskParameterCollection.vue

@@ -173,10 +173,12 @@
     },
     methods:{
       paramsManifestClick(item) {
-        this.$router.push({
+        let Obj = {...this.$route.query, ...item}
-          path: '/ProjectDetails',
+        let newUrl = this.$router.resolve({
-          query: item
+          path: '/ParameterItemCollection',
+          query: Obj,
         })
+        window.open(newUrl.href, '_blank')
       },
       deleteLib(val) {
         let _this = this
@@ -231,13 +233,10 @@
         }
         getAction(_this.url.queryById, query).then((res) => {
           if (res.success) {
-            console.log(res,'res..')
             this.templatetitle = res.result.title
             this.selectedRowKeys = res.result.paramsTemplateId.split(',')
             this.rowId = res.result.id
             this.version = res.result.paramsTemplatePublishVersion
-            console.log(this.selectedRowKeys,'this.selectedRowKeys')
-            console.log(typeof this.version)
           } else {
           }
         })
@@ -289,7 +288,6 @@
           pageNo: this.pageNo,
           ...this.queryParam
         }
-        console.log(this.$route.query,'this.query')
         getAction(this.url.list, query).then((res) => {
           if(res.success) {
             this.total =  res.result.total