Merge branch 'dev_2nd_period_test' into 'dev_third_stage'

# Conflicts:
#   jero-web/src/common/lang/en-us.js
#   jero-web/src/common/lang/zh-cn.js
#   jero-web/src/views/projectManagement/components/TaskList.vue
#   jero-web/src/views/projectManagement/components/cuibanModel.vue

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

@@ -225,6 +225,7 @@
                   <a-input class="box-input add-input"
                            :disabled="disabled"
                            type="textarea"
+                           @input="onInput"
                            v-model.trim="formInline.controlValues"
                            :placeholder="$t('PleaseEnter')+$t('NcontrolAlternatives')"/>
                 </a-form-model-item>
@@ -609,9 +610,12 @@ export default {
         };
 
       })
-
-
-
+    },
+    onInput(r) {
+      let value = r.target.value
+      r.target.value = value.replace(/[！!#]/g, '')
+      this.formInline.controlValues = r.target.value
+      this.formInline = {...this.formInline}
     },
     getSysCategoryTree() {
       getAction('/sys/category/getSysCategoryTree', {}).then((res) => {