From e3b6943c804df0f4f56f98e0071ec068ec14b861 Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Tue, 26 Apr 2022 15:00:40 +0800
Subject: [PATCH] =?UTF-8?q?[add]=20=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/addModel.vue                   |   0
 .../{template => ParameterTemplate}/index.vue |   5 +-
 .../parameterlist/components/addModel.vue     | 413 ------------------
 3 files changed, 2 insertions(+), 416 deletions(-)
 rename jero-web/src/views/parameter/{template => ParameterTemplate}/components/addModel.vue (100%)
 rename jero-web/src/views/parameter/{template => ParameterTemplate}/index.vue (98%)

diff --git a/jero-web/src/views/parameter/template/components/addModel.vue b/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue
similarity index 100%
rename from jero-web/src/views/parameter/template/components/addModel.vue
rename to jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue
diff --git a/jero-web/src/views/parameter/template/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue
similarity index 98%
rename from jero-web/src/views/parameter/template/index.vue
rename to jero-web/src/views/parameter/ParameterTemplate/index.vue
index 6d12b4f06..4a4f0d8d2 100644
--- a/jero-web/src/views/parameter/template/index.vue
+++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue
@@ -231,11 +231,10 @@ export default {
     },
     //虚拟清单名称事件
     entryNameClick(item) {
-      let newUrl = this.$router.resolve({
-        path: '/parameterlist',
+      this.$router.push({
+        path: '/ParameterTemplateList',
         query: item
       })
-      window.open(newUrl.href, '_blank')
     },
     searchQuery() {
       this.pageNo = 1
diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index d7bea327f..e69de29bb 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -1,413 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :maskClosable="false"
-    :width="1000"
-    placement="right"
-    :closable="true"
-    @close="handleCancel"
-    :visible="visible"
-    style="height: 100%;overflow: auto;padding-bottom: 53px;">
-    <a-spin :spinning="confirmLoading">
-      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" :title="$t('entryName')">{{$t('entryName')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="projectName">
-                <a-select :placeholder="$t('PleaseSelect')+$t('entryName')"
-                          @change="projectNameChange"
-                          v-model="formInline.projectNameId">
-                  <a-select-option v-for="(item, key) in projectNameList"
-                                   :key="key"
-                                   :value="item.id">
-                     <span style="display: inline-block;width: 100%" :title=" item.projectName ">
-                           {{ item.projectName}}
-                     </span>
-                  </a-select-option>
-                </a-select>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" :title="$t('targetMarket')">{{$t('targetMarket')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="targetMarket">
-                <j-multi-select-tag class="box-input" v-model="formInline.targetMarket"
-                                    :disabled="disabled"
-                                    :placeholder="$t('PleaseSelect')+$t('targetMarket')"
-                                    :type="'select'"
-                                    :triggerChange="false" :dictCode="'region'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" :title="$t('projectStatus')">{{$t('projectStatus')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="projectStatus">
-                <j-dict-select-tag class="box-input" v-model="formInline.projectStatus"
-                                   :disabled="disabled"
-                                   @input="handleInput('projectStatus')"
-                                   :placeholder="$t('PleaseSelect')+$t('projectStatus')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'project_status'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" :title="$t('StudioEngineer')">{{$t('StudioEngineer')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" :prop="'studioEngineerName'">
-                <PersonnelSelection :query="{db_field_name:'studioEngineer',db_field_txt:$t('StudioEngineer')}"
-                                    :isSingleChoice="true"
-                                    :personneQuery="formInline"
-                                    @change="PersonnelSelectionChange"
-                                    :disabled="disabled"
-                                    v-model="formInline.studioEngineerName"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" :prop="'certificationEngineerName'">
-                <PersonnelSelection
-                  :query="{db_field_name:'certificationEngineer',db_field_txt:$t('certifiedEngineer')}"
-                  :personneQuery="formInline"
-                  @change="PersonnelSelectionChange"
-                  :disabled="disabled"
-                  v-model="formInline.certificationEngineerName"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" :title="$t('IPDInformation')">{{$t('IPDInformation')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="ipdInfo">
-                <a-input class="box-input"
-                         :disabled="disabled"
-                         v-model="formInline.ipdInfo"
-                         :placeholder="$t('PleaseEnter')+$t('IPDInformation')"/>
-              </a-form-model-item>
-            </div>
-            <!--            ^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%\$#_]*)?$
-            -->
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" :title="$t('ModelPlatform')">{{$t('ModelPlatform')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="vehiclePlatform">
-                <j-dict-select-tag class="box-input" v-model="formInline.vehiclePlatform"
-                                   :disabled="disabled"
-                                   @input="handleInput('vehiclePlatform')"
-                                   :placeholder="$t('PleaseSelect')+$t('ModelPlatform')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'vehicle_platform'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" :title="$t('DigitalPlatform')">{{$t('DigitalPlatform')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" :prop="'digitalPlatform'">
-                <j-dict-select-tag class="box-input" v-model="formInline.digitalPlatform"
-                                   :disabled="disabled"
-                                   @input="handleInput('digitalPlatform')"
-                                   :placeholder="$t('PleaseSelect')+$t('DigitalPlatform')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'digital_platform'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('dehicleDevelopmentPlan')">{{$t('dehicleDevelopmentPlan')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" :prop="'vehicleDevelopmentPlan'">
-                <a-input class="box-input"
-                         :disabled="disabled"
-                         v-model="formInline.vehicleDevelopmentPlan"
-                         :placeholder="$t('PleaseEnter')+$t('dehicleDevelopmentPlan')"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" :title="$t('certificationProgram')">{{$t('certificationProgram')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="attestationPlan">
-                <a-input class="box-input"
-                         :disabled="disabled"
-                         v-model="formInline.attestationPlan"
-                         :placeholder="$t('PleaseEnter')+$t('certificationProgram')"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </a-spin>
-    <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>
-  </a-drawer>
-</template>
-
-<script>
-import PersonnelSelection from '@/components/PersonnelSelection/index'
-import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
-
-export default {
-  name: 'addModel',
-  components: {
-    PersonnelSelection
-  },
-  props: ['url'],
-  data() {
-    return {
-      formInline: {},
-      confirmLoading: false,
-      visible: false,
-      rules: {
-        ipdInfo: [
-          {
-            pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%$#_]*)?/,
-            message: this.$t('pleaseEnterTheCorrectWebAddress')
-          }
-        ],
-        vehicleDevelopmentPlan: [
-          {
-            pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%$#_]*)?/,
-            message: this.$t('pleaseEnterTheCorrectWebAddress')
-          }
-        ],
-        attestationPlan: [
-          {
-            pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%$#_]*)?/,
-            message: this.$t('pleaseEnterTheCorrectWebAddress')
-          }
-        ]
-      },
-      disabled: false,
-      projectNameList: [],
-      title: ''
-    }
-  },
-  mounted() {
-    this.getNameList()
-  },
-  methods: {
-    getNameList() {
-      getAction('project/projectNameInfoEO/list', {}).then((res) => {
-        if (res.success) {
-          this.projectNameList = res.result || []
-        } else {
-          this.projectNameList = []
-        }
-      })
-    },
-    addModel() {
-      this.visible = true
-      this.title = '新增'
-      this.formInline = {}
-    },
-    editModel(value) {
-      this.visible = true
-      this.title = '编辑'
-      this.$nextTick(() => {
-        this.formInline = value
-      })
-    },
-    handleCancel() {
-      this.visible = false
-    },
-    handleSubmit() {
-      this.$refs.ruleForm.validate(valid => {
-        if (valid) {
-          let url = ''
-          let Action
-          if (this.formInline.id) {
-            url = this.url.edit
-            Action = putAction
-          } else {
-            url = this.url.add
-            Action = postAction
-          }
-          let query = JSON.parse(JSON.stringify(this.formInline))
-          Object.keys(query).forEach(res => {
-            if (query[res] && query[res] instanceof Array) {
-              query[res] = query[res].join(',')
-            }
-          })
-          this.confirmLoading = true
-          Action(url, query).then((res) => {
-            if (res.success) {
-              this.confirmLoading = false
-              this.$message.success(this.$t('OperationSuccessful'))
-              this.visible = false
-              this.$emit('addModelList')
-            } else {
-              this.$message.warning(this.$t('operationFailed'))
-              this.confirmLoading = false
-            }
-          })
-        }
-      })
-    },
-    handleInput(value) {
-      this.$nextTick(() => {
-        this.formInline = { ...this.formInline }
-        this.$refs.ruleForm.validateField([value])
-      })
-    },
-    PersonnelSelectionChange(value, id) {
-      this.formInline[value] = id
-      this.formInline = { ...this.formInline }
-    },
-    projectNameChange(value){
-      console.log(value)
-    },
-  }
-}
-</script>
-<style>
-.formAdd .ant-form-item-label {
-  width: 130px;
-}
-
-.formAdd .ant-form-item-control-wrapper {
-  display: inline-block;
-  width: calc(100% - 130px);
-}
-
-/*.formAdd .ant-form-item {*/
-/*  margin-bottom: 20px;*/
-/*}*/
-
-.itemModel .ant-form-item-control-wrapper {
-  width: 100%;
-}
-
-.box-input .ant-select-selection--single {
-  height: 38px;
-}
-
-.box-input .ant-select-selection--multiple {
-  height: 38px;
-}
-
-.box-input .ant-select-selection__rendered {
-  line-height: 38px;
-  height: 38px;
-}
-
-.box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
-  margin-top: 6px;
-}
-
-.box-input .ant-calendar-picker {
-  line-height: 38px;
-  height: 38px;
-}
-
-.box-input .ant-calendar-picker-input {
-  height: 38px;
-}
-
-.box-input .ant-input-number-input-wrap {
-  line-height: 38px;
-  height: 38px;
-}
-</style>
-<style scoped>
-.box-title-text {
-  line-height: 1.4;
-  display: flex;
-  /*align-items: center;*/
-}
-
-.title-text {
-  width: 114px;
-  text-align: right;
-  display: inline-block;
-  font-weight: 500;
-  font-size: 14px;
-  margin-right: 16px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  height: 42px;
-  line-height: 48px;
-}
-
-.box-input {
-  display: inline-block;
-  height: 38px;
-  width: 100%;
-}
-
-.itemModel {
-  width: calc(100% - 130px);
-  display: inline-block;
-  margin-top: 2px;
-}
-
-.Required {
-  color: red;
-  margin-right: 4px;
-}
-
-.title-text-text {
-  margin-top: 9px;
-}
-
-
-.formAdd {
-  margin-bottom: 40px;
-}
-
-
-.drawer-bootom-button {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  border-top: 1px solid #e8e8e8;
-  padding: 10px 16px;
-  text-align: right;
-  left: 0;
-  background: #fff;
-  border-radius: 0 0 2px 2px;
-}
-</style>
-<style>
-.ant-input-disabled {
-  color: rgba(0, 0, 0, 0.65) !important;
-}
-</style>
\ No newline at end of file