Bladeren bron

fix: remark表示政府级别下辖公司的经纬度

sunhongyao341504 2 jaren geleden
bovenliggende
commit
4924c233b6

+ 2 - 2
package.json

@@ -8,7 +8,7 @@
     "serve": "pnpm run dev",
     "dev": "vite",
     "createConfig": "esno ./build/script/postBuild.ts",
-    "build": "cross-env NODE_ENV=production vite build && npm run publish ",
+    "build": "cross-env NODE_ENV=production vite build",
     "build:test": "cross-env vite build --mode test && esno ./build/script/postBuild.ts",
     "build:no-cache": "pnpm clean:cache && pnpm run build",
     "report": "cross-env REPORT=true pnpm run build",
@@ -163,4 +163,4 @@
       ]
     }
   }
-}
+}

+ 2 - 1
src/layout/components/Header/index.vue

@@ -269,7 +269,8 @@
   const getPLUrl = () => urlJoin(location.origin, '/skyeye-world/');
 
   const getUsername = computed(() => {
-    return userStore.getUserInfo.username;
+    // return userStore.getUserInfo.username;
+    return userStore.getUserInfo.nickname;
   });
 
   const getTenantName = computed(() => {

+ 9 - 0
src/views/system-config/scene-manage/CompanyDrawer.vue

@@ -74,6 +74,9 @@
             ></div>
           </div>
         </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="ruleForm.remark" style="width: 200px" />
+        </el-form-item>
         <el-form-item label="状态">
           <el-switch
             v-model="ruleForm.addEnable"
@@ -125,6 +128,7 @@
       seniorScene?: string;
       addEnable?: ENABLED;
       selectItems?: SelectItemType[];
+      remark: string;
     };
   }>();
 
@@ -153,6 +157,7 @@
     templateWorkshop?: number; //车间模板
     selectItems?: SelectItemType[];
     addEnable?: ENABLED;
+    remark?: string; //备注,可用于添加经纬度,非必要
   }
 
   const ruleForm = reactive<RuleForm>({
@@ -166,6 +171,7 @@
     templateWorkshop: undefined,
     selectItems: [{ tag: '', template: '' }],
     addEnable: ENABLED.TRUE,
+    remark: '',
   });
   const rules = reactive<FormRules>({
     name: [
@@ -196,6 +202,7 @@
       ruleForm.seniorScene = data.seniorScene!;
       ruleForm.addEnable = data.addEnable;
       ruleForm.selectItems = data.selectItems;
+      ruleForm.remark = data.remark;
     },
     { immediate: true },
   );
@@ -261,6 +268,7 @@
           isDeleted: 0,
           parentId: 0,
           serial: 0,
+          remark: ruleForm.remark,
         };
         //提交数据并重置关闭el-draw
         addCompany(newComData)
@@ -327,6 +335,7 @@
         name: ruleForm.name,
         code: ruleForm.code,
         status: Number(ruleForm.addEnable),
+        remark: ruleForm.remark,
       };
       // 编辑上传
       editCompany(editNewCom)

+ 1 - 0
src/views/system-config/scene-manage/SceneManage.vue

@@ -317,6 +317,7 @@
         seniorScene: '顶级场景',
         addEnable: editedItem.value!.status,
         selectItems: selectItems.value,
+        remark: editedItem.value?.remark,
       };
     } else if (level.value === DATA_LEVEL.workshop && 'companyId' in editedItem.value!) {
       showDrawer.value = DrawerType.workshop;