总包工程完善以及logo替换

src/api/basic-manage/project-manage/all-project.js

@@ -1,35 +1,27 @@
 import request from '@/utils/request'
 
-// 新增总包工程
+// 新增和修改总包工程
-export const addAllProjectAPI = (data) => {
+export const addAndEditAllProjectAPI = (data) => {
     return request({
-        url: '/project/***',
+        url: '/bmw/mainProject/addOrUpdateMainProject',
-        method: 'POST',
-        data,
-    })
-}
-
-// 修改总包工程
-export const editAllProjectAPI = (data) => {
-    return request({
-        url: '/project/***',
         method: 'POST',
         data,
     })
 }
 
 // 删除总包工程
-export const deleteAllProjectAPI = (id) => {
+export const deleteAllProjectAPI = (data) => {
     return request({
-        url: `/project/****/${id}`,
+        url: '/bmw/mainProject/delMainProject',
-        method: 'DELETE',
+        method: 'POST',
+        data,
     })
 }
 
 // 获取总包工程列表
 export const getAllProjectListAPI = (data) => {
     return request({
-        url: '/project/***',
+        url: '/bmw/mainProject/list',
         method: 'GET',
         params: data,
     })

src/components/TableModel/index.vue

@@ -135,7 +135,6 @@
             v-loading="loading"
             select-on-indeterminate
             @selection-change="handleSelectionChange"
-        >
         >
             <el-table-column
                 width="45"
@@ -319,7 +318,7 @@ export default {
             // 搜索区域是否隐藏
             showSearch: true,
             // 是否显示复选框
-            selectionShow: true,
+            selectionShow: this.isSelectShow,
             // 是否显示序号
             indexNumShow: true,
             // 是否显示操作列

src/components/ToolbarModel/index.vue

@@ -8,13 +8,37 @@
                 placement="top"
                 v-if="search"
             >
-                <el-button size="mini" circle icon="el-icon-search" @click="toggleSearch()" />
+                <el-button
+                    size="mini"
+                    circle
+                    icon="el-icon-search"
+                    @click="toggleSearch()"
+                />
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="刷新" placement="top">
+            <el-tooltip
-                <el-button size="mini" circle icon="el-icon-refresh" @click="refresh()" />
+                class="item"
+                effect="dark"
+                content="刷新"
+                placement="top"
+            >
+                <el-button
+                    size="mini"
+                    circle
+                    icon="el-icon-refresh"
+                    @click="refresh()"
+                />
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="列表筛选" placement="top">
+            <el-tooltip
-                <el-dropdown trigger="click" :hide-on-click="false" style="padding-left: 12px">
+                class="item"
+                effect="dark"
+                content="列表筛选"
+                placement="top"
+            >
+                <el-dropdown
+                    trigger="click"
+                    :hide-on-click="false"
+                    style="padding-left: 12px"
+                >
                     <el-button size="mini" circle icon="el-icon-menu" />
                     <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item>
@@ -22,18 +46,25 @@
                                 :checked="selectionShow"
                                 @change="
                                     () => {
-                                        this.$emit('update:selectionShow', !this.selectionShow)
+                                        this.$emit(
+                                            'update:selectionShow',
+                                            !this.selectionShow,
+                                        )
                                     }
                                 "
-                                >复选框</el-checkbox
                             >
+                                复选框
+                            </el-checkbox>
                         </el-dropdown-item>
                         <el-dropdown-item>
                             <el-checkbox
                                 :checked="indexNumShow"
                                 @change="
                                     () => {
-                                        this.$emit('update:indexNumShow', !this.indexNumShow)
+                                        this.$emit(
+                                            'update:indexNumShow',
+                                            !this.indexNumShow,
+                                        )
                                     }
                                 "
                                 >序号</el-checkbox
@@ -44,7 +75,10 @@
                                 :checked="handleShow"
                                 @change="
                                     () => {
-                                        this.$emit('update:handleShow', !this.handleShow)
+                                        this.$emit(
+                                            'update:handleShow',
+                                            !this.handleShow,
+                                        )
                                     }
                                 "
                                 >操作</el-checkbox
@@ -55,7 +89,9 @@
                             <el-dropdown-item :key="index">
                                 <el-checkbox
                                     :checked="item.checked"
-                                    @change="checkboxChange($event, item.t_label)"
+                                    @change="
+                                        checkboxChange($event, item.t_label)
+                                    "
                                     :label="item.t_label"
                                     >{{ item.t_label }}</el-checkbox
                                 >

src/layout/components/Sidebar/Logo.vue

@@ -47,7 +47,7 @@
 </template>
 
 <script>
-import logoImg from '@/assets/logo/logo.png'
+import logoImg from '@/assets/logo/logo1.png'
 
 import variables from '@/assets/styles/variables.scss'
 

src/views/basic-manage/project-manage/all-project/config.js

@@ -8,42 +8,20 @@ export const formLabel = [
 ]
 
 export const columnsList = [
-    { t_props: 'projectName', t_label: '总工程名称' },
+    { t_props: 'mainProName', t_label: '总工程名称' },
-    { t_props: 'level', t_label: '电压等级' },
+    { t_props: 'volLevel', t_label: '电压等级' },
 
     {
-        t_props: 'count',
         t_label: '标段工程数量',
         t_slot: 'count',
     },
-    { t_props: 'status', t_label: '状态' },
+    { t_slot: 'proStatus', t_label: '状态' },
-]
-
-export const testTableList = [
-    {
-        projectName: '总工程名称',
-        level: '电压等级',
-        status: '在建',
-        count: '6',
-    },
-    {
-        projectName: '总工程名称2',
-        level: '电压等级',
-        status: '停工',
-        count: '5',
-    },
-    {
-        projectName: '总工程名称3',
-        level: '电压等级',
-        status: '筹建',
-        count: '10',
-    },
 ]
 
 export const dialogConfig = {
     outerVisible: false,
     outerTitle: '',
-    outerWidth: '50%',
+    outerWidth: '40%',
     minHeight: '',
     maxHeight: '',
 }

src/views/basic-manage/project-manage/all-project/index.vue

@@ -7,7 +7,6 @@
             :showRightTools="true"
             ref="allProjectTableRef"
             :columnsList="columnsList"
-            :testTableList="testTableList"
             :request-api="getAllProjectListAPI"
         >
             <template slot="btn" slot-scope="{ queryParams }">
@@ -35,10 +34,23 @@
             <!-- 标段工程数量 -->
             <template slot="count" slot-scope="{ data }">
                 <span class="cursor-blue" @click="onHandleViewLotProject(data)">
-                    {{ data.count }}
+                    {{ data.pmProjectVoList.length || 0 }}
                 </span>
             </template>
 
+            <!-- 状态 -->
+            <template slot="proStatus" slot-scope="{ data }">
+                <el-tag
+                    size="mini"
+                    type="primary"
+                    v-if="data.proStatus !== '' && data.proStatus !== null"
+                >
+                    {{ projectStatusList[data.proStatus] || '' }}
+                </el-tag>
+
+                <span v-else>-</span>
+            </template>
+
             <template slot="handle" slot-scope="{ data }">
                 <el-button
                     plain
@@ -75,26 +87,26 @@
                         :model="addOrEditForm"
                         :rules="addOrEditFormRules"
                     >
-                        <el-form-item label="总工程名称" prop="projectName">
+                        <el-form-item label="总工程名称" prop="mainProName">
                             <el-input
                                 clearable
                                 placeholder="请输入总工程名称"
-                                v-model="addOrEditForm.projectName"
+                                v-model="addOrEditForm.mainProName"
                             />
                         </el-form-item>
-                        <el-form-item label="电压等级" prop="voltageLevel">
+                        <el-form-item label="电压等级" prop="volLevel">
                             <el-select
                                 clearable
                                 filterable
                                 style="width: 100%"
                                 placeholder="请选择电压等级"
-                                v-model="addOrEditForm.voltageLevel"
+                                v-model="addOrEditForm.volLevel"
                             >
                                 <el-option
                                     :key="item.value"
                                     :label="item.label"
                                     :value="item.value"
-                                    v-for="item in voltageLevelOptions"
+                                    v-for="item in dict.type.voltage_level"
                                 />
                             </el-select>
                         </el-form-item>
@@ -129,33 +141,39 @@
                         <el-table-column
                             align="center"
                             label="子项目名称"
-                            prop="lotProjectName"
+                            prop="proName"
                         />
                         <el-table-column
-                            label="专业"
+                            label="工程类型"
                             align="center"
-                            prop="professional"
+                            prop="proType"
                         />
                         <el-table-column
                             align="center"
                             label="所属分公司"
-                            prop="branchCompany"
+                            prop="subComName"
                         />
                         <el-table-column
                             align="center"
                             label="电压等级"
-                            prop="voltageLevel"
+                            prop="volLevel"
                         />
                         <el-table-column
                             label="工程地址"
                             align="center"
-                            prop="engineeringAddress"
+                            prop="proAddress"
                         />
                         <el-table-column
                             align="center"
                             label="工程状态"
-                            prop="engineeringStatus"
+                            prop="proStatus"
-                        />
+                        >
+                            <template slot-scope="{ row }">
+                                <el-tag size="mini" type="primary">
+                                    {{ row.proStatus }}
+                                </el-tag>
+                            </template>
+                        </el-table-column>
                     </el-table>
                 </template>
             </template>
@@ -166,15 +184,15 @@
 <script>
 import TableModel from '@/components/TableModel'
 import DialogModel from '@/components/DialogModel'
-import { formLabel, columnsList, dialogConfig, testTableList } from './config'
+import { formLabel, columnsList, dialogConfig } from './config'
 import {
-    addAllProjectAPI,
+    addAndEditAllProjectAPI,
-    editAllProjectAPI,
     deleteAllProjectAPI,
     getAllProjectListAPI,
 } from '@/api/basic-manage/project-manage/all-project'
 export default {
     name: 'AllProject',
+    dicts: ['voltage_level'],
     components: {
         TableModel,
         DialogModel,
@@ -185,25 +203,24 @@ export default {
             formLabel,
             columnsList,
             dialogConfig,
-            testTableList,
             getAllProjectListAPI,
-
             // 新增或修改表单
             addOrEditForm: {
-                projectName: '', // 总工程名称
+                mainProName: '', // 总工程名称
-                voltageLevel: '', // 电压等级
+                volLevel: '', // 电压等级
+                id: '', // 主键id
             },
 
             // 新增或修改表单验证
             addOrEditFormRules: {
-                projectName: [
+                mainProName: [
                     {
                         required: true,
                         trigger: 'blur',
                         message: '请输入总工程名称',
                     },
                 ],
-                voltageLevel: [
+                volLevel: [
                     {
                         required: true,
                         trigger: 'change',
@@ -212,55 +229,36 @@ export default {
                 ],
             },
 
-            // 电压等级
-            voltageLevelOptions: [
-                {
-                    label: '110kV',
-                    value: '110kV',
-                },
-                {
-                    label: '220kV',
-                    value: '220kV',
-                },
-                {
-                    label: '330kV',
-                    value: '330kV',
-                },
-            ],
-
             // 子项目(标段工程)概况
-            lotProjectList: [
+            lotProjectList: [],
-                {
+
-                    lotProjectName: '子项目名称1',
+            projectStatusList: {
-                    professional: '专业',
+                0: '在建',
-                    branchCompany: '所属分公司1',
+                1: '停工',
-                    voltageLevel: '电压等级',
+                2: '筹建',
-                    engineeringAddress: '工程地址',
+                3: '遗留收尾',
-                    engineeringStatus: '工程状态',
+                4: '完工',
+                '': '',
             },
-                {
-                    lotProjectName: '子项目名称2',
-                    professional: '专业',
-                    branchCompany: '所属分公司1',
-                    voltageLevel: '电压等级',
-                    engineeringAddress: '工程地址',
-                    engineeringStatus: '工程状态',
-                },
-                {
-                    lotProjectName: '子项目名称3',
-                    professional: '专业',
-                    branchCompany: '所属分公司',
-                    voltageLevel: '电压等级',
-                    engineeringAddress: '工程地址',
-                    engineeringStatus: '工程状态',
-                },
-            ],
         }
     },
+
+    created() {
+        this.projectStatusList = this.dict.type.project_status
+    },
+
     methods: {
         // 导出按钮
         onHandleExportAllProject(queryParams) {
             console.log(queryParams, '导出')
+
+            // this.download(
+            //     '**',
+            //     {
+            //         ...queryParams,
+            //     },
+            //     `总包工程列表.xlsx`,
+            // )
         },
 
         // 新增或修改
@@ -268,7 +266,16 @@ export default {
             this.dialogConfig.outerTitle =
                 type === 1 ? '新增总工程' : '修改总工程'
 
-            this.dialogConfig.outerWidth = ''
+            if (type === 2) {
+                const { mainProName, volLevel, id } = data
+                this.addOrEditForm = {
+                    mainProName,
+                    volLevel,
+                    id,
+                }
+            }
+
+            this.dialogConfig.outerWidth = '40%'
             this.dialogConfig.minHeight = ''
             this.dialogConfig.maxHeight = ''
             this.dialogConfig.outerVisible = true
@@ -282,10 +289,10 @@ export default {
                 type: 'warning',
             })
                 .then(async () => {
-                    const res = await deleteAllProjectAPI(data.id)
+                    const res = await deleteAllProjectAPI({ id: data.id })
                     console.log(res, '删除结果')
                     if (res.code === 200) {
-                        this.$msgSuccess('删除成功')
+                        this.$modal.msgSuccess('删除成功')
                         this.$refs.allProjectTableRef.getTableList() // 更新列表
                     }
                 })
@@ -298,17 +305,24 @@ export default {
         onHandleConfirmAddOrEdit() {
             this.$refs.addOrEditFormRef.validate(async (valid) => {
                 if (valid) {
-                    const API =
+                    const params = {
-                        this.dialogConfig.outerTitle === '新增总工程'
+                        ...this.addOrEditForm,
-                            ? addAllProjectAPI
+                    }
-                            : editAllProjectAPI
+                    if (this.dialogConfig.outerTitle === '新增总工程') {
+                        delete params.id
+                    }
+                    const res = await addAndEditAllProjectAPI(params)
 
-                    const res = await API(this.addOrEditForm)
-                    console.log(res, '新增或修改结果')
                     if (res.code === 200) {
-                        this.$msgSuccess('操作成功')
+                        this.$modal.msgSuccess(
+                            this.dialogConfig.outerTitle === '新增总工程'
+                                ? '新增成功'
+                                : '修改成功',
+                        )
                         this.handleCloseDialogOuter()
                         this.$refs.allProjectTableRef.getTableList() // 更新列表
+                    } else {
+                        this.$modal.msgError(res.msg)
                     }
                 }
             })
@@ -317,6 +331,7 @@ export default {
         // 查看标段工程数量
         onHandleViewLotProject(data) {
             console.log(data, '查看标段工程数量')
+            this.lotProjectList = data.pmProjectVoList
             this.dialogConfig.outerTitle = '子项目(标段工程)概况'
             this.dialogConfig.outerWidth = '80%'
             this.dialogConfig.minHeight = '90vh'
@@ -328,6 +343,11 @@ export default {
         handleCloseDialogOuter() {
             if (this.dialogConfig.outerTitle !== '子项目(标段工程)概况') {
                 this.$refs.addOrEditFormRef.resetFields()
+                this.addOrEditForm = {
+                    mainProName: '',
+                    volLevel: '',
+                    id: '',
+                }
             }
             this.dialogConfig.outerVisible = false
         },

src/views/basic-manage/project-manage/lot-project/add-or-edit-form.vue

@@ -124,11 +124,11 @@
                             size="medium"
                             v-model="addOrEditForm.status"
                         >
-                            <el-radio-button label="在建" />
+                            <el-radio-button
-                            <el-radio-button label="筹建" />
+                                :key="item.value"
-                            <el-radio-button label="停工" />
+                                :label="item.label"
-                            <el-radio-button label="完工" />
+                                v-for="item in dict.type.project_status"
-                            <el-radio-button label="遗留收尾" />
+                            />
                         </el-radio-group>
                     </el-form-item>
                 </el-col>
@@ -199,7 +199,7 @@ import {
 } from '@/api/basic-manage/project-manage/lot-project'
 export default {
     name: 'AddOrEditForm',
-
+    dicts: ['project_status'],
     data() {
         // 自定义校验规则 判断竣工结束时间是否大于开工开始时间
         const validatePlanEndTime = (rule, value, callback) => {

src/views/construction-person/red-green-light-mange/red-and-green-count/index.vue

@@ -1,17 +1,121 @@
 <template>
+    <!-- 施工人员 ---- 红绿灯管理 ---- 红绿灯统计 -->
     <div class="app-container">
-        <h1>红绿灯统计</h1>
+        <el-table border :data="redAndGreenCountList">
-        <AttendanceCalendar />
+            <el-table-column
+                type="index"
+                label="序号"
+                width="50"
+                align="center"
+            />
+            <el-table-column label="分公司" width="400" align="center">
+                <template slot-scope="{ row }">
+                    <span
+                        class="cursor-blue"
+                        @click="onHandleClickCompany(row)"
+                    >
+                        {{ row.company }}
+                    </span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                align="center"
+                :key="item.prop"
+                :prop="item.prop"
+                :label="item.label"
+                show-overflow-tooltip
+                v-for="item in columnsList"
+            />
+        </el-table>
+
+        <!-- 分页 -->
+        <pagination
+            :total="total"
+            @pagination="getTableList"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+        />
+
+        <DialogModel
+            :dialogConfig="dialogConfig"
+            @closeDialogOuter="handleCloseDialogOuter"
+        >
+            <template slot="outerContent"> 996 </template>
+        </DialogModel>
     </div>
 </template>
 
 <script>
-import AttendanceCalendar from '@/components/AttendanceCalendar'
+import DialogModel from '@/components/DialogModel'
 export default {
+    name: 'RedAndGreenCount',
     components: {
-        AttendanceCalendar,
+        DialogModel,
+    },
+    data() {
+        return {
+            total: 0,
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+            },
+
+            dialogConfig: {
+                outerVisible: false,
+                outerTitle: '工程',
+                outerWidth: '70%',
+                minHeight: '90vh',
+                maxHeight: '90vh',
+            },
+            redAndGreenCountList: [
+                {
+                    company: '分公司1',
+                    count: 10,
+                    yellowCount: 2,
+                    greenCount: 8,
+                },
+                {
+                    company: '分公司2',
+                    count: 10,
+                    yellowCount: 2,
+                    greenCount: 8,
+                },
+                {
+                    company: '分公司3',
+                    count: 10,
+                    yellowCount: 2,
+                    greenCount: 8,
+                },
+            ],
+            columnsList: [
+                {
+                    label: '在场人数',
+                    prop: 'count',
+                },
+                {
+                    label: '黄灯人数',
+                    prop: 'count',
+                },
+                {
+                    label: '绿灯人数',
+                    prop: 'count',
+                },
+            ],
+        }
+    },
+
+    methods: {
+        // 获取列表
+        getTableList() {},
+        // 点击分公司
+        onHandleClickCompany(row) {
+            console.log(row)
+            this.dialogConfig.outerVisible = true
+        },
+        // 关闭弹窗
+        handleCloseDialogOuter() {
+            this.dialogConfig.outerVisible = false
+        },
     },
 }
 </script>
-
-<style></style>