瀏覽代碼

bug修改,边角优化

asd26269546 1 年之前
父節點
當前提交
594391d1df

+ 6 - 3
src/components/byTable/index.vue

@@ -31,8 +31,8 @@
       </select>
       <div v-if="statConfig.length === 1">{{ statConfig[0].label }}</div>
     </div>
-    <div class="more-btn">
-      <span @click="isMore = !isMore" v-if="statWarpHeight > 200">
+    <div class="more-btn"  @click="isMore = !isMore" v-if="statWarpHeight > 200">
+      <span>
         <i v-if="!isMore" class="iconfont icon-btn_xiala22"></i>
         <i v-else class="iconfont icon-btn_shouqi22"></i>
         
@@ -360,7 +360,7 @@ export default defineComponent({
         return item;
       });
     });
-    let isMore = ref(true);
+    let isMore = ref(false);
     const changeStatData = () => {
       statWarpHeight.value = document.getElementById("statWarp").offsetHeight;
     };
@@ -601,6 +601,9 @@ export default defineComponent({
     line-height: 30px;
     text-align: center;
     background: linear-gradient(180deg, rgba(255,255,255,0) 0%, rgba(255,255,255,0.8) 100%);
+    i{
+      color:#999;
+    }
   }
   .title {
     height: 60px;

+ 1 - 1
src/components/notice/index.vue

@@ -84,7 +84,7 @@
 					</el-table-column>
 					<el-table-column prop="address" label="操作">
 						<template #default="scope">
-							<span style="cursor: pointer" @click.stop="readFn(scope)">确认已读</span>
+							<span style="cursor: pointer;color:#0084ff" @click.stop="readFn(scope)">已读</span>
 						</template>
 					</el-table-column>
 				</el-table>

+ 25 - 3
src/components/product/treeList.vue

@@ -27,11 +27,12 @@
         default-expand-all
         :expand-on-click-node="false"
         :filter-node-method="filterNode"
+        :current-node-key="1"
       >
         <template #default="{ node, data }">
           <div class="custom-tree-node">
             <div style="flex: 1">{{ node.label}}</div>
-            <div class="icon-warp" style="float: right; width: 71px; margin-left: 10px" v-show="activeNode == data.id">
+            <div class="icon-warp" style="float: right; width: 71px; margin-left: 10px" v-if="node.label != '全部'" v-show="activeNode == data.id">
               <el-icon :size="17" @click.stop="() => edit(node, data)">
                 <Edit />
               </el-icon>
@@ -102,12 +103,17 @@ const props = defineProps({
     default: [],
   },
 });
-onMounted(() => {});
 const search = ref("");
 const emit = defineEmits(["update:modelValue"]);
 const { proxy } = getCurrentInstance();
-let activeNode = ref('');
+let activeNode = ref('1');
 const treeChange = (e, data) => {
+  let el = document.getElementsByClassName("el-tree")[0].firstElementChild;
+  console.log(el)
+  if(e.id != 1) {
+    //删除el的is-current class name
+    el.classList.remove('is-current')
+  }
   activeNode.value = e.id
   if (proxy.type == "radio") {
     emit("update:modelValue", e.id);
@@ -250,6 +256,22 @@ const handleMouseOver = (data) => {
   console.log(data, "sss");
   // currentNode.id = toRaw(data).id;
 };
+
+//为class为el-tree的第一个子元素添加一个is-current
+const addClass = () => {
+  let el = document.getElementsByClassName("el-tree")[0].firstElementChild;
+  if(proxy.data.length > 0) {
+    el.classList.add("is-current");
+  } else{
+    setTimeout(() => {
+      addClass();
+    }, 300);
+  }
+};
+onMounted(() => {
+  addClass();
+});
+
 </script>
 
 <style lang="scss">

+ 4 - 0
src/views/system/langConfig/index.vue

@@ -274,6 +274,9 @@ const submitForm = () => {
 		let obj = submitData.value.app.en
 		for (let i = 0; i < keyArr.length; i++) {
 			const element = keyArr[i]
+			if(!obj[element]) {
+				obj[element] = {}
+			}
 			if (i == keyArr.length - 1) {
 				obj[element] = enText
 			} else {
@@ -290,6 +293,7 @@ const submitForm = () => {
 
 const getDtl = (row) => {
 	formData.data = { ...row}
+	console.log(formData)
 	modalType.value = 'edit'
 	dialogVisible.value = true