Merge remote-tracking branch 'origin/master'

luohairen

2024-11-29 5b54bbdbc843447200369e11963c965c6195df40

Merge remote-tracking branch 'origin/master'

 src/views/components/projectOverview.vue

@@ -44,7 +44,8 @@
                    <div class="statistics">
                        <div>{{ i.statistics }}</div>
                        <div :style="setTextColor(i.text)">
                            {{ i.statisticsMun
              {{
                i.statisticsMun
                            }}<span style="font-size: 18px">亿</span>
                        </div>
                    </div>
@@ -242,6 +243,38 @@
                        }
                    });
                    break;
        case '省':
          this.$router.push({
            path: '/projectEngineering/project/projectLibrary',
            query: {
              importanceType: 'provincial_key'
            }
          });
          break;
        case '县':
          this.$router.push({
            path: '/projectEngineering/project/projectLibrary',
            query: {
              importanceType: 'shehong_key'
            }
          });
          break;
        case '市':
          this.$router.push({
            path: '/projectEngineering/project/projectLibrary',
            query: {
              importanceType: 'suining_key'
            }
          });
          break;
        case '普':
          this.$router.push({
            path: '/projectEngineering/project/projectLibrary',
            query: {
              importanceType: 'normal'
            }
          });
          break;
                default:
                    break;
            }
@@ -328,6 +361,7 @@
        }
    }
}

.overview-div {
    min-width: 1250px;
    width: 1250px;

 src/views/projectEngineering/projectLibrary/component/BasicInfo.vue

@@ -508,7 +508,7 @@
        this.$message.success('获取地址成功');
        this.dialogMap = false;
      } else {
        this.$message.error('获取坐标失败');
        this.$message.error('请先点击地图选择地址');
      }
    },


 src/views/projectEngineering/projectLibrary/index.vue

@@ -227,6 +227,10 @@
            <template v-if="item.slotName === 'investType'">
              <dict-tag :options="dict.type.sys_investment_type" :value="scope.row.investType"/>
            </template>
            <!-- investType插槽 -->
            <template v-if="item.slotName === 'importanceType'">
              <dict-tag :options="dict.type.sys_key_categories" :value="scope.row.importanceType"/>
            </template>
            <!-- planStartTime -->
            <template v-if="item.slotName === 'planStartTime'">
              {{ scope.row.planStartTime ? scope.row.planStartTime.split('-')[0] + '年' : '' }}
@@ -366,6 +370,7 @@
    };
  },
  created() {
    this.queryParams.importanceType = this.$route.query.importanceType;
    const projectCategory = this.$route.query.projectCategory;
    if (!projectCategory || projectCategory === '1') {
      this.isReserve = true;
@@ -394,7 +399,7 @@
    },
    handleDetail(row) {
      this.removeStore();
      this.$router.push({path: '/projectEngineering/project/ProjectDetails', query: {projectId: row.id}});
      this.$router.push({path: '/projectEngineering/project/ProjectDetails', query: {projectId: row.id,disabled: 'true' }});
    },
    // 新增页面
    add() {
@@ -544,8 +549,8 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除项目管理基础信息编号为"' + ids + '"的数据项？').then(function () {
        return delInfo(ids);
      this.$modal.confirm('是否确认删除项目:"' + row.projectName + '"的数据项？').then(function () {
        return delProject(ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");

 src/views/projectEngineering/projectLibrary/list.js

@@ -19,7 +19,7 @@
  {id: 'area', label: '行政区划', visible: false},
  {id: 'managementCentralizationList', label: '管理归口', visible: false},
  {id: 'projectApprovalType', label: '项目审批类型', visible: false},
  {id: 'importanceType', label: '重点分类', visible: false},
  {id: 'importanceType', label: '重点分类', slotName: 'importanceType', visible: false},
  {id: 'setTime', label: '立项时间', visible: false},
  {id: 'planCompleteTime', label: '计划竣工时间', visible: false},
  {id: 'winUnit', label: '中标单位', visible: false},
@@ -107,7 +107,7 @@
  { id: 'area', label: '行政区划', visible: false },
  { id: 'managementCentralizationList', label: '管理归口', visible: false },
  { id: 'projectApprovalType', label: '项目审批类型', visible: false },
  { id: 'importanceType', label: '重点分类', visible: false },
  {id: 'importanceType', label: '重点分类', slotName: 'importanceType', visible: false},
  { id: 'setTime', label: '立项时间', visible: false },
  { id: 'planCompleteTime', label: '计划竣工时间', visible: false },
  { id: 'winUnit', label: '中标单位', visible: false },

 src/views/projectEngineering/projectLibrary/projectDetails.vue

@@ -101,6 +101,11 @@
      this.$refs.childRef.reset();
    },
  },
  mounted() {
    if(this.$route.query.disabled){
      this.disabled = true
    }
  }
};
</script>