参数项查看页修改

上报库-自定义导出对接接口
参数模板管理去掉技术领域
参数说明字符限制修改

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

@@ -389,6 +389,7 @@ module.exports = {
   whole: 'Whole',
   DocumentLibrary: 'Document Library',
   GeneralExportInformation:'General export information',
+  CustomizeExportInformation:'Customize export information',
   DocumentComparisonLibrary: 'Document comparison Library',
   weekly: 'Weekly',
   SyncLibrary: 'Sync to doc. library',

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

@@ -394,6 +394,7 @@ module.exports = {
   whole: '全部',
   DocumentLibrary: '文档库',
   GeneralExportInformation:'常规导出信息',
+  CustomizeExportInformation:'自定义导出信息',
   DocumentComparisonLibrary: '文档对比库',
   weekly: '周报',
   SyncLibrary: '同步至文档库',

jero-web/src/components/tableCollection/index1.vue

@@ -96,7 +96,7 @@
       </div>
     </a-modal>
     <!--  配置信息--->
-    <a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null">
+    <a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null" @cancel="hideModal">
       <div class="content-text">
         <div class="text-field">
           <span class="text-field-left" :title="$t('configurationName')">{{$t('configurationName')}}:</span>
@@ -290,12 +290,16 @@
         this.$emit('handlePreservation')
         this.getTableList()
       },
+      hideModal(){
+        this.areaVisibleView = false
+      },
       // 查看配置详细信息
       onClickSee(val) {
+        console.log(val)
         let _this = this
         this.areaVisibleView = true
         axios({
-          url: `/jero-boot/params/config/getById?id=${val.db_field_name}`,
+          url: `/jero-boot/report/detail/getConfig?id=${val.db_field_name}`,
           method: 'get',
           transformRequest: [function(data) {
             let ret = ''

jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue

@@ -17,6 +17,7 @@
               <a-col :span="24">
                 <div class="box-title-text">
                   <div class="title-text" :title="$t('configure')">
+                    <span class="Required">*</span>
                     <span>{{$t('configure')}}</span>
                   </div>
                   <a-form-model-item class="itemModel" prop="configIds">
@@ -41,14 +42,23 @@
               <a-col :span="24">
                 <div class="box-title-text">
                   <div class="title-text" :title="$t('CustomTemplateName')">
+                    <span class="Required">*</span>
                     <span>{{$t('CustomTemplateName')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel" prop="certCategory">
+                  <a-form-model-item class="itemModel" prop="exportTemplateId">
-                    <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
+                    <a-select v-model="formInline.exportTemplateId" class="box-input"  :placeholder="$t('PleaseSelect')+$t('CustomTemplateName')">
-                                       :placeholder="$t('PleaseSelect')+$t('CustomTemplateName')"
+                      <a-select-option
-                                       :type="'select'"
+                        v-for="mode in exportTemplatetOptions"
-                                       @input="certCategoryName"
+                        :key="mode.value"
-                                       :triggerChange="false" :dictCode="'cert_category'"/>
+                        :value="mode.value">
+                        {{ mode.label }}
+                      </a-select-option>
+                    </a-select>
+<!--                    <j-dict-select-tag class="box-input" v-model="formInline.exportTemplateId"-->
+<!--                                       :placeholder="$t('PleaseSelect')+$t('CustomTemplateName')"-->
+<!--                                       :type="'select'"-->
+<!--                                       @input="certCategoryName"-->
+<!--                                       :triggerChange="false" :dictCode="'cert_category'"/>-->
                   </a-form-model-item>
 
                 </div>
@@ -87,6 +97,7 @@ export default {
       confirmLoading: false,
       description:false,
       dictOptions:[],
+      exportTemplatetOptions:[],
       visible: false,
       required:false,
       disabled:false,
@@ -110,8 +121,8 @@ export default {
         description:[
           { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
         ],
-        status: [
+        exportTemplateId: [
-          { required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' },
+          { required: true, message: this.$t('PleaseSelect')+this.$t('CustomTemplateName'), trigger: 'change' },
         ],
         fileConnectId: [
           { required: true, message: this.$t('PleaseSelect')+this.$t('attachmentTemplate'), trigger: 'change' },
@@ -160,9 +171,9 @@ export default {
       this.visible = true
       this.title = this.$t('CustomExport')
       this.formInline = {}
-      this.formInline.separator = ','
       this.formInline = {...this.formInline}
       this.getConfigure()
+      this.getexportTemplateId()
 
       this.$nextTick(() => {
         this.$refs['ruleForm'].clearValidate()
@@ -172,7 +183,7 @@ export default {
       let pram = {
         paramsManifestId: this.$route.query.id
       }
-      getAction('report/detail/getConfigLabelList', pram).then((res) => {
+      getAction('report/detail/getConfigLabelListCustom', pram).then((res) => {
         if (res.success) {
           console.log(res.result)
           this.dictOptions = res.result
@@ -181,6 +192,16 @@ export default {
         }
       })
     },
+    getexportTemplateId(){
+      getAction('report/detail/getTemplateLabelList', {}).then((res) => {
+        if (res.success) {
+          console.log(res.result)
+          this.exportTemplatetOptions = res.result
+        } else {
+          // this.$refs.uploadFile.perentHandleFunc()
+        }
+      })
+    },
     editModel(value) {
       this.visible = true
       this.title = '编辑'
@@ -213,17 +234,17 @@ export default {
           let url = this.url.ConventionalExport
           let Action = getAction
           let query = JSON.parse(JSON.stringify(this.formInline))
-          Object.keys(query).forEach(res => {
+          // Object.keys(query).forEach(res => {
-            if (query[res] && query[res] instanceof Array) {
+          //   if (query[res] && query[res] instanceof Array) {
-              query[res] = query[res].join(',')
+          //     query[res] = query[res].join(',')
-            }
+          //   }
-          })
+          // })
-          if(this.contentListStart){
+          // if(this.contentListStart){
-            query.certCategoryName = this.contentListStart
+          //   query.certCategoryName = this.contentListStart
-          }
+          // }
           query.paramsManifestId = this.$route.query.id
           this.confirmLoading = true
-          downloadFile('report/detail/exportNormal', this.$t('GeneralExportInformation')+'.zip', query)
+          downloadFile('report/detail/exportCustom', this.$t('CustomizeExportInformation')+'.zip', query)
           this.confirmLoading = false
         }
       })

jero-web/src/views/parameter/managementdetails/index.vue

@@ -1,4 +1,5 @@
 <template>
+
   <a-card :bordered="false">
     <div class="table-page-search-wrapper doc-detail">
       <div class="Virtual-detail-header" style="top: 0">
@@ -225,6 +226,7 @@ export default {
   mounted() {
     // this.Getlist()
     this.getTableList()
+    document.title = this.$t('ParameterViewPage')
   },
   methods:{
     Getlist() {

jero-web/src/views/parameter/parameterlist/components/addModel.vue

@@ -60,24 +60,39 @@
                 </a-form-model-item>
               </div>
             </a-col>
+<!--            <a-col :span="12">-->
+<!--              <div class="box-title-text">-->
+<!--                <div class="title-text">-->
+<!--                  <span class="Required">*</span>-->
+<!--                  <span class="title-text-text" :title="$t('NtechnicalField')">{{$t('NtechnicalField')}}</span>-->
+<!--                </div>-->
+<!--                <a-form-model-item class="itemModel" prop="technologyTerritory">-->
+<!--                  <a-tree-select-->
+<!--                    tree-node-filter-prop="title"-->
+<!--                    v-model="formInline.technologyTerritory"-->
+<!--                    :maxTagCount="1"-->
+<!--                    class="box-input"-->
+<!--                    :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                    style="width: 100%"-->
+<!--                    :tree-data="CategoryTreeList"-->
+<!--                    tree-checkable-->
+<!--                    :placeholder="$t('PleaseSelect')+$t('NtechnicalField')"-->
+<!--                  />-->
+<!--                </a-form-model-item>-->
+<!--              </div>-->
+<!--            </a-col>-->
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required">*</span>
-                  <span class="title-text-text" :title="$t('NtechnicalField')">{{$t('NtechnicalField')}}</span>
+                  <span class="title-text-text" :title="$t('NareaOfResponsibility')">{{$t('NareaOfResponsibility')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="technologyTerritory">
+                <a-form-model-item class="itemModel" prop="dutyTerritory">
-                  <a-tree-select
+                  <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
-                    tree-node-filter-prop="title"
+                                     :disabled="disabled"
-                    v-model="formInline.technologyTerritory"
+                                     :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
-                    :maxTagCount="1"
+                                     :type="'select'"
-                    class="box-input"
+                                     :triggerChange="false" :dictCode="'duty_territory'"/>
-                    :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                    style="width: 100%"
-                    :tree-data="CategoryTreeList"
-                    tree-checkable
-                    :placeholder="$t('PleaseSelect')+$t('NtechnicalField')"
-                  />
                 </a-form-model-item>
               </div>
             </a-col>
@@ -99,21 +114,7 @@
                 </a-form-model-item>
               </div>
             </a-col>
-            <a-col :span="12">
+
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required">*</span>
-                  <span class="title-text-text" :title="$t('NareaOfResponsibility')">{{$t('NareaOfResponsibility')}}</span>
-                </div>
-                <a-form-model-item class="itemModel" prop="dutyTerritory">
-                  <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
-                                     :disabled="disabled"
-                                     :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
-                                     :type="'select'"
-                                     :triggerChange="false" :dictCode="'duty_territory'"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
           </a-row>
           <a-row :gutter="24">
             <a-col :span="24">
@@ -273,6 +274,7 @@
                                    style='height: 95px; width: 100%'
                                    :disabled="disabled"
                                    type="textarea"
+                                   :maxLength="1000"
                                    v-model="item.description"
                                    :placeholder="$t('PleaseEnter')+$t('NParameterDescription')"/>
                         </a-form-model-item>
@@ -377,7 +379,7 @@ export default {
           { required: true, message: this.$t('PleaseSelect')+this.$t('areaOfResponsibility'), trigger: 'change' },
         ],
         description: [
-          { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
+          { min:1, max: 100, message: this.$t('cantExeed')+'1000'+this.$t('characters'), trigger: 'blur' },
         ],
         controlType: [
           { required: true, message: this.$t('pleaseSelect')+this.$t('controlType'), trigger: 'change' },
@@ -602,11 +604,11 @@ export default {
       this.contentList = []
       this.contentListed = []
       this.visible = true
-      if(value.technologyTerritory.split(',').length === 1){
+      // if(value.technologyTerritory.split(',').length === 1){
-        value.technologyTerritory = value.technologyTerritory
+      //   value.technologyTerritory = value.technologyTerritory
-      } else {
+      // } else {
-        value.technologyTerritory = value.technologyTerritory.split(',')
+      //   value.technologyTerritory = value.technologyTerritory.split(',')
-      }
+      // }
       this.formInline = value
       this.title = this.$t('edit')
       this.flag = 0