fix: 添加资料中心显示判断以及考试系统BUG修改以及数据校验同步列表刷新BUG修改以及质量和安全模块表单BUG修改以及雨量监测页面BUG修改

2024-06-29 16:23:18 +08:00 · 2024-06-29 16:23:18 +08:00 · 67e6a0a01b
commit 67e6a0a01b
parent dddf5d9c9a
13 changed files with 119 additions and 37 deletions
--- a/src/components/account.vue
+++ b/src/components/account.vue
@ -148,7 +148,7 @@
          <div
            class="width_100"
            @click="goto3"
-            v-if="dataCenter1 != 1"
+            v-if="$store.state.userInfo.systemLogoConfig.showFileCenter == 1"
            :title="dataCenter"
          >
            <!-- <img src="@/assets/images/zlzx.png" width="15px" height="15px" /> -->
@ -210,7 +210,6 @@ export default {
      COMPANY: COMPANY,
      projectType: "",
      loginData: "",
-      dataCenter1: 0,
      seeEquipment: "",
      projectBackground: "项目后台",
      enterpriseBackground: "企业后台",
@ -236,7 +235,6 @@ export default {
    this.projectType = PROJECT_TYPE;
    this.loginData = JSON.parse(localStorage.getItem("systemInfo"));
    this.seeEquipment = this.$store.state.userInfo.seeEquipment;
-    // this.getModuleList();
    console.log("seeEquipment------", this.seeEquipment);
    console.log(" this.loginData===================", this.loginData);
    if (this.loginData.headerConfiguration != "") {
@ -267,16 +265,6 @@ export default {
    // console.log('企业后台',this.enterpriseBackground)
  },
  methods: {
-    // 获取全部模块
-    getModuleList() {
-      let allModuleList = this.$store.state.userInfo.menuAuthority.moduleList;
-      for(let i = 0;i<allModuleList.length;i++){
-        if(allModuleList[i].modulePath == '/companyAdmin/docManage'){ // 筛选资料中心
-          this.dataCenter1 = 0;
-          break;
-        }
-      }
-    },
    // 修改密码
    updatePw() {
      this.$router.push({
--- a/src/store/index.js
+++ b/src/store/index.js
@ -52,18 +52,18 @@ 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://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
        // WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地)
        // 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/companyAdmin/systemSetup/enterpriseInfo.vue
+++ b/src/views/companyAdmin/systemSetup/enterpriseInfo.vue
@ -141,6 +141,21 @@
              </el-form-item>
            </el-col>
          </el-row>
+          <el-row :gutter="12">
+            <el-col :span="6">
+              <el-form-item label="是否显示资料中心" prop="showFileCenter">
+                <el-switch
+                  v-model="form.showFileCenter"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949"
+                  :active-value="1"
+                  :inactive-value="0"
+                >
+                </el-switch>
+                {{ form.showFileCenter == 1 ? '是' : '否' }}
+              </el-form-item>
+            </el-col>
+          </el-row>
          <el-row :gutter="12">
            <el-col :span="6">
              <el-form-item label="是否开启施工人员资质证书到期预警" prop="isOpenCertificateExpireWarn">
@ -299,6 +314,7 @@ export default {
        projectBackground: '', //项目后台
        equipmentChina: '', //设备中台
        dataCenter: '', //资料中心
+        showFileCenter: 0, // 是否显示资料中心
        projectFront: '', // 项目前台
        isShowProjectFront: 0, // 是否显示项目前台
        isOpenCertificateExpireWarn: 0, // 是否开启施工人员资质证书到期预警
--- a/src/views/jxjadmin/systemSettings.vue
+++ b/src/views/jxjadmin/systemSettings.vue
@ -147,6 +147,22 @@
              </el-form-item>
            </el-col>
          </el-row>
+          <el-row :gutter="12">
+            <el-col :span="6">
+              <el-form-item label="是否显示资料中心" prop="showFileCenter">
+                <el-switch
+                  v-model="form.showFileCenter"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949"
+                  :active-value="1"
+                  :inactive-value="0"
+                  @change='switchChange'
+                >
+                </el-switch>
+                {{ form.showFileCenter == 1 ? '是' : '否' }}
+              </el-form-item>
+            </el-col>
+          </el-row>
          <el-row :gutter="12">
            <el-col :span="6">
              <el-form-item label="是否开启施工人员资质证书到期预警" prop="isOpenCertificateExpireWarn">
@ -339,6 +355,7 @@ export default {
        certificateExpireWarnAheadDay: 0, // 提前多少天
        defaultApprovalCompanySn: "", // 默认审批用户注册企业
        dataCenter: '', //资料中心
+        showFileCenter: 0, // 是否显示资料中心
        loginTimeOut:1,
        zoomType:0,

--- a/src/views/projectFront/earthworkTransportation/transportationManage/index.vue
+++ b/src/views/projectFront/earthworkTransportation/transportationManage/index.vue
@ -283,9 +283,10 @@ export default {
        phoneNumber: [
          {
            required: true,
-            message: "请输入",
+            message: "请输入正确的手机号格式",
            trigger: "blur",
-          },
+            pattern: /^1(3|4|5|6|7|8|9)\d{9}$/,
+          }
        ],
        remark: [
          {
--- a/src/views/projectFront/examSystem2/pointManagement/pointManagement.vue
+++ b/src/views/projectFront/examSystem2/pointManagement/pointManagement.vue
@ -68,7 +68,7 @@
                <el-button class="expintBtn" size="mini" type="primary" plain @click="editSuccess(scope.$index, scope.row)" v-if="scope.row.isEdit">
                  保存
                </el-button>
-                <el-button class="expintBtn" size="mini" type="danger" @click="scope.row.isEdit = false" v-if="scope.row.isEdit">
+                <el-button class="expintBtn" size="mini" type="danger" @click="cancelData(scope.$index,scope.row)" v-if="scope.row.isEdit">
                  取消
                </el-button>
              </template>
@ -217,6 +217,14 @@ export default {
          })
        })
    },
+    // 取消按钮
+    cancelData(index,row){
+      if(row.id){
+        this.ruleList[index].isEdit = false;
+      } else {
+        this.ruleList.splice(index,1)
+      }
+    },
    //获取列表数据
    getProgressListData() {
      getExamPointListApi({
--- a/src/views/projectFront/laborManage/dataValidation.vue
+++ b/src/views/projectFront/laborManage/dataValidation.vue
@ -70,7 +70,8 @@
      </el-tabs>
      <!-- v-loading="loading" -->
      <el-table
-        ref="multipleTable"
+        key="multipleTableValidate"
+        ref="multipleTableValidate"
        class="tables"
        row-key="id"
        :data="tableList"
@ -234,6 +235,17 @@ export default {
    //     },
    // ];
  },
+  beforeDestroy() {
+    // console.log(client)
+    if (client) {
+      client.unsubscribe(this.topicName + this.userId, options)
+      client.end()
+    }
+    client = null
+    console.log(client)
+    // client = null
+    //  mqttX.unsubscribe(this.topicName + this.userId);
+  },
  mounted() {
    this.userId = this.$store.state.userInfo.userId;
    this.topicName = this.$store.state.userInfo.scope;
@ -243,6 +255,7 @@ export default {
  methods: {
    // 监听mqtt下发信息然后刷新列表
    mqttMSG() {
+      let that = this;
      // mqtt连接   +"/#"  +workerId
      client.on("connect", (e) => {
        // console.log('连接成功:', this.topicName + this.userId)
@ -335,6 +348,9 @@ export default {
        .then((res) => {
          if (res.code == 200) {
            this.tableList = res.result.records;
+            // this.$set(this, 'tableList', res.result.records);
+            // this.tableList.length = 0;
+            // this.tableList.push(...res.result.records);
            this.pagInfo.total = res.result.total;
            if (
              +res.result.total >
@ -348,7 +364,6 @@ export default {
                this.pagInfo.pageSize = +res.result.total;
              }
            }
-            this.$forceUpdate();
          }
        })
        .finally(() => {
@ -360,7 +375,7 @@ export default {
    handleClick(val) {
      // console.log(val.name);
      this.activeName = val.name;
-      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTableValidate.clearSelection();
      this.pageSizeList = JSON.parse(
        JSON.stringify(this.$store.state.PAGESIZRS)
      );
@ -392,6 +407,26 @@ export default {
      this.getHikvisionPage();
    },
  },
+  computed: {
+    msgObj() { // 为了同时监听两个值
+      const { tableList, activeName } = this;
+      return {
+        tableList,
+        activeName,
+      };
+    },
+  },
+  // watch: {
+  //   msgObj: {
+  //     handler(newVal, oldVal) {
+  //       //接下来在这里写将要进行的操作
+  //       if (newVal.activeName == oldVal.activeName && JSON.stringify(newVal.tableList) != JSON.stringify(oldVal.tableList)) {
+  //         this.getHikvisionPage();
+  //       }
+  //     },
+  //     deep: true,
+  //   },
+  // },
 };
 </script>
 <style lang="less" scoped>
--- a/src/views/projectFront/progressManagementAg/divisionSubManage.vue
+++ b/src/views/projectFront/progressManagementAg/divisionSubManage.vue
@ -110,8 +110,8 @@
            </el-form>
          </div>
          <div class="table_wrap whiteBlock">
-            <vue-scroll>
-              <el-table height="650" class="tables" :data="listData" lazy row-key="id" default-expand-all
+            <vue-scroll style="height: 580px;">
+              <el-table class="tables" :data="listData" lazy row-key="id" default-expand-all
                :tree-props="{ children: 'children' }">
                <el-table-column width="200" prop="taskName" label="分部分项工程名称" style="display: flex;align-items: center;">
                  <template slot-scope="scope">
@ -571,7 +571,6 @@ export default {
    this.downUrl =
      this.$http.defaults.baseURL + "xmgl/progressTask/downloadTemplate";
    this.getCrewListData();
-    this.getPositionList();
    this.getHierarchyEnterpriseList();
    this.getTreeList();
  },
@ -618,6 +617,10 @@ export default {
      }).then((result) => {
        if (result.success) {
          this.treeList = result.result;
+          if(result.result.length > 0){
+            this.treeData = result.result[0]
+          }
+          this.getPositionList();
        }
      });
    },
@ -626,6 +629,7 @@ export default {
      console.log(data);
      this.treeData = data;
      this.getProgressListData();
+      this.getPositionList();
    },
    // 获取承包商列表
    getHierarchyEnterpriseList() {
@ -652,6 +656,7 @@ export default {
    getPositionList() {
      let data = {
        projectSn: this.$store.state.projectSn,
+        enterpriseId: this.treeData.enterpriseId
      };
      getQualityRegionListApi(data).then((res) => {
        console.log("res=================", res);
@ -1005,6 +1010,11 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+.tables{
+    min-height: 0;
+    max-height: none;
+    height: auto;
+}
 .table-content {
  flex: 1;
 }
--- a/src/views/projectFront/quality/businessModule/checkPoint.vue
+++ b/src/views/projectFront/quality/businessModule/checkPoint.vue
@ -277,6 +277,7 @@ import { aiAnalyseHardWareRecordList } from "@/assets/js/api/equipmentCenter/ele
 export default {
  data() {
    return {
+      COMPANY: COMPANY,
      title: this.$t("message.quality.NewRootNode"),
      dialogType: 1,
      projectSn: "",
@ -408,6 +409,11 @@ export default {

    //编辑按钮
    editBtn(value) {
+      if (value.parentRegion && value.parentRegion != '0') {
+        this.form.parentRegion = value.parentRegion;
+      } else {
+        this.form.parentRegion = '0';
+      }
      if (value.intendanceIds == "" || value.intendanceIds == null) {
        this.form.intendanceIds = null;
      } else {
--- a/src/views/projectFront/quality/inspectionLedger.vue
+++ b/src/views/projectFront/quality/inspectionLedger.vue
@ -3234,11 +3234,12 @@ export default {

    //获取去整改人 通知人 检查人 核查人下拉
    getReviewPeopleList(regionId) {
+      this.addForm1.reviewId = ""; // 先清空复查人
      let data = {
        projectSn: this.projectSn,
        // enterpriseTypeId: 7,
-        // qualityRegionId: regionId[0].toString(),
-        qualityRegionId: regionId.toString(),
+        qualityRegionId: regionId[regionId.length - 1].toString(),
+        // qualityRegionId: regionId.toString(),
        qualityRegionBindType: 2,
        isSupervisingRoleName: 1,
      };
--- a/src/views/projectFront/rainfallMonitor/alarmWarning.vue
+++ b/src/views/projectFront/rainfallMonitor/alarmWarning.vue
@ -158,13 +158,11 @@ export default {
      // return timer;
    },
    refresh() {
-      this.queryInfo = {
-        deviceId: "",
-      };
+      this.queryInfo.deviceId = "";
      this.time = [];
      this.pagInfo.pageNo = 1; //页数
      this.pagInfo.pageSize = 10; //条数
-      this.selectNowDate();
+      // this.selectNowDate();
      this.getList();
    },
    query() {
--- a/src/views/projectFront/rainfallMonitor/relaTimeData.vue
+++ b/src/views/projectFront/rainfallMonitor/relaTimeData.vue
@ -251,8 +251,9 @@ export default {
    refresh() {
      this.pageNo = 1;
      this.pageSize = 10;
+      this.devSn = "";
      this.valueTime = [];
-      this.selectNowDate();
+      // this.selectNowDate();
      this.selectDustNoisePageList();
    },
    quertData() {
--- a/src/views/projectFront/safeSame/inspectionLedger.vue
+++ b/src/views/projectFront/safeSame/inspectionLedger.vue
@ -3191,11 +3191,12 @@ export default {

    //获取去整改人 通知人 检查人 核查人下拉
    getReviewPeopleList(regionId) {
+      this.addForm1.reviewId = ""; // 先清空复查人
      let data = {
        projectSn: this.projectSn,
        // enterpriseTypeId: 7,
-        // qualityRegionId: regionId[0].toString(),
-        qualityRegionId: regionId.toString(),
+        qualityRegionId: regionId[regionId.length - 1].toString(),
+        // qualityRegionId: regionId.toString(),
        qualityRegionBindType: 2,
        isSupervisingRoleName: 1,
      };