[add] 参数项收集清单

jero-web/src/common/lang/en-us.js

@@ -705,6 +705,13 @@ module.exports = {
   uploadTime: 'Upload time',
   enclosure: 'enclosure',
   // 认证
+  ParameterLibrary: 'Parameter Library',
+  referenceparameter: 'reference Parameter',
+  Assignedby: 'Assignedby',
+  CompulsoryWithdrawal: 'CompulsoryWithdrawal',
+  SynchronousReportLibrary: 'Synchronous Report Library',
+  FreezeConfiguration: 'Freeze Configuration',
+  distributionAndCollection: 'distribution And Collection',
   deleteConfiguration: 'delete Configuration',
   addConfiguration: 'add Configuration',
   electricMachinery: 'electricMachinery',

jero-web/src/common/lang/zh-cn.js

@@ -714,6 +714,13 @@ module.exports = {
   uploadTime: '上传时间',
   enclosure: '附件',
   // 认证
+  ParameterLibrary: '参数库',
+  referenceparameter: '引用参数',
+  Assignedby: '分配填写人',
+  CompulsoryWithdrawal: '强制撤回',
+  SynchronousReportLibrary: '同步上报库',
+  FreezeConfiguration: '冻结配置',
+  distributionAndCollection: '下发收集',
   deleteConfiguration: '删除配置',
   addConfiguration: '添加配置',
   electricMachinery: '电机',

jero-web/src/components/ParameterLibrary/index.vue

@@ -0,0 +1,330 @@
+<template>
+  <div class='diolag-area'>
+    <a-spin :spinning='spinLoading'>
+      <a-form-model
+        class='tag-module'
+        ref='ruleForm'
+        :model='form'
+        :rules='rules'
+        :label-col='labelCol'
+        :wrapper-col='wrapperCol'
+      >
+        <a-row :gutter='24'>
+          <a-col :span='9'>
+            <a-form-model-item ref='region' :label="$t('NiONumber')" prop='region'>
+                <a-input
+                  v-model='form.paramsTemplateName' :placeholder="$t('pleaseEnter')+$t('NiONumber')" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span='9'>
+            <a-form-model-item ref='paramsTemplateName' :label="$t('ParameterName')" prop='paramsTemplateName'>
+              <a-input
+                v-model='form.paramsTemplateName' :placeholder="$t('pleaseEnter')+$t('ParameterName')" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span='6'>
+            <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>
+        </a-row>
+        <a-row :gutter='24'>
+          <a-col :span='9'>
+            <a-form-model-item ref='region' :label="$t('areaOfResponsibility')" prop='region'>
+              <a-form-model-item class='itemModel' prop='region'>
+                <j-dict-select-tag class='box-input' v-model='form.region'
+                                   :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                   :type="'select'"
+                                   :triggerChange='false' :dictCode="'duty_territory'" />
+              </a-form-model-item>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span='9'>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+    <a-table
+      class='table-area'
+      ref='table'
+      size='middle'
+      rowKey='id'
+      :columns='columns'
+      :dataSource='areaTable'
+      :pagination='false'
+      :loading='loading'
+      :scroll='{x: 600}'
+      :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
+      @change='handleTableChange'>
+      <a slot='name' slot-scope='text'>{{ text }}</a>
+      <span slot='action' slot-scope='text, record'>
+          <a class='action-edit' @click='editArea(record.id)' v-has="'area:edit'">{{ $t('edit') }}</a>
+          <a style='color:red' href='javascript:;' @click=' deleteArea(record.id)'
+             v-has="'area:delete'">{{ $t('delete') }}</a>
+      </span>
+    </a-table>
+    <div class='drawer-bootom-button'>
+      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
+      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
+
+export default {
+  name: 'diolagArea',
+  components: {},
+  data() {
+    return {
+      title: this.$t('add'),
+      total: 0,
+      selectedRowKeysDate: {},
+      loading: false,
+      editId: '',
+      columns: [
+        // {
+        //   title: this.$t('NiONumber'),
+        //   dataIndex: 'region_dictText',
+        //   key: 'showArea',
+        //   align: 'center',
+        //   ellipsis: true
+        // },
+        // {
+        //   title: this.$t('ParameterName'),
+        //   align: 'center',
+        //   dataIndex: 'paramsTemplateName',
+        //   ellipsis: true
+        // },
+        // {
+        //   title: this.$t('areaOfResponsibility'),
+        //   dataIndex: 'region_dictText',
+        //   key: 'showArea',
+        //   align: 'center',
+        //   ellipsis: true
+        // }
+      ],
+      newVisible: false,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 14 }
+      },
+      form: {},
+      rules: {
+        // templatetitle: [
+        //   { required: true, message: this.$t('enterTitle'), trigger: 'blur' }
+        // ]
+      },
+      areaTable: [],
+      flag: false,  //表单提交标识
+      spinLoading: false,
+      confirmLoading: false,
+      templatetitle: '',
+      selectedRowKeys: []
+    }
+  },
+  props: {
+  },
+  mounted() {
+    this.loadData()
+  },
+  methods: {
+    loadData() {
+      this.loading = true
+      let params = {
+        ...this.form
+      }
+      getAction(`params/collectManifest/paramsInfoList`, params).then(res => {
+        if (res.success) {
+          this.areaTable = [...res.result]
+          this.total = res.result.total
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    searchQuery() {
+      this.loadData()
+    },
+    searchReset() {
+      this.form = {}
+      this.loadData()
+    },
+    handleCancel() {
+      this.$emit('areaVisible', false)
+    },
+    onSelectChange(selectedRowKeys, selectedRowKeysDate) {
+      this.selectedRowKeysDate = selectedRowKeysDate
+      this.selectedRowKeys = selectedRowKeys
+      this.$emit('addselectedRowKeys',this.selectedRowKeys)
+    },
+    handleTableChange(val) {
+    },
+    showModal() {
+      this.title = this.$t('add')
+      this.newVisible = true
+      this.form = {}
+    },
+    //新增
+    handleSubmit() {
+      if (this.selectedRowKeys.length == 0) {
+        this.$message.warning(this.$t('pleaseSelectData'))
+      } else if (this.selectedRowKeys.length > 1) {
+        this.$message.warning(this.$t('OnlyOneSelected'))
+      } else {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            this.flag = true
+            this.spinLoading = true
+            // 新增編輯之前 判断 标题唯一
+            getAction(`params/manifest/verifyTitle?projectId=${this.$route.query.id}
+                  &title=${this.templatetitle}`, {})
+              .then(res => {
+                if (res.success) {
+                  let postDate = {
+                    title: this.templatetitle,
+                    paramsTemplateId: this.rowId || this.selectedRowKeysDate[0].id,
+                    paramsTemplatePublishVersion: this.version || this.selectedRowKeysDate[0].version,
+                    projectId: this.projectId
+                  }
+                  if (this.rowId) {
+                    //编辑
+                    postAction(`params/manifest/edit`, postDate).then(res => {
+                        if (res.success) {
+                          this.newVisible = false
+                          this.$emit('areaVisible', false)
+                          this.$message.success(this.$t('OperationSuccessful'))
+                        } else {
+                          this.$message.warning(res.message)
+                        }
+                      }
+                    ).finally(() => {
+                      this.flag = false
+                      this.spinLoading = false
+                      this.newVisible = false
+                    })
+                  } else {
+                    //新增
+                    postAction(`params/manifest/add`, postDate).then(res => {
+                        if (res.success) {
+                          this.newVisible = false
+                          this.$emit('areaVisible', false)
+                          this.$message.success(this.$t('OperationSuccessful'))
+                        } else {
+                          this.$message.warning(res.message)
+                        }
+                      }
+                    ).finally(() => {
+                      this.flag = false
+                      this.spinLoading = false
+                      this.newVisible = false
+                    })
+                  }
+                } else {
+                  this.$message.warning(res.message)
+                }
+              }).finally(() => {
+              this.loading = false
+            })
+          } else {
+            return false
+          }
+        })
+      }
+    },
+    cancelModel() {
+      this.newVisible = false
+      this.$refs.ruleForm.resetFields()
+    },
+    //删除按钮
+    deleteArea(val) {
+      this.$confirm({
+        title: this.$t('confirmDeletion'),
+        content: '',
+        onOk:
+          async () => {
+            getAction(`tag/onlCgformArea/delete`, { id: val }).then((res) => {
+              if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                if (this.areaTable.length == 1 && this.queryParams.pageNo != 1) {
+                  this.queryParams.pageNo = this.queryParams.pageNo - 1
+                }
+                this.loadData()
+              } else {
+                // this.$message.warning(res.message)
+                if (res.message == '该展示区域有关联数据，无法删除！') {
+                  this.$message.warning(this.$t('noDelete'))
+                } else {
+                  this.$message.warning(this.$t('operationFailed'))
+                }
+              }
+            })
+          }
+      })
+    },
+    //编辑按钮
+    editArea(val) {
+      this.title = this.$t('edit')
+      this.newVisible = true
+      let params = {
+        id: val
+      }
+      getAction(`tag/onlCgformArea/queryById`, params).then((res) => {
+        if (res.success) {
+          this.form = { ...res.result }
+          // this.$emit('updateOk',res.result)
+
+        }
+      })
+    }
+  },
+  watch: {
+    templateTitle(val) {
+      this.templatetitle = val
+    },
+    selectedRowKeyS(val) {
+      this.selectedRowKeys = val
+    }
+  }
+
+}
+</script>
+
+<style lang='less' scoped>
+@import '~@assets/less/common.less';
+
+.diolag-area {
+  .table-area {
+    margin: 20px 0;
+
+    .action-edit {
+      margin-right: 10px;
+    }
+  }
+
+  .table-del {
+    color: red;
+  }
+}
+.drawer-bootom-button{
+  display: flex;
+  justify-content: center;
+}
+</style>
+<style lang='less'>
+.area-module {
+  .ant-modal-wrap {
+    .ant-modal {
+      .ant-modal-content {
+        .ant-modal-footer {
+          text-align: center;
+        }
+      }
+    }
+  }
+}
+</style>

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

@@ -60,27 +60,71 @@
       </a-row>
     </div>
     <div class="table-operator">
+      <a-popconfirm overlayClassName='popconfirm' placement="bottomRight">
+        <template slot="title" id="popconfirm">
+          <!--     下发收集 -->
+          <div @click="handleAdd" class="operator-text-title">
+            <a-icon type="plus"/>
+            {{$t('distributionAndCollection')}}
+          </div>
+          <!--      冻结配置-->
+          <div @click="handleAdd" class="operator-text-title">
+            <a-icon type="plus"/>
+            {{$t('FreezeConfiguration')}}
+          </div>
+          <!--   同步上报库   -->
+          <div @click="handleAdd" class="operator-text-title">
+            <a-icon type="plus"/>
+            {{$t('SynchronousReportLibrary')}}
+          </div>
+          <!--      强制撤回-->
+          <div @click="handleModule" class="operator-text-title">
+            <a-icon type="bulb"/>
+            {{$t('CompulsoryWithdrawal')}}
+          </div>
+        </template>
+        <div class="operator-text" style="position: relative">
+          <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
+        </div>
+      </a-popconfirm>
+      <!--      添加-->
       <div @click="handleAdd" class="operator-text">
+        <a-icon type="plus"/>
+        {{$t('addTo')}}
+      </div>
+<!--      分配填写人-->
+      <div @click="handleCody" class="operator-text">
+        <a-icon type="copy"/>
+        {{$t('Assignedby')}}
+      </div>
+<!--      提交-->
+      <div @click="handleSubmit" class="operator-text">
         <a-icon type="plus"/>
         {{$t('submit')}}
       </div>
-      <div @click="handleModule" class="operator-text">
+<!--      退回-->
-        <a-icon type="bulb"/>
+      <div @click="handleAdd" class="operator-text">
-        {{$t('changeExtension')}}
+        <a-icon type="plus"/>
+        {{$t('sendBack')}}
       </div>
-      <div @click="handleCody" class="operator-text">
+<!--      引用参数-->
-        <a-icon type="copy"/>
+      <div @click="handleAdd" class="operator-text">
-        {{$t('copy')}}{{$t('parameter')}}{{ $t('detailedList') }}
+        <a-icon type="plus"/>
+        {{$t('referenceparameter')}}
       </div>
+<!--      批量删除-->
       <div @click="handleDel" class="operator-text" v-has="'document:deleteBatch'">
         <a-icon type="delete"/>
         {{$t('BatchDelete')}}
       </div>
     </div>
     <div style="width: 100%">
+<!--      表格-->
       <table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue' @value='value'/>
     </div>
-    <a-modal v-model="areaVisible" :title="$t('parameterTemplate')" width='750px' :footer="null">
+<!--   添加 -->
+    <a-modal v-model="areaVisible" :title="$t('ParameterLibrary')" width='750px' :footer="null">
+      <parameter-library v-if='areaVisible' @addselectedRowKeys='addselectedRowKeys'/>
     </a-modal>
   </a-card>
 </template>
@@ -88,11 +132,12 @@
 <script>
 import TableCollection from '@/components/tableCollection/index'
 import { getAction,postAction } from '../../../api/manage'
-
+import ParameterLibrary from '@/components/ParameterLibrary/index'
 export default {
   name: 'ParameterItemCollectionList',
   components:{
-    TableCollection
+    TableCollection,
+    ParameterLibrary
   },
   data(){
     return{
@@ -149,7 +194,7 @@ export default {
         add: 'params/collectManifest/submit',
         // edit: 'params/manifest/edit',
         // queryById: 'params/manifest/queryById',
-        // deleteBatch: 'params/manifest/delete',
+        deleteBatch: 'params/collectManifest/deleteBatch',
         // deleteAll: 'params/manifest/deleteBatch',
         // conAdd: 'params/config/addBatch',
         // conList: 'params/config/list',
@@ -167,7 +212,6 @@ export default {
       rowId: '',
       version: 0,
       itemId: '',
-      selectedRowKeys: [],
       selectedRowKeysValue: []
     }
   },
@@ -181,13 +225,24 @@ export default {
   mounted() {
   },
   methods:{
+    addselectedRowKeys() {
+      console.log('llll')
+    },
+    // 表格所选中得行内容
     rowValue(val) {
       this.selectedRowKeysValue = val
     },
+    // 表格所选中得id
     value(val) {
-      this.selectedRowKeys = val
+      this.selectedRowKeys = val,
+      this.selectedRowKeysArray = val.join(',')
     },
+    // 添加
     handleAdd() {
+      this.areaVisible = true
+    },
+    // 提交
+    handleSubmit() {
       let postDate = []
       this.selectedRowKeysValue.forEach((item, index) => {
         let postDateobj = {}
@@ -199,13 +254,11 @@ export default {
         postDateobj.id = item.id
         postDate.push(postDateobj)
       })
-      console.log(postDate,'postDatepostDatepostDatepostDate')
       if(this.selectedRowKeys.length == 0) {
         this.$message.warning(this.$t('selectLeastOne'))
       }else {
         postAction(this.url.add, postDate).then((res) => {
           if (res.success) {
-            console.log(res,'lllll')
             this.$message.success(this.$t('OperationSuccessful'))
             // _this.getlist()
           } else {
@@ -220,164 +273,43 @@ export default {
     handleCody() {
 
     },
-    handleDel() {
-
-    },
-    // 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) {
+    handleDel(){
-    //   this.selectedRowKeys = val
+      let param={
-    //   this.selectedRowKeysArray = val.join(',')
+        ids: this.selectedRowKeysArray
-    // },
+      }
-    // edit(edit){
+      if (this.selectedRowKeys.length > 0) {
-    //   this.areaVisible = true
+        let _this = this
-    //   let _this = this
+        this.$confirm({
-    //   let query = {
+          content: _this.$t('ConfirmBatchDeletion'),
-    //     paramsManifestId: this.paramsManifest.id
+          onOk() {
-    //   }
+            postAction(_this.url.deleteAll, param).then((res) => {
-    //   getAction(_this.url.getHeader, query).then((res) => {
+              if (res.success) {
-    //     if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
-    //       console.log(res,'res..')
+                // _this.getlist()
-    //       this.templatetitle = res.result.title
+              } else {
-    //       this.selectedRowKeys = res.result.paramsTemplateId.split(',')
+                _this.$message.warning(_this.$t('operationFailed'))
-    //       this.rowId = res.result.id
+              }
-    //       this.version = res.result.paramsTemplatePublishVersion
+            })
-    //       console.log(this.selectedRowKeys,'this.selectedRowKeys')
+          }
-    //       console.log(typeof this.version)
+        })
-    //     } else {
+      } else {
-    //     }
+        this.$message.warning(this.$t('selectLeastOne'))
-    //   })
+      }
-    // },
+    },
-    // 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 = {
-    // //     paramsManifestId: this.paramsManifest.id,
-    // //   }
-    // //   let flag = {
-    // //     flag: '7'
-    // //   }
-    // //   let getquery = {...query,...flag}
-    // //   console.log(this.paramsManifest,'this.paramsManifestthis.paramsManifestthis.paramsManifest')
-    // //   getAction(this.url.getHeader, getquery).then((res) => {
-    // //     if(res.success) {
-    // //       console.log(res,'头部，，，')
-    // //       // this.total =  res.result.total
-    // //       // this.dataSource = res.result.records || []
-    // //       this.loading = false
-    // //     } else {
-    // //       this.loading = false
-    // //     }
-    // //   })
-    // //   // let query = {
-    // //   //   pageSize: this.pageSize,
-    // //   //   pageNo: this.pageNo,
-    // //   //   ...this.queryParam
-    // //   // }
-    // //   // console.log(this.paramsManifest,'this.paramsManifestthis.paramsManifest')
-    // //   // // console.log(this.$route.query,'this.query')
-    // //   getAction(this.url.list, query).then((res) => {
-    // //     if(res.success) {
-    // //       console.log(res,'oooo')
-    // //       // this.total =  res.result.total
-    // //       // this.dataSource = res.result.records || []
-    // //       this.loading = false
-    // //     } else {
-    // //       this.loading = false
-    // //     }
-    // //   })
-    // // }
-  },
-  // watch: {
-  //   paramsManifest(newVal, oldVal) {
-  //     this.getlist()
-  //   }
-  // }
 }
 </script>