Merge remote-tracking branch 'origin/project9-8' into project9-8

# Conflicts:
#	src/views/template/incomeWmsLabel.vue

src/views/template/incomeWmsLabel.vue

@@ -363,7 +363,7 @@ export default {
       getIncomeWmsLabel(id).then(response => {
         this.form = response.data
         console.log(this.form)
-        if (this.form.params !== null && this.form.params !== undefined) {
+        if (this.form.params !== null && this.form.params !== undefined && this.form.params !== '') {
           this.paramsItems = []
           const obj = JSON.parse(this.form.params)
           for (const key in obj) {