1

zkqy-ui/.env.development

@@ -8,33 +8,16 @@ ENV = 'development'
 VUE_APP_BASE_API = '/dev-api'
 
 # 图片路径
-VUE_APP_BASE_IMG_API = 'http://localhost:1025/dev-api'
+VUE_APP_BASE_IMG_API = 'http://192.168.10.8:1025/dev-api'
+# VUE_APP_BASE_IMG_API = 'http://localhost:1025/dev-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
 #本项目地址
-VUE_APP_BASE_API1 = 'http://localhost:8066/'
+VUE_APP_BASE_API1 = 'http://192.168.10.8:8066/'
+# VUE_APP_BASE_API1 = 'http://localhost:8066/'
 
 # ws地址
 VUE_APP_BASE_WS_API = '//127.0.0.1:8721'
-# 页面标题
-VUE_APP_TITLE = 后台管理系统
-
-# 开发环境配置
-ENV = 'development'
 
-# 管理系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
-
-# 图片路径
-VUE_APP_BASE_IMG_API = 'http://localhost:1025/dev-api'
-
-# 路由懒加载
-VUE_CLI_BABEL_TRANSPILE_MODULES = true
-
-#本项目地址
-VUE_APP_BASE_API1 = 'http://localhost:8066/'
-
-# ws地址
-VUE_APP_BASE_WS_API = '//127.0.0.1:8721'

zkqy-ui/src/api/treeTableList/commonTable.js

@@ -8,7 +8,7 @@ export function getTreeData(query) {
   return request({
     url,
     method: 'get',
-    // params: query,s
+    // params: query,
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }

zkqy-ui/src/views/login.vue

@@ -310,7 +310,7 @@ export default {
             // uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.128.171:8066/oauth/callback",//实验室
             // uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.2.135:8066/oauth/callback",//铨一
             // uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.3.17:8066/oauth/callback",//化纤
-             uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.10.6:8066/oauth/callback",//hmc
+             uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.10.8:8066/oauth/callback",//hmc
              //uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.110.182:8066/oauth/callback",//lth
             ...this.loginForm,
             tenantID: this.tenantId,

zkqy-ui/src/views/tablelist/commonTable/listTreeInfo.vue

@@ -424,10 +424,10 @@ export default {
       //存放html代码块
       iframeUrl: "",
       FormListDefaultValue: {}, //表单组的默认表单数据
-
     };
   },
   created() {
+    console.log('[123455]')
     // 得到当前展示的table的唯一标识
     // this.treeData = []
     this.tableKey = this.$route.query.tableKey;
@@ -448,28 +448,42 @@ export default {
           const templateData = JSON.parse(res.data.template);
           this.templateData = templateData
           const data = JSON.parse(res.data.data);
-          console.log('[Template Data]', templateData);
+          console.log('[Template Data1]', templateData);
           console.log('[Data]', data);
           if (templateData && data) {
             this.treeData = data
-            this.defaultProps.label = templateData.treeShowLabel
+            // this.treeTableCondition = templateData?.TableCondition
 
+            // this.defaultProps.label = templateData.treeShowLabel
           }
         }
       })
-
     },
     handleNodeClick(data) {
-      console.log('treeData', data);
-      console.log('[tableList]',this.tableList)
-
+      console.log('--------------------1--------------------------');
+      // this.querymap.warehouse_name = '一号仓库'
+      console.log('data', data);
+      console.log('templateData', this.templateData);
+      console.log('----------------------------------------------');
+      console.log('treeTableCondition', this.templateData.treeTableCondition);
+      let columnValue = this.templateData?.treeTableCondition == 'name' ? data.name : data.label
+      let treeQueryMap = {
+        columnName: this.templateData.treeTableJoinTableCondition,
+        columnValue: columnValue
+      }
+      console.log('treeQueryMap', treeQueryMap)
+      console.log('queryParams', this.queryParams)
+      // let 
+      // console.log('[tableList]',this.tableList)
+      // this.queryParams
     },
     isUpperCase(char) {
       return char === char.toUpperCase();
     },
 
     getList(queryParams) {
-      console.log('queryParams',queryParams)
+      console.log('queryParams', queryParams)
+      // if(queryParams.treeQueryMap){}
       this.loading = true;
       // 序列化当前查询参数列表
       queryParams && (this.queryParams.queryMap = Object.assign({}, queryParams.queryMap));
@@ -500,7 +514,15 @@ export default {
               (item) => item.btnGroupType == "top"
             ) || [];
           this.calcuteExcuteCol();
-          this.$nextTick(() => this.$refs.tableRef.doLayout());
+          // this.$nextTick(() => this.$refs.tableRef.doLayout());
+          // 确保DOM更新完成，并且检查this.$refs.tableRef是否存在
+          this.$nextTick(() => {
+            if (this.$refs.tableRef && typeof this.$refs.tableRef.doLayout === 'function') {
+              this.$refs.tableRef.doLayout();
+            } else {
+              console.warn('tableRef 或 doLayout 方法不可用');
+            }
+          });
           this.queryParams.orderByColumn =
             res.data.resultMap.querySql.orderByColumn;
           this.sortOrder = JSON.parse(res.data.resultMap.querySql.sortOrder);

zkqy-ui/vue.config.js

@@ -43,7 +43,7 @@ module.exports = {
         // target: `http://192.168.2.135:8066`, //铨一开发
         // target: `http://192.168.3.17:8066`, //化纤服务器
         // target: `http://192.168.110.182:8066`, //lth
-         target: `http://192.168.10.6:8066`, //hmc
+         target: `http://192.168.10.8:8066`, //hmc
         // target: `http://175.27.169.173:8066`,//公网服务器
         changeOrigin: true,
         pathRewrite: {