flx：提交多选和新能源智慧基建配置

2024-11-11 14:34:13 +08:00 · 2024-11-11 14:34:13 +08:00 · ad83d1accd
commit ad83d1accd
parent c0465426a2
5 changed files with 97 additions and 21 deletions
--- a/public/js/config.js
+++ b/public/js/config.js
@ -1,5 +1,5 @@
 //-------项目配置标识-------
-var COMPANY = ""; //通用
+// var COMPANY = ""; //通用
 // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业
 // var COMPANY='hezhan'; //合展-宿迁
 // var COMPANY='nanchang'; //南昌地铁、衢州
@ -18,7 +18,7 @@ var COMPANY = ""; //通用
 // COMPANY = 'jlw'//金林湾
 // COMPANY = 'shzj' //上海张江
 // COMPANY = 'shjg'//上海优益（上海建工）
-// COMPANY = "agjt"; //鞍钢集团
+COMPANY = "agjt"; //鞍钢集团
 // COMPANY = 'zkax' //中科安信
 // COMPANY = 'hfqc' //乌丹站舍(合肥启程)
 // COMPANY = 'mulei'   //木垒
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@ -179,8 +179,8 @@ if (process.env.NODE_ENV == "development") {
    // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
    // axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地
    // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
-    // axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地
-    axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
+    axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地
+    // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
    // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
    // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
    // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
--- a/src/store/index.js
+++ b/src/store/index.js
@ -46,6 +46,9 @@ export default new Vuex.Store({

    state: {
        PAGESIZRS: [10, 20, 30, 50],
+        // UPLOADURL: "http://121.37.106.37:9809/upload/image/", // 新能源智慧基建
+        // FILEURL: "http://121.37.106.37:9809/image/", //新能源智慧基建
+        // WORKFLOWURL: 'http://121.37.106.37:19998/#/workspace/forms', //鞍钢平台工作流地址
        // UPLOADURL: "http://222.80.185.228:6090/upload/image/", // 木垒
        // FILEURL: "http://222.80.185.228:6090/image/", //木垒
        // UPLOADURL: 'http://192.168.9.249:9820/upload/image/', // 四川网城
@ -62,22 +65,22 @@ export default new Vuex.Store({
        // FILEURL:'http://182.90.224.237:51234/image/',
        // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
        // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
-        // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
-        // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
+        UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
+        FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
        // WORKFLOWURL: "http://101.43.164.214:11129/#/workspace/forms", //jiayu工作流地址(本地)
        // WORKFLOWURL: "http://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地)
        // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
-        // WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地)
+        WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地)
        CONTRACTORURL: process.env.NODE_ENV == "development" ? "http://192.168.34.129:5174/#/contractorApply" : `${window.location.protocol}//${window.location.host}/contractorApply/index.html#/contractorApply`, //罗峰承包商入场地址(本地)
        CONTRACTORURL2: process.env.NODE_ENV == "development" ? "http://192.168.34.175:88/#/workspace/contractorApply" : `${window.location.protocol}//${window.location.host}/contractorApply/index.html#/workspace/contractorApply`, //罗峰承包商入场地址(本地)
        // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
        // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
        // UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试
        // FILEURL: 'http://42.180.188.17:11211/image/', //测试
-        BASEURL: baseUrl ?
-            baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境
-        UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
-        FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
+        // BASEURL: baseUrl ?
+        //     baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境
+        // UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
+        // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
        // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
        // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
        // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址
--- a/src/views/projectFront/configManage/personnelAccess.vue
+++ b/src/views/projectFront/configManage/personnelAccess.vue
@ -320,6 +320,23 @@
              </el-option>
            </el-select>
          </el-form-item>
+          <el-form-item label="选择企业" prop="enterpriseId">
+            <el-select
+              v-model="addEditForm.enterpriseId"
+              :placeholder="$t('message.laborDev.allCompany')"
+              filterable
+              clearable
+              @change="selectValFn"
+            >
+              <el-option
+                :label="item.enterpriseName"
+                :value="item.id"
+                v-for="(item, index) in enterpriseListData"
+                :key="index"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
          <el-form-item
            :label="$t('message.personnelAccess.Labname')"
            prop="workerId"
@ -574,7 +591,7 @@ export default {
    this.getRoleList();
    this.getMachineList();
    this.getAllVideo();
-    this.loadPersonList();
+    // this.loadPersonList();
    this.getList();
    this.getProjectList();
    this.getTreeList();
@ -606,6 +623,8 @@ export default {
        roleId: "",
        userId: "",
        externalAccount: "",
+        enterpriseId: "",
+        workerId: "",
      },
      screen: [
        // {id:0,name:" "},
@ -680,6 +699,13 @@ export default {
            trigger: "change",
          },
        ],
+        enterpriseId: [
+          {
+            required: true,
+            message: this.$t("message.personnelPosition.required"),
+            trigger: "change",
+          },
+        ],
        workerId: [
          {
            required: true,
@ -780,7 +806,8 @@ export default {
    hasUncheckedNodes(treeData) {
      const tree = this.$refs.treeRef;
      return treeData.some((node) => {
-        const isUnchecked = !tree.getNode(node).checked && !tree.getNode(node).indeterminate;
+        const isUnchecked =
+          !tree.getNode(node).checked && !tree.getNode(node).indeterminate;
        if (isUnchecked) return true;
        if (node.children && node.children.length) {
          return this.hasUncheckedNodes(node.children);
@ -823,10 +850,10 @@ export default {
      if (hasUnchecked && hasChecked) {
        this.checkAll = false;
        this.isIndeterminate = true;
-      } else if(!hasUnchecked && hasChecked){
+      } else if (!hasUnchecked && hasChecked) {
        this.checkAll = true;
        this.isIndeterminate = false;
-      } else if(!hasChecked){
+      } else if (!hasChecked) {
        this.checkAll = false;
        this.isIndeterminate = false;
      }
@ -875,6 +902,7 @@ export default {
      let findItem = this.personList.find((item) => {
        return item.id == this.addEditForm.workerId;
      });
+      console.log(findItem);
      if (findItem) {
        this.addEditForm.personMail = findItem.personMail;
      } else {
@ -1138,9 +1166,14 @@ export default {
        }
      );
    },
-    loadPersonList() {
+    selectValFn() {
+      this.loadPersonList(this.addEditForm.enterpriseId);
+    },
+    loadPersonList(val) {
+      console.log("val", val);
      getLaborManagementInfoListApi({
        projectSn: this.$store.state.projectSn,
+        userEnterpriseId: val,
      }).then((res) => {
        this.personList = res.result;
      });
@ -1168,6 +1201,7 @@ export default {
    add() {
      this.handle("add", true);
      this.$nextTick(() => {
+        this.$refs['addEditForm'].resetFields();
        this.selectTreeData = {};
        this.selectVal = "";
        this.defaultExpandArr = [];
@ -1194,7 +1228,7 @@ export default {
        this.selectVal = "";
        this.defaultExpandArr = [];
      }
-      this.addEditForm.roleId = obj.roleId.split(',');
+      this.addEditForm.roleId = obj.roleId.split(",");
      this.handle("edit", true);
      this.$nextTick(() => {
        if (this.addEditForm.xzProjectOrgObj) {
@ -1283,7 +1317,16 @@ export default {
      });
    },
    close() {
-      this.addEditForm = {};
+      this.addEditForm = {
+        account: "",
+        password: "",
+        xzProjectOrgId: "",
+        roleId: "",
+        userId: "",
+        externalAccount: "",
+        enterpriseId: "",
+        workerId: "",
+      };
      this.$nextTick(() => {
        this.$refs.addEditForm.clearValidate();
      });
--- a/src/views/projectFront/laborManage/personnelOverview.vue
+++ b/src/views/projectFront/laborManage/personnelOverview.vue
@ -25,7 +25,25 @@
            </div>
          </div>
        </div>
-        <div class="echarts" ref="personnelType"></div>
+        <el-select
+          v-model="searchForm.enterpriseId"
+          class="headSelect"
+          size="mini"
+          :placeholder="$t('message.laborDev.allCompany')"
+          filterable
+          clearable
+          @change="searchFormChange"
+
+        >
+          <el-option
+            :label="item.enterpriseName"
+            :value="item.id"
+            v-for="(item, index) in enterpriseListData"
+            :key="index"
+          >
+          </el-option>
+        </el-select>
+        <div class="echarts headSelectEcharts" ref="personnelType"></div>
      </div>
      <div class="manager_wrap whiteBlock">
        <div class="title_wrap">
@ -558,6 +576,9 @@ export default {
      teamListData: [],
      departmentListData: [],
      safeData: {},
+      searchForm: {
+        enterpriseId: "",
+      },
    };
  },
  mounted() {
@ -899,11 +920,14 @@ export default {
        that.safeWorkList = res.result.list || [];
      });
    },
+    searchFormChange(){
+      this.selectPersonTypeAndEduStatistics();
+    },
    //查询人员类型和教育统计
    selectPersonTypeAndEduStatistics() {
      getPersonTypeAndEduStatisticsApi({
        projectSn: this.$store.state.projectSn,
-        userEnterpriseId: this.$store.state.userInfo.userEnterpriseId,
+        userEnterpriseId: this.searchForm.enterpriseId ? this.searchForm.enterpriseId : this.$store.state.userInfo.userEnterpriseId,
      }).then((res) => {
        console.log(res);
        this.totalPersonNum = res.result.personType.toaltPerson.totalPerson; //总人数
@ -1587,6 +1611,9 @@ export default {
  display: flex;
  align-items: center;
 }
+.headSelect {
+  margin-left: 20px;
+}
 .personnelOverview {
  width: 100%;
  height: 100%;
@ -1682,6 +1709,9 @@ export default {
    width: 100%;
    height: calc(100% - 50px);
  }
+  .headSelectEcharts {
+    height: calc(100% - 80px);
+  }
  .scroll {
    width: 100%;
    padding: 15px 0 0;