用户管理-换项目列表接口、公式配置-判断里选择参数模式调回以前

public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20251118174301"
+  "value": "20251124115142"
 }

scripts/cache.json

@@ -0,0 +1,8 @@
+{
+  "target11": "http://127.0.0.1:8090",
+
+  "target": "http://192.168.0.109:8090",
+  "dev": {
+    "port": 1888
+  }
+}

src/config/index.json

@@ -1,8 +1,10 @@
 {
+  "target11": "http://127.0.0.1:8090",
   "target": "http://127.0.0.1:8090",
-
-  "target11": "http://192.168.0.109:8090",
   "dev": {
     "port": 1888
-  }
-}
+  },
+  "version": "20251124115142",
+  "smsPhone": "",
+  "vite": {}
+}

src/views/formula/edit.vue

@@ -1,5 +1,6 @@
 <template>
   <basic-container>
+    <!-- 项目级和系统级 节点公式 -->
     <div class="flex flex-d-c h-100p">
       <div class="box-dashed flex jc-sb">
         <div class="flex">
@@ -99,8 +100,6 @@
                       <div class="ele-box">
                         <span v-if="item.k">{{ item.name }}</span>
                         <span v-else>{{ item.eName }}</span>
-
-
                         <el-checkbox v-model="item.checked" @change="value => eleChang(value, item)"></el-checkbox>
                       </div>
                     </el-col>
@@ -265,14 +264,14 @@
                         :value="item.pkeyId"></el-option>
                     </el-select>
                     <!-- 搜索元素下拉框 -->
-                    <el-select v-model="input3" filterable placeholder="搜索元素字段888" @change="getInput1" style="width:45%"
+                    <el-select v-model="input3" filterable placeholder="搜索元素字段" @change="getInput1" style="width:45%"
                       size="small">
                       <el-option v-for="item in eleListComp1" :key="item.id" :label="item.eName" :value="item.eName">
                       </el-option>
                     </el-select>
                   </div>
 
-                  <!-- <div class="mg-t-10 mg-b-10 no-mb-col" style="width:100%">
+                  <div class="mg-t-10 mg-b-10 no-mb-col" style="width:100%">
                     <el-scrollbar style="height:520px;">
                       <el-row>
                         <el-col :span="6" v-for="item in eleListComp" :key="item.id">
@@ -284,8 +283,8 @@
                         </el-col>
                       </el-row>
                     </el-scrollbar>
-                  </div> -->
-                  <div class="mg-t-10 no-mb-col flex1">
+                  </div>
+                  <!-- <div class="mg-t-10 no-mb-col flex1">
                     <el-scrollbar style="height: 520px">
 
                       <tableFormWrite :pkeyId="eleTableIdComp"
@@ -293,7 +292,7 @@
                         :initTableName="initTableNameComp" :key="2" :container-id="'excel-container-2'"
                         :selectedTableKey="selectedTableKeyComp"></tableFormWrite>
                     </el-scrollbar>
-                  </div>
+                  </div> -->
                 </div>
               </div>
             </template>

src/views/formula/edit1.vue

@@ -1,5 +1,6 @@
 <template>
   <basic-container>
+  <!-- 项目级和系统级 全局公式 -->
   <div class="flex flex-d-c h-100p">
     <div class="box-dashed flex jc-sb">
       <div class="flex">

src/views/system/user.vue

@@ -186,7 +186,7 @@ import {
   unlock,
   removeUserProjectInfoAndRoleById,
 } from "@/api/system/user";
-import { getProjectList } from "@/api/manager/projectinfo";
+import { getProjectList, getProjectListPage } from "@/api/manager/projectinfo";
 
 import {
   findContractByProjectId,
@@ -1137,7 +1137,7 @@ export default {
     },
     async getProjectList() {
       //项目类型
-      const { data: res } = await getProjectList(1, 999);
+      const { data: res } = await getProjectListPage(1, 999);
       console.log(res);
       if (res.code === 200) {
         this.projectData = res.data.records;