bill 8 months ago
parent
commit
d4fe8d541a

File diff suppressed because it is too large
+ 5 - 0
src/assets/help.svg


+ 11 - 1
src/components/dialog/index.vue

@@ -3,7 +3,10 @@
     <div class="dialog-bg" v-if="show">
       <div class="dialog" :style="{ width: width + 'px' }">
         <div class="head">
-          <h3>{{ title }}</h3>
+          <h3>
+            <template v-if="typeof title === 'string'">{{ title }}</template>
+            <component :is="title" v-else />
+          </h3>
           <el-icon @click="closeHandle" v-if="showClose || cornerClose">
             <Close />
           </el-icon>
@@ -66,3 +69,10 @@ if (!showFloor.value && !props.notSubmit) {
 <style lang="scss" scoped>
 @import "./style.scss";
 </style>
+
+<style lang="scss">
+.dialog .head h3 span {
+  display: inline-flex;
+  align-items: center;
+}
+</style>

+ 3 - 1
src/components/dialog/type.ts

@@ -1,6 +1,8 @@
+import { VNode } from "vue";
+
 export type DialogProps = {
   show?: boolean;
-  title: string;
+  title: string | (() => VNode);
   hideFloor?: boolean;
   notSubmit?: boolean,
   enterText?: string;

+ 1 - 1
src/view/artifacts/addArtifacts.vue

@@ -48,7 +48,7 @@ if (props.data) {
 }
 
 defineExpose<QuiskExpose>({
-  title: computed(() => `新增文物`),
+  title: computed(() => `${props.data ? "修改" : "新增"}文物`),
   async submit() {
     if (!data.value.artifactName.trim()) {
       ElMessage.error({ message: "请填写文物名称" });

+ 1 - 1
src/view/artifacts/index.vue

@@ -43,7 +43,7 @@
           <TexToolTip :text="row.createTime.substr(0, 16)" v-if="row.createTime" />
         </el-table-column>
         <el-table-column prop="userName" label="创建人" v-slot:default="{ row }">
-          <TexToolTip :text="row.createBy" />
+          <TexToolTip :text="row.createByName" />
         </el-table-column>
 
         <el-table-column label="操作" width="240" fixed="right">

+ 17 - 1
src/view/quisk.ts

@@ -7,6 +7,10 @@ import OrganizationEdit from "./organization-edit.vue";
 import UsersAdd from "./users-add.vue";
 import UsersEdit from "./users-edit.vue";
 import UsersPasswordEdit from "./users-password-edit.vue";
+import { h } from "vue";
+import { ElIcon, ElTooltip } from "element-plus";
+import Help from '@/assets/help.svg'
+
 
 export const relicsEdit = quiskMountFactory(RelicsEdit, {
   title: "创建文物",
@@ -18,7 +22,19 @@ export const deviceEdit = quiskMountFactory(DeviceEdit, {
 });
 
 export const selectScenes = quiskMountFactory(SceneSelect, {
-  title: "选择场景",
+  title: () =>
+    h("span", null, [
+      "选择场景",
+      h(
+        ElTooltip,
+        {
+          effect: "dark",
+          content: "请添加相同相机类型且点位数量一致的场景",
+          placement: "top",
+        },
+        [h(ElIcon, null, [h(Help)])]
+      ),
+    ]),
   width: 1000,
 });
 

+ 2 - 0
src/view/relics-scene/index.vue

@@ -117,6 +117,7 @@ watch(relicsId, fetchScenes, { immediate: true });
   padding: 0 20px;
   height: 40px;
   border-radius: 20px;
+
   display: flex;
   align-items: center;
   background: rgba(26, 26, 26, 0.8);
@@ -146,6 +147,7 @@ watch(relicsId, fetchScenes, { immediate: true });
 }
 
 .split-screen {
+  flex: 0 0 auto;
   margin-left: 16px;
   display: flex;
   align-items: center;