From 24a131ac4f3e9f42683936960f0c8ce5356a072c Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Wed, 22 Jun 2022 12:04:01 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=B8=8A=E5=AE=9D=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  2 +
 jero-web/src/common/lang/zh-cn.js             |  3 ++
 .../parameterexport/components/addModel.vue   | 49 +++++++++++++------
 .../views/parameter/parameterexport/index.vue | 33 ++++---------
 4 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 1c4f25207..3c6c1ee00 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -962,4 +962,6 @@ module.exports = {
   releaseStatus:'Release status',
   uploadedBy:'Uploaded by',
   uploadMonthly:'Upload monthly',
+//  上报库
+  Enable: '启用',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 96d70a9fc..0d434b1aa 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -967,4 +967,7 @@ module.exports = {
   releaseStatus:'发布状态',
   uploadedBy:'上传人',
   uploadMonthly:'上传月报',
+//  上报库
+  Enable: '启用',
+
 }
\ No newline at end of file
diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue
index 940a9f193..2ba12c0c5 100644
--- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue
@@ -19,11 +19,11 @@
                   <span class="title-text-text"
                         :title="$t('parameterTemplate')">{{$t('parameterTemplate')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                <a-form-model-item class="itemModel" prop="templateName">
                   <a-input class="box-input"
                            :disabled="disabled"
-                           v-model="formInline.paramsTemplateName"
-                           :placeholder="$t('PleaseEnter')+$t('parameterTemplate')"/>
+                           v-model="formInline.templateName"
+                           :placeholder="$t('PleaseEnter')+$t('templateName')"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -31,14 +31,15 @@
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required">*</span>
-                  <span class="title-text-text" :title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
+                  <span class="title-text-text" :title="$t('status')">{{$t('status')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="region">
-                  <j-dict-select-tag class="box-input" v-model="formInline.region"
-                                     :disabled="disabled"
-                                     :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
-                                     :type="'select'"
-                                     :triggerChange="false" :dictCode="'region'"/>
+                <a-form-model-item class="itemModel" prop="status">
+                  <a-select allowClear :placeholder="$t('PleaseSelect')+$t('status')" v-model='formInline.status'>
+                    <a-select-option :key="'0'" :value="'0'">{{$t('Enable')}}
+                    </a-select-option>
+                    <a-select-option :key="'1'" :value="'1'">{{$t('disable')}}
+                    </a-select-option>
+                  </a-select>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -60,6 +61,23 @@
               </div>
             </a-col>
           </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('parameterTemplate')">{{$t('parameterTemplate')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="templateName">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           v-model="formInline.templateName"
+                           :placeholder="$t('PleaseEnter')+$t('templateName')"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
         </a-form-model>
       </a-form>
     </a-spin>
@@ -86,19 +104,16 @@ export default {
       confirmLoading: false,
       visible: false,
       rules: {
-        paramsTemplateName:[
+        templateName:[
           { required: true, message: this.$t('PleaseEnter')+this.$t('parameterTemplate'), trigger: 'change' },
           { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('characters'), trigger: 'blur' },
         ],
         description:[
-          { min:1, max: 300, message: this.$t('cantExeed')+'300'+this.$t('characters'), trigger: 'blur' },
+          { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
         ],
-        state: [
+        status: [
           { required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' },
         ],
-        region: [
-          { required: true, message: this.$t('PleaseSelect')+this.$t('zoneOfApplication'), trigger: 'change' },
-        ]
       },
       disabled: false,
       projectNameList: [],
@@ -122,6 +137,8 @@ export default {
       this.visible = true
       this.title = '新增'
       this.formInline = {}
+      this.formInline.status = '0'
+      this.formInline = {...this.formInline}
       this.$nextTick(() => {
         this.$refs['ruleForm'].clearValidate()
       })
diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue
index fb91ec868..7feb1988f 100644
--- a/jero-web/src/views/parameter/parameterexport/index.vue
+++ b/jero-web/src/views/parameter/parameterexport/index.vue
@@ -4,22 +4,11 @@
       <a-row :gutter="24">
         <a-col :md="6" :sm="8">
           <div class="box-title-text">
-            <div class="title-text" :title="$t('zoneOfApplication')">
-              <span>{{$t('zoneOfApplication')}}</span>
+            <div class="title-text" :title="$t('templateName')">
+              <span>{{$t('templateName')}}</span>
             </div>
-            <j-dict-select-tag class="box-input" v-model="queryParam.region"
-                               :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
-                               :type="'select'"
-                               :triggerChange="false" :dictCode="'region'"/>
-          </div>
-        </a-col>
-        <a-col :md="6" :sm="8">
-          <div class="box-title-text">
-            <div class="title-text" :title="$t('parameterTemplate')">
-              <span>{{$t('parameterTemplate')}}</span>
-            </div>
-            <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('parameterTemplate')"
-                     v-model="queryParam.paramsTemplateName"></a-input>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('templateName')"
+                     v-model="queryParam.templateName"></a-input>
           </div>
         </a-col>
         <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -138,12 +127,11 @@ export default {
       dataSource: [],
       confirmLoading: false,
       url: {
-        list: 'params/template/page',
-        add: 'params/template/add',
-        edit: 'params/template/edit',
-        deleteBatch: 'params/template/delete',
-        deleteAll: 'params/template/deleteBatch',
-        copy: 'params/template/copyById'
+        list: 'report/exportTemplate/page',
+        add: 'report/exportTemplate/add',
+        edit: 'report/exportTemplate/edit',
+        deleteBatch: 'report/exportTemplate/delete',
+        deleteAll: 'report/exportTemplate/deleteBatch',
       },
       total: 0,
       pageSize: 10,
@@ -164,8 +152,7 @@ export default {
         {
           title: this.$t('templateName'),
           align: 'center',
-          dataIndex: 'paramsTemplateName',
-          scopedSlots: { customRender: 'projectName' }
+          dataIndex: 'templateName'
         },
         {
           title: this.$t('contentDescription'),