fix:修改字数限制

This commit is contained in:
lixg
2022-12-09 08:51:42 +08:00
parent 7d47445b7a
commit f526d740c3
4 changed files with 65 additions and 53 deletions

View File

@@ -1,27 +1,27 @@
<template>
<div id="container" v-if="!isLogin">
<nav-top/>
<nav-top />
<div style="display: flex">
<nav-left/>
<nav-left />
<div style="flex: 1; display: flex; flex-direction: column; width: 0">
<open-pages/>
<bread-crumb/>
<open-pages />
<bread-crumb />
<main>
<a-config-provider :locale="zhCN">
<router-view/>
<router-view />
</a-config-provider>
</main>
</div>
</div>
</div>
<div id="container" v-if="isLogin">
<router-view/>
<router-view />
</div>
</template>
<script>
import {computed, defineComponent, ref, watch} from "vue";
import {useRouter, useRoute} from "vue-router";
import {useStore} from "vuex";
import { computed, defineComponent, ref, watch } from "vue";
import { useRouter, useRoute } from "vue-router";
import { useStore } from "vuex";
import NavLeft from "@/components/NavLeft";
import NavTop from "@/components/NavTop";
import OpenPages from "@/components/OpenPages";
@@ -44,15 +44,15 @@ export default defineComponent({
const store = useStore();
const isLogin = ref(false);
// console.log("router", router.getRoutes(), route);
console.log("版本0.9.6------------");
console.log("版本0.9.7------------");
const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink);
});
watch(
() => route.path,
() => {
route.path === "/login" && (isLogin.value = true);
}
() => route.path,
() => {
route.path === "/login" && (isLogin.value = true);
}
);
const currentRouteName = computed(() => route.name);
@@ -78,8 +78,8 @@ export default defineComponent({
return;
}
const memberInitInfo = await api1
.getMemberInfo({keyWord: "", pageNo: 1, pageSize: 10})
.then((res) => res.data.data.rows);
.getMemberInfo({ keyWord: "", pageNo: 1, pageSize: 10 })
.then((res) => res.data.data.rows);
store.commit("SET_MEMBER_INFO", memberInitInfo);
localStorage.setItem("memberInitInfo", JSON.stringify(memberInitInfo));
}
@@ -94,23 +94,23 @@ export default defineComponent({
if (localStory) {
list = localStorage.getItem(key);
if (list) {
store.commit("SET_DICT", {key, data: JSON.parse(list)});
store.commit("SET_DICT", { key, data: JSON.parse(list) });
return;
}
}
list = await getDictList(key);
localStory && localStorage.setItem(key, JSON.stringify(list));
store.commit("SET_DICT", {key, data: list});
store.commit("SET_DICT", { key, data: list });
}
const getDictList = (param) =>
api1
.getDict({
pageNo: 1,
pageSize: 20,
setCode: param,
})
.then((res) => res.data.data.rows);
api1
.getDict({
pageNo: 1,
pageSize: 20,
setCode: param,
})
.then((res) => res.data.data.rows);
//获取组织树
const getOrgTree = () => {
const orgtreeList = localStorage.getItem("orgtreeList");
@@ -118,16 +118,17 @@ export default defineComponent({
store.commit("getOrgtreeList", JSON.parse(orgtreeList));
return;
}
api.getOrgInfo({
keyWord: "",
id: -1,
pageNo: 1,
pageSize: 20,
})
.then((res) => {
localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
store.commit("getOrgtreeList", res.data.data);
})
api
.getOrgInfo({
keyWord: "",
id: -1,
pageNo: 1,
pageSize: 20,
})
.then((res) => {
localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
store.commit("getOrgtreeList", res.data.data);
});
};
init();
return {
@@ -144,7 +145,7 @@ export default defineComponent({
// font-family: MicrosoftYaHei, Microsoft YaHei, Avenir, Helvetica, Arial,
// sans-serif;
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
Microsoft YaHei, Arial, sans-serif;
Microsoft YaHei, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
color: #2c3e50;

View File

@@ -632,7 +632,7 @@
<div style="width: 5px; display: inline-block"></div>
<span class="yi"></span>
<span class="zon">列表选项总数</span>
<span class="th">{{ tableDataTotal }}</span>
<span class="th">{{ stuTotal }}</span>
<span class="yi"> </span>
</div>
</div>
@@ -1405,6 +1405,7 @@ export default {
docChecked: true,
currentPage: 1,
tableDataTotal: -1,
stuTotal: 0,
pageSize: 10,
visiblene: false,
sh: false,
@@ -1739,6 +1740,7 @@ export default {
console.log("获取学员列表", res);
let data = res.data.data.rows || null;
state.tableDataTotal = res.data.data.total;
state.stuTotal = res.data.data.total;
state.tableData = [];
if (data.length) {
for (let i in data) {

View File

@@ -593,7 +593,6 @@
style="
width: 120px;
text-align: center;
text-align: center;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;

View File

@@ -606,7 +606,16 @@
</div>
</div>
</div>
<div style="width: 120px; text-align: center">
<div
style="
width: 120px;
text-align: center;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
"
:title="element.creater"
>
{{ element.creater }}
</div>
<div style="width: 120px; text-align: center">
@@ -1402,25 +1411,23 @@ export default {
};
array.push(obj);
});
console.log(array)
if(array[0].id=='0'){
console.log(array);
if (array[0].id == "0") {
state.level = [];
// state.tableData = array[0]
// 当无阶段任务出现时 显示当前数据
if(array[0].taskList.length!==0){
getTableData(array[0].taskList)
if (array[0].taskList.length !== 0) {
getTableData(array[0].taskList);
}
}else{
let datearr = []
for(let i=0;i<array.length;i++){
if(array[i].id!==0&&array[i].taskList.length!==0){
datearr.push(array[i])
} else {
let datearr = [];
for (let i = 0; i < array.length; i++) {
if (array[i].id !== 0 && array[i].taskList.length !== 0) {
datearr.push(array[i]);
}
}
state.level = datearr;
}
};
const tableDataFunc = () => {
@@ -1557,12 +1564,15 @@ export default {
api
.templateDetail(localStorage.getItem("projectTemplateId"))
.then((res) => {
console.log('获取的任务列表信息',res)
console.log("获取的任务列表信息", res);
if (res.status == 200) {
console.log("22222", res.data.data.stageList);
state.projectTitle = res.data.data.projectTemplateInfo.name;
state.picUrl = res.data.data.projectTemplateInfo.picUrl;
let leng = res.data.data.stageList[0].name!==null ?res.data.data.stageList.length:0;
let leng =
res.data.data.stageList[0].name !== null
? res.data.data.stageList.length
: 0;
if (leng > 0) {
let stage = localStorage.getItem("templateStageId")
? localStorage.getItem("templateStageId")
@@ -1816,7 +1826,7 @@ export default {
"0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
});
const showDrawerOnline = (id, eleId) => {
console.log(id, eleId)
console.log(id, eleId);
state.addonlinevisible = true;
state.EditOnlineId = id;
state.projectTaskId = eleId;