Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_vue

.env

@@ -2,10 +2,10 @@
 VITE_PORT = 3100
 
 #  网站标题
-VITE_GLOB_APP_TITLE = JeecgBoot 企业级低代码平台
+VITE_GLOB_APP_TITLE = 运维平台
 
 # 简称，此变量只能是字符/下划线
-VITE_GLOB_APP_SHORT_NAME = JeecgBoot_Pro
+VITE_GLOB_APP_SHORT_NAME = 运维平台
 
 # 单点登录服务端地址
 VITE_GLOB_APP_CAS_BASE_URL=http://cas.test.com:8443/cas

src/views/config/serviceDirective/ConfigServiceDirectiveList.vue

@@ -9,7 +9,7 @@
             <a-form-item name="categoryId">
               <template #label><span title="服务类别">服务类别</span></template>
               <j-dict-select-tag type="list" v-model:value="queryParam.categoryId"
-                :dictCode="`config_service_category,category_name,id,del_flag = 0 order by sort asc`"
+                :dictCode="`nu_config_service_category,category_name,id,del_flag = 0 order by sort asc`"
                 :ignoreDisabled="true" placeholder="请选择服务类别" allow-clear />
             </a-form-item>
           </a-col>
@@ -17,7 +17,7 @@
             <a-form-item name="typeId">
               <template #label><span title="服务类型">服务类型</span></template>
               <j-dict-select-tag type="list" v-model:value="queryParam.typeId"
-                :dictCode="`config_service_type,type_name,id,del_flag = 0 order by sort asc`" placeholder="请选择服务类型"
+                :dictCode="`nu_config_service_type,type_name,id,del_flag = 0 order by sort asc`" placeholder="请选择服务类型"
                 :ignoreDisabled="true" allowClear />
             </a-form-item>
           </a-col>

src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue

@@ -9,7 +9,7 @@
               <a-form-item label="服务类别" v-bind="validateInfos.categoryId" id="ConfigServiceDirectiveForm-categoryId"
                 name="categoryId">
                 <j-dict-select-tag type="list" v-model:value="formData.categoryId"
-                  :dictCode="`config_service_category,category_name,id,del_flag = 0 order by sort asc`"
+                  :dictCode="`nu_config_service_category,category_name,id,del_flag = 0 order by sort asc`"
                   placeholder="请选择服务类别" allow-clear />
               </a-form-item>
             </a-col>
@@ -99,7 +99,7 @@
               <a-form-item label="指令标签" id="ConfigServiceDirectiveForm-typeId" :labelCol="labelCol2"
                 :wrapperCol="wrapperCol2" name="typeId">
                 <JCheckbox v-model:value="formData.tags"
-                  :dictCode="`config_directive_tag,tag_name,id,del_flag = 0 order by sort asc`" />
+                  :dictCode="`nu_config_directive_tag,tag_name,id,del_flag = 0 order by sort asc`" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -282,9 +282,9 @@ watch(
   (newCategoryId) => {
     if (!newCategoryId) {
       formData.typeId = '';
-      typeDictCode.value = 'config_service_type,type_name,id,del_flag = 99 order by sort asc';
+      typeDictCode.value = 'nu_config_service_type,type_name,id,del_flag = 99 order by sort asc';
     } else {
-      typeDictCode.value = `config_service_type,type_name,id,del_flag = 0 and category_id = '${newCategoryId}' order by sort asc`;
+      typeDictCode.value = `nu_config_service_type,type_name,id,del_flag = 0 and category_id = '${newCategoryId}' order by sort asc`;
     }
   }
 );

src/views/config/serviceType/ConfigServiceTypeList.vue

@@ -9,7 +9,7 @@
             <a-form-item name="categoryId">
               <template #label><span title="服务类别">服务类别</span></template>
               <j-dict-select-tag type='list' v-model:value="queryParam.categoryId"
-                :dictCode="`config_service_category,category_name,id,del_flag = 0 order by sort asc`"
+                :dictCode="`nu_config_service_category,category_name,id,del_flag = 0 order by sort asc`"
                 :ignoreDisabled="true" placeholder="请选择服务类别" allowClear />
             </a-form-item>
           </a-col>

src/views/config/serviceType/components/ConfigServiceTypeForm.vue

@@ -9,7 +9,7 @@
               <a-form-item label="服务类别" v-bind="validateInfos.categoryId" id="ConfigServiceTypeForm-categoryId"
                 name="categoryId">
                 <j-dict-select-tag type='list' v-model:value="formData.categoryId"
-                  :dictCode="`config_service_category,category_name,id,del_flag = 0 order by sort asc`"
+                  :dictCode="`nu_config_service_category,category_name,id,del_flag = 0 order by sort asc`"
                   placeholder="请选择服务类别" allowClear />
               </a-form-item>
             </a-col>