Bladeren bron

fix: 导入指标

ystl_myq 7 maanden geleden
bovenliggende
commit
096f12c28e

+ 1 - 0
package.json

@@ -79,6 +79,7 @@
     "vue-router": "^4.3.0",
     "vue-tippy": "^6.4.1",
     "vue-types": "^5.1.1",
+    "vxe-table": "^4.6.23",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {

+ 24 - 0
pnpm-lock.yaml

@@ -95,6 +95,9 @@ importers:
       vue-types:
         specifier: ^5.1.1
         version: 5.1.1(vue@3.4.21(typescript@5.4.3))
+      vxe-table:
+        specifier: ^4.6.23
+        version: 4.6.23(vue@3.4.21(typescript@5.4.3))
       xlsx:
         specifier: ^0.18.5
         version: 0.18.5
@@ -1731,6 +1734,9 @@ packages:
   dom-serializer@2.0.0:
     resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
 
+  dom-zindex@1.0.6:
+    resolution: {integrity: sha512-FKWIhiU96bi3xpP9ewRMgANsoVmMUBnMnmpCT6dPMZOunVYJQmJhSRruoI0XSPoHeIif3kyEuiHbFrOJwEJaEA==}
+
   domelementtype@2.3.0:
     resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
 
@@ -3776,6 +3782,11 @@ packages:
       typescript:
         optional: true
 
+  vxe-table@4.6.23:
+    resolution: {integrity: sha512-KPP90EhgjCube+LVzwBVJ1ZWakPE1Hh2AmHL2jBrNHIn9ZBlS6YMXJYZ/omcXbfOIiK4TCmhZJBFxEIOddjRDg==}
+    peerDependencies:
+      vue: ^3.2.28
+
   webpack-sources@3.2.3:
     resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
     engines: {node: '>=10.13.0'}
@@ -3823,6 +3834,9 @@ packages:
     resolution: {integrity: sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
 
+  xe-utils@3.5.31:
+    resolution: {integrity: sha512-oS4yv8qktvlE0wc9yYkitDidEmThc5qN0UTRvKCvrWnejxbTyIxbwfrdZmPKdKGZtB+/U8cEAMFywLJjHtD11A==}
+
   xlsx@0.18.5:
     resolution: {integrity: sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==}
     engines: {node: '>=0.8'}
@@ -5441,6 +5455,8 @@ snapshots:
       domhandler: 5.0.3
       entities: 4.5.0
 
+  dom-zindex@1.0.6: {}
+
   domelementtype@2.3.0: {}
 
   domhandler@4.3.1:
@@ -7540,6 +7556,12 @@ snapshots:
     optionalDependencies:
       typescript: 5.4.3
 
+  vxe-table@4.6.23(vue@3.4.21(typescript@5.4.3)):
+    dependencies:
+      dom-zindex: 1.0.6
+      vue: 3.4.21(typescript@5.4.3)
+      xe-utils: 3.5.31
+
   webpack-sources@3.2.3:
     optional: true
 
@@ -7587,6 +7609,8 @@ snapshots:
       imurmurhash: 0.1.4
       signal-exit: 4.1.0
 
+  xe-utils@3.5.31: {}
+
   xlsx@0.18.5:
     dependencies:
       adler-32: 1.3.1

+ 7 - 0
src/api/indexDefine.ts

@@ -14,6 +14,13 @@ type recordsList = {
   totalRow: number;
   records: Array<any>;
 };
+
+// 分页查询
+export const postAddDisposableQuota = () => {
+  return http.request<QuotaPageList>("post", "/quota/addDisposableQuota", {
+    name: ""
+  });
+};
 // 分页查询
 export const getQuotaPageList = params => {
   return http.request<QuotaPageList>("get", "/quota/getQuotaPageList", {

+ 3 - 2
src/main.ts

@@ -33,7 +33,8 @@ import * as directives from "@/directives";
 Object.keys(directives).forEach(key => {
   app.directive(key, (directives as { [key: string]: Directive })[key]);
 });
-
+import VxeUITable from "vxe-table";
+import "vxe-table/lib/style.css";
 // 全局注册@iconify/vue图标库
 import {
   IconifyIconOffline,
@@ -60,7 +61,7 @@ getPlatformConfig(app).then(async config => {
   await router.isReady();
   injectResponsiveStorage(app, config);
   app.config.globalProperties.$echarts = echarts;
-  app.use(MotionPlugin).use(useElementPlus).use(Table);
+  app.use(MotionPlugin).use(useElementPlus).use(Table).use(VxeUITable);
   // .use(PureDescriptions)
   // .use(useEcharts);
   app.mount("#app");

+ 14 - 2
src/views/draw/children/department/departmentDrank.vue

@@ -19,10 +19,21 @@ import {
 import type { TabsPaneContext } from "element-plus";
 const router = useRouter();
 const activeName = ref("1");
+// 排行榜
+const rankTableRef = ref();
+const chartList = ref([]);
+const getChartsListApi = async () => {
+  const { code, data } = await getChartsList({
+    ...seachParams.value,
+    type: 0
+  });
+  if (code == 200) {
+    rankTableRef.value.init(data, "科室", "姓名");
+  }
+};
 // 柱状图
 const barEchartsRef = ref();
 const radarRef = ref();
-const rankTableRef = ref();
 const barDimEchartsRef = ref();
 const dataList = reactive({
   dimName: []
@@ -51,7 +62,6 @@ const getPersonDimensionChartsListApi = async (
         personListRef.value.init(data);
       } else {
         radarRef.value.initChart(data);
-        rankTableRef.value.init(data, "科室");
       }
     }
   }
@@ -78,6 +88,7 @@ const init = item => {
   seachParams.value = item;
   getPersonDimensionChartsListApi();
   getPersonDimensionChartsRankingApi();
+  getChartsListApi();
   barDimEchartsRef.value.init(seachParams.value, 1);
 };
 // 维度表格
@@ -87,6 +98,7 @@ const handleClick = (tab: TabsPaneContext, event: Event) => {
   if (tab.props.label == "总览") {
     getPersonDimensionChartsListApi();
     getPersonDimensionChartsRankingApi();
+    getChartsListApi();
   } else {
     getPersonDimensionChartsListApi(tab.props.label, tab.props.name);
     getPersonDimensionChartsRankingApi(tab.props.label, tab.props.name);

+ 2 - 2
src/views/draw/children/department/departmentRank.vue

@@ -4,14 +4,14 @@ defineOptions({
 });
 import rankTableDraw from "@/components/rankTable/index.vue";
 import seachData from "./componements/seach.vue";
-import { getPersonDimensionChartsList } from "@/api/draw";
+import { getChartsList } from "@/api/draw";
 
 import { ref } from "vue";
 const rankTableRef = ref();
 const seachParams = ref();
 const lengthData = ref();
 const getPersonDimensionChartsListApi = async () => {
-  const { code, data } = await getPersonDimensionChartsList({
+  const { code, data } = await getChartsList({
     ...seachParams.value,
     type: 1
   });

+ 13 - 0
src/views/draw/children/head/headDrank.vue

@@ -19,6 +19,17 @@ import {
 import type { TabsPaneContext } from "element-plus";
 const router = useRouter();
 const activeName = ref("1");
+// 排行榜
+const chartList = ref([]);
+const getChartsListApi = async () => {
+  const { code, data } = await getChartsList({
+    ...seachParams.value,
+    type: 0
+  });
+  if (code == 200) {
+    rankTableRef.value.init(data, "科室", "姓名");
+  }
+};
 // 柱状图
 const barEchartsRef = ref();
 const radarRef = ref();
@@ -78,6 +89,7 @@ const init = item => {
   seachParams.value = item;
   getPersonDimensionChartsListApi();
   getPersonDimensionChartsRankingApi();
+  getChartsListApi();
   barDimEchartsRef.value.init(seachParams.value, 0);
 };
 // 维度表格
@@ -87,6 +99,7 @@ const handleClick = (tab: TabsPaneContext, event: Event) => {
   if (tab.props.label == "总览") {
     getPersonDimensionChartsListApi();
     getPersonDimensionChartsRankingApi();
+    getChartsListApi();
   } else {
     getPersonDimensionChartsListApi(tab.props.label, tab.props.name);
     getPersonDimensionChartsRankingApi(tab.props.label, tab.props.name);

+ 2 - 2
src/views/draw/children/head/headRank.vue

@@ -4,14 +4,14 @@ defineOptions({
 });
 import rankTableDraw from "@/components/rankTable/draw.vue";
 import seachData from "./componements/seach.vue";
-import { getPersonDimensionChartsList } from "@/api/draw";
+import { getChartsList } from "@/api/draw";
 
 import { ref } from "vue";
 const rankTableRef = ref();
 const seachParams = ref();
 const lengthData = ref();
 const getPersonDimensionChartsListApi = async () => {
-  const { code, data } = await getPersonDimensionChartsList({
+  const { code, data } = await getChartsList({
     ...seachParams.value,
     type: 3
   });

+ 16 - 2
src/views/draw/children/health/healthDrank.vue

@@ -12,7 +12,8 @@ import qvanping from "@/assets/rank/qvanping@2x.png";
 import seachData from "./componements/seach.vue";
 import {
   getPersonDimensionChartsList,
-  getPersonDimensionChartsRanking
+  getPersonDimensionChartsRanking,
+  getChartsList
 } from "@/api/draw";
 import type { TabsPaneContext } from "element-plus";
 const router = useRouter();
@@ -23,6 +24,17 @@ const activeName = ref("1");
 const barEchartsRef = ref();
 const barDimEchartsRef = ref();
 const seachParams = ref();
+// 排行榜
+const chartList = ref([]);
+const getChartsListApi = async () => {
+  const { code, data } = await getChartsList({
+    ...seachParams.value,
+    type: 0
+  });
+  if (code == 200) {
+    rankTableRef.value.init(data, "医疗组");
+  }
+};
 // 雷达图
 const dataList = reactive({
   dimName: []
@@ -50,7 +62,7 @@ const getPersonDimensionChartsListApi = async (
         personListRef.value.init(data);
       } else {
         radarRef.value.initChart(data);
-        rankTableRef.value.init(data, "医疗组");
+        // rankTableRef.value.init(data, "医疗组");
       }
     }
   }
@@ -78,6 +90,7 @@ const init = item => {
   seachParams.value = item;
   getPersonDimensionChartsListApi();
   getPersonDimensionChartsRankingApi();
+  getChartsListApi();
   barDimEchartsRef.value.init(seachParams.value, 0);
 };
 // 维度表格
@@ -87,6 +100,7 @@ const handleClick = (tab: TabsPaneContext, event: Event) => {
   if (tab.props.label == "总览") {
     getPersonDimensionChartsListApi();
     getPersonDimensionChartsRankingApi();
+    getChartsListApi();
   } else {
     getPersonDimensionChartsListApi(tab.props.label, tab.props.name);
     getPersonDimensionChartsRankingApi(tab.props.label, tab.props.name);

+ 2 - 2
src/views/draw/children/health/healthRank.vue

@@ -4,14 +4,14 @@ defineOptions({
 });
 import rankTableDraw from "@/components/rankTable/draw.vue";
 import seachData from "./componements/seach.vue";
-import { getPersonDimensionChartsList } from "@/api/draw";
+import { getPersonDimensionChartsList, getChartsList } from "@/api/draw";
 
 import { ref } from "vue";
 const rankTableRef = ref();
 const seachParams = ref();
 const lengthData = ref();
 const getPersonDimensionChartsListApi = async () => {
-  const { code, data } = await getPersonDimensionChartsList({
+  const { code, data } = await getChartsList({
     ...seachParams.value,
     type: 2
   });

+ 15 - 2
src/views/draw/children/worker/workerDrak.vue

@@ -13,7 +13,8 @@ import qvanping from "@/assets/rank/qvanping@2x.png";
 import seachData from "./componements/seach.vue";
 import {
   getPersonDimensionChartsList,
-  getPersonDimensionChartsRanking
+  getPersonDimensionChartsRanking,
+  getChartsList
 } from "@/api/draw";
 import type { TabsPaneContext } from "element-plus";
 const router = useRouter();
@@ -24,6 +25,17 @@ const activeName = ref("1");
 const barEchartsRef = ref();
 const barDimEchartsRef = ref();
 const seachParams = ref();
+// 排行榜
+const chartList = ref([]);
+const getChartsListApi = async () => {
+  const { code, data } = await getChartsList({
+    ...seachParams.value,
+    type: 0
+  });
+  if (code == 200) {
+    rankTableRef.value.init(data, "科室", "姓名");
+  }
+};
 // 雷达图
 const dataList = reactive({
   dimName: []
@@ -51,7 +63,6 @@ const getPersonDimensionChartsListApi = async (
         personListRef.value.init(data);
       } else {
         radarRef.value.initChart(data);
-        rankTableRef.value.init(data, "科室", "姓名");
       }
     }
   }
@@ -79,6 +90,7 @@ const init = item => {
   seachParams.value = item;
   getPersonDimensionChartsListApi();
   getPersonDimensionChartsRankingApi();
+  getChartsListApi();
   barDimEchartsRef.value.init(seachParams.value, 0);
 };
 // 维度表格
@@ -88,6 +100,7 @@ const handleClick = (tab: TabsPaneContext, event: Event) => {
   if (tab.props.label == "总览") {
     getPersonDimensionChartsListApi();
     getPersonDimensionChartsRankingApi();
+    getChartsListApi();
   } else {
     getPersonDimensionChartsListApi(tab.props.label, tab.props.name);
     getPersonDimensionChartsRankingApi(tab.props.label, tab.props.name);

+ 2 - 2
src/views/draw/children/worker/workerRank.vue

@@ -3,14 +3,14 @@ defineOptions({
   name: "workerRank"
 });
 import rankTableDraw from "@/components/rankTable/index.vue";
-import { getPersonDimensionChartsList } from "@/api/draw";
+import { getPersonDimensionChartsList, getChartsList } from "@/api/draw";
 import seachData from "./componements/seach.vue";
 import { ref } from "vue";
 const rankTableRef = ref();
 const seachParams = ref();
 const lengthData = ref();
 const getPersonDimensionChartsListApi = async () => {
-  const { code, data } = await getPersonDimensionChartsList({
+  const { code, data } = await getChartsList({
     ...seachParams.value,
     type: 0
   });

+ 18 - 6
src/views/evaluate/children/change/components/importIndex.vue

@@ -21,7 +21,16 @@ const indexParams = reactive({
   Relation: {
     dimId: "",
     indId: "",
-    tpId: ""
+    tpId: "",
+    indName: "",
+    scoreRule: "",
+    targetValue: "",
+    finalValue: "",
+    challengeValue: "",
+    startValue: "",
+    datasoure: "",
+    weight: "",
+    scoreValue: ""
   },
   parentList: {}
 });
@@ -45,21 +54,24 @@ const saveDepartment = () => {
     .then(async () => {
       indexParams.tableIndex.forEach(async item => {
         indexParams.Relation.indId = item.id;
+        indexParams.Relation.indName = item.name;
         const { code, msg, data } = await postAddRelationList([
           indexParams.Relation
         ]);
         if (code === 200) {
-          if (data.successList) {
-            $emit("handClickInit", indexParams.parentList);
+          if (data.successList.length > 0) {
+            $emit("handClickInit");
+            console.log("11111", indexParams.parentList);
             ElMessage({
               message: "导入成功",
               type: "success"
             });
           }
-          if (data.failList) {
+          if (data.failList.length > 0) {
+            console.log("11111", data.failList);
             ElMessage({
-              message: "导入失败",
-              type: "success"
+              message: `指标${data.failList[0].indName}重复导入`,
+              type: "error"
             });
           }
         } else {

+ 157 - 75
src/views/evaluate/children/change/components/newAdd.vue

@@ -12,6 +12,7 @@ import { Edit } from "@element-plus/icons-vue";
 import { ElMessageBox, ElMessage } from "element-plus";
 import { postAddRelationList, postUpdateDept } from "@/api/dimension";
 import { useAppStoreHook } from "@/store/modules/app";
+import { addQuota } from "@/api/indexDefine";
 import {
   postAddDimension,
   getDimensionRemove,
@@ -24,7 +25,7 @@ import {
   type DraggableEvent,
   type UseDraggableReturn
 } from "vue-draggable-plus";
-import { delQuota } from "@/api/indexDefine";
+import { delQuota, postAddDisposableQuota } from "@/api/indexDefine";
 import settingIndexDrawer from "./settingIndexDrawer.vue";
 import {
   postAddTemplate,
@@ -88,10 +89,11 @@ const postAddTemplateApi = async () => {
 // 考核维度卡片
 const eaxmCard = ref([]);
 // 获取维度
-const getListByApi = async () => {
-  console.log(tepNameForm.id, "触发getListByApi", tepNameForm);
+const getListByApi = async (id?: number | string) => {
+  eaxmCard.value = [];
   const obj = {
-    tpId: tepNameForm.id
+    tpId: tepNameForm.id,
+    id
   };
   const { code, data, msg } = await getListBy(obj);
   if (code === 200) {
@@ -245,7 +247,6 @@ const deletePen = item => {
       const { code, msg } = await getDimensionRemove(item.id);
       if (code === 200) {
         getListByApi();
-        // getListByApi();
         ElMessage({
           type: "success",
           message: "删除成功"
@@ -272,23 +273,28 @@ const importIndexOne = async row => {
   let formula = JSON.stringify({
     noConditionFormula: ""
   });
-  const res = await postAddRelationList([
-    {
-      dimId: row.id,
-      indId: row.tpId,
-      tpId: "",
-      formula,
-      scoreStandard: 0
+  const { code, data, msg } = await postAddDisposableQuota();
+  if ((code = 200)) {
+    const res = await postAddRelationList([
+      {
+        dimId: row.id,
+        indId: row.tpId,
+        tpId: data.id,
+        formula,
+        scoreStandard: 0
+      }
+    ]);
+    if (res.code === 200) {
+      initializeTableData(row);
+      ElMessage({
+        type: "success",
+        message: "添加成功"
+      });
+    } else {
+      ElMessage.error(res.msg);
     }
-  ]);
-  if (res.code === 200) {
-    initializeTableData(row);
-    ElMessage({
-      type: "success",
-      message: "添加成功"
-    });
   } else {
-    ElMessage.error(res.msg);
+    ElMessage.error(msg);
   }
 };
 // 拖拽
@@ -311,15 +317,7 @@ const onEnd = (e: DraggableEvent) => {
 const onStart = (e: DraggableEvent) => {};
 
 const onUpdate = (e: DraggableEvent) => {};
-// 子表格拖拽
-const postUpdateApi = async (dimId, indId, order) => {
-  await postUpdate({
-    tpId: tepNameForm.id,
-    dimId,
-    indId,
-    order
-  });
-};
+
 // const { start } = useDraggable(elDraggableTableData, eaxmCard.tableData, {
 //   animation: 150,
 //   ghostClass: "ghost",
@@ -337,6 +335,64 @@ const postUpdateApi = async (dimId, indId, order) => {
 //     postUpdateApi(id, item.id, index + 1);
 //   });
 // };
+// 指标更新
+// const postUpdateApi = async (dimId, indId, order) => {
+//   await postUpdate({
+//     tpId: tepNameForm.id,
+//     dimId,
+//     indId,
+//     order
+//   });
+// };
+const postUpdateApi = async () => {
+  const { code, msg } = await postUpdate(indexOf);
+  if (code == 200) {
+    getListByApi(indexOf.dimId);
+    ElMessage.success("编辑成功");
+  } else {
+    ElMessage.error(msg);
+  }
+};
+const indexOf = reactive({
+  id: "",
+  tpId: "",
+  dimId: "",
+  indId: "",
+  valueInput: 0,
+  designatedPersonnel: "",
+  scoreStandard: 0,
+  remark: "",
+  createUser: "",
+  createTime: 0,
+  updateUser: "",
+  updateTime: 0,
+  isDelete: 0,
+  scoreRule: "",
+  targetValue: 0,
+  finalValue: 0,
+  challengeValue: 0,
+  startValue: 0,
+  datasoure: "",
+  weight: 0,
+  scoreValue: 0,
+  formula: "",
+  formulaType: 0,
+  order: 0,
+  indName: ""
+});
+const editConfig = ref<any>({
+  trigger: "click",
+  mode: "cell"
+});
+const tableVxeRef = ref();
+const editClosedEvent = ({ row, column }) => {
+  const $table = tableVxeRef.value;
+  if ($table) {
+    Object.assign(indexOf, row);
+    postUpdateApi();
+  }
+};
+// const aa =
 </script>
 
 <template>
@@ -345,7 +401,7 @@ const postUpdateApi = async (dimId, indId, order) => {
     <importIndex
       ref="importIndexRef"
       v-model="importIndexShow"
-      @handClickInit="initializeTableData"
+      @handClickInit="getListByApi"
     />
     <!-- 指标设置 -->
     <settingIndexDrawer
@@ -446,70 +502,96 @@ const postUpdateApi = async (dimId, indId, order) => {
               </div>
             </template>
 
-            <el-table
-              :data="item.tableData"
-              style="width: 100%"
-              max-height="250"
-            >
-              <el-table-column
-                ref="elDraggableTableData"
-                fixed
-                prop="name"
-                label="指标名称"
-              >
+            <!-- <el-table :data="item.tableData" style="width: 100%" max-height="250">
+              <el-table-column ref="elDraggableTableData" fixed prop="name" label="指标名称">
                 <template #default="{ row }">
                   <div>{{ row.name }}</div>
                 </template>
               </el-table-column>
-              <el-table-column
+              <el-table-column v-if="item.showIndicRemark" prop="remark" label="指标说明" width="120" />
+              <el-table-column v-if="item.showScoreRule" prop="scoreRule" label="评价标准" width="300" />
+              <el-table-column v-if="item.showDatasource" prop="stshowDatasourceate" label="数据来源" width="120" />
+              <el-table-column v-if="item.mode" prop="weight" label="权重" width="120" />
+              <el-table-column v-if="item.showTargetValue" prop="targetValue" label="目标值" width="120" />
+              <el-table-column v-if="item.showFinalValue" prop="finalValue" label="完成值" width="120" />
+              <el-table-column v-if="item.showChallengeValue" prop="challengeValue" label="挑战值" width="120" />
+              <el-table-column v-if="item.showStartValue" prop="startValue" label="门槛值" width="120" />
+              <el-table-column fixed="right" label="操作">
+                <template #default="{ row }">
+                  <el-icon class="mr-3" @click="settingIndex(row)">
+                    <Setting />
+                  </el-icon>
+                  <el-icon @click="deleteRow(row)">
+                    <Delete class="text-red-500" />
+                  </el-icon>
+                </template>
+              </el-table-column>
+            </el-table> -->
+            <vxe-table
+              ref="tableVxeRef"
+              border
+              show-overflow
+              :edit-config="editConfig"
+              :data="item.tableData"
+              max-height="250"
+              @edit-closed="editClosedEvent"
+            >
+              <vxe-column
+                field="name"
+                fixed
+                title="指标名称"
+                :edit-render="{ name: 'input' }"
+              />
+              <vxe-column
                 v-if="item.showIndicRemark"
-                prop="remark"
-                label="指标说明"
-                width="120"
+                field="remark"
+                title="指标说明"
+                :edit-render="{ name: 'input' }"
               />
-              <el-table-column
+              <vxe-column
                 v-if="item.showScoreRule"
-                prop="scoreRule"
-                label="评价标准"
+                field="scoreRule"
+                title="评价标准"
+                :edit-render="{ name: 'input' }"
                 width="300"
               />
-              <el-table-column
+              <vxe-column
                 v-if="item.showDatasource"
-                prop="stshowDatasourceate"
-                label="数据来源"
-                width="120"
+                field="stshowDatasourceate"
+                title="数据来源"
+                :edit-render="{ name: 'input' }"
               />
-              <el-table-column
+              <vxe-column
                 v-if="item.mode"
-                prop="weight"
-                label="权重"
-                width="120"
+                field="weight"
+                title="权重"
+                :edit-render="{ name: 'input' }"
               />
-              <el-table-column
+              <vxe-column
                 v-if="item.showTargetValue"
-                prop="targetValue"
-                label="目标值"
-                width="120"
+                field="targetValue"
+                title="目标值"
+                :edit-render="{ name: 'input' }"
               />
-              <el-table-column
+              <vxe-column
                 v-if="item.showFinalValue"
-                prop="finalValue"
-                label="完成值"
-                width="120"
+                field="finalValue"
+                title="完成值"
+                :edit-render="{ name: 'input' }"
               />
-              <el-table-column
+              <vxe-column
                 v-if="item.showChallengeValue"
-                prop="challengeValue"
-                label="挑战值"
-                width="120"
+                field="challengeValue"
+                title="挑战值"
+                :edit-render="{ name: 'input' }"
               />
-              <el-table-column
+              <vxe-column
                 v-if="item.showStartValue"
-                prop="startValue"
-                label="门槛值"
-                width="120"
+                field="startValue"
+                title="门槛值"
+                :edit-render="{ name: 'input' }"
               />
-              <el-table-column fixed="right" label="操作">
+              <vxe-column field="age" fixed="right" title="操作">
                 <template #default="{ row }">
                   <el-icon class="mr-3" @click="settingIndex(row)">
                     <Setting />
@@ -518,8 +600,8 @@ const postUpdateApi = async (dimId, indId, order) => {
                     <Delete class="text-red-500" />
                   </el-icon>
                 </template>
-              </el-table-column>
-            </el-table>
+              </vxe-column>
+            </vxe-table>
             <template #footer>
               <el-button
                 type="primary"

+ 4 - 4
src/views/login/index.vue

@@ -42,10 +42,10 @@ dataThemeChange();
 const { title, toggleSideBar } = useNav();
 
 const ruleForm = reactive({
-  // username: "",
-  // password: ""
-  username: "admin",
-  password: "123456"
+  username: "",
+  password: ""
+  // username: "admin",
+  // password: "123456"
 });
 const handleBlur = () => {
   // @ts-ignore