删除无用的TODO

src/App.vue

@@ -183,7 +183,7 @@ export default {
                 this.SETSSOTOKEN(`admin:${username}`)
             }
             if (plazaId) {
-                // TODO: 设置广场
+                //  设置广场
                 this.SETPLAZAID(plazaId)
             }
         },

src/views/equipmentFacilities/EngineRoomPicture.vue

@@ -79,7 +79,7 @@ export default {
             title: '机房平面布置图',
             keyword: '',
             page: 1,
-            size: 20, //TODO: size1500
+            size: 20,
             list: [],
             loading: false,
             finished: false,
@@ -126,11 +126,6 @@ export default {
         }
         this.onLoad()
     },
-    // TODO: 111
-    // activated() {
-    //     this.system_code = this.smsxt // '全部'||
-    //     console.log(345345455)
-    // },
     beforeMount() {},
     mounted() {},
     methods: {
@@ -176,8 +171,6 @@ export default {
             }
             let resData = res.data.data || []
             console.log(resData)
-            // resData = resData.filter((v) => v.photos_num) // TODO:开发时 过滤有图片的列表项
-            console.log(resData)
             this.list = this.list.concat(resData)
             this.count = res.data.count || 0
         },

src/views/equipmentFacilities/EquipmentList.vue

@@ -10,12 +10,7 @@
         </van-nav-bar>
         <!-- 搜索框 -->
         <div class='equipment-search-container'>
-            <van-search class='equipment-search' v-model='keyword' placeholder='请输入设备简称和设备内编码' @search='onSearch' @focus='focus'>
-                <!-- TODO: 空状态 自定义图标 -->
-                <!-- <template #action>
-                <div class='search' @click='onSearch'>搜索</div>
-                </template>-->
-            </van-search>
+            <van-search class='equipment-search' v-model='keyword' placeholder='请输入设备简称或设备内编码' @search='onSearch' @focus='focus'></van-search>
         </div>
         <!-- 设备列表 -->
         <div class='equipment-list' v-if='list.length'>
@@ -58,14 +53,13 @@
                 <!-- 设备设施 -->
                 <div class='sbss'>
                     <h1 class='title'>设备设施</h1>
-                    <!-- TODO: 1 -->
                     <div class='system-btn-container'>
-                        <div class='system-btn' v-for='(item,index) in sbssList.slice(0,3)' :key='index'>
+                        <div class='system-btn' v-for='(item,index) in sbssList.slice(0,4)' :key='index'>
                             <van-button size='small' class='m-btn' :class='item.active' @click='changeSbss(item)'>{{item.text}}</van-button>
                         </div>
-                        <div v-if='!loadMore && sbssList.length>3' class='load-more' @click='loadMore= true'>加载更多</div>
+                        <div v-if='!loadMore && sbssList.length>4' class='load-more' @click='loadMore= true'>加载更多</div>
                         <div v-if='loadMore'>
-                            <div class='system-btn' v-for='(item,index) in sbssList.slice(3)' :key='index'>
+                            <div class='system-btn' v-for='(item,index) in sbssList.slice(4)' :key='index'>
                                 <van-button size='small' class='m-btn' :class='item.active' @click='changeSbss(item)'>{{item.text}}</van-button>
                             </div>
                         </div>
@@ -183,12 +177,12 @@ export default {
             if (!this.system_code || this.system_code === '全部') {
                 delete postParams.system_code
             }
-            // TODO:  筛选后, 使用classstructureid字段,删除category_code字段
+            // 筛选后, 使用classstructureid字段,删除category_code字段
             if (this.sbss_code) {
                 this.sbss_code !== '全部' && (data.classstructureid = this.sbss_code)
                 delete postParams.category_code
             }
-            // TODO: keyword
+            // keyword
             if (this.keyword) {
                 data.keyword = `${this.keyword}:sbjc,assetnum;`
             }
@@ -271,6 +265,7 @@ export default {
          * popup 更改设备设施
          */
         changeSbss(data) {
+            this.loadMore = false
             let sbssList = this.sbssList
             sbssList.map((item) => {
                 item.active = ''
@@ -279,7 +274,6 @@ export default {
                 }
             })
             // 弹窗选中的系统
-            // TODO: 111
             console.log(data)
             this.$set(this.modalDataBak, 'sbss', data.code)
         },

src/views/equipmentFacilities/LowVoltageCabinet.vue

@@ -491,7 +491,6 @@ export default {
         width: 100%;
         // background-color: #fff;
         min-height: 1px;
-        // TODO:
         max-height: calc(100% - 100px);
         overflow: auto;
         font-size: 14px;

src/views/equipmentFacilities/MoreEquipmentList.vue

@@ -8,7 +8,7 @@
         </van-nav-bar>
         <!-- 搜索框 -->
         <div class='equipment-search-container'>
-            <van-search class='equipment-search' v-model='keyword' placeholder='请输入编号' @search='onSearch'></van-search>
+            <van-search class='equipment-search' v-model='keyword' placeholder='请输入设备简称或设备内编码' @search='onSearch'></van-search>
         </div>
         <!-- 一个类的设备,如螺旋式冷水机组 -->
         <van-list
@@ -89,14 +89,13 @@
                 <!-- 设备设施 -->
                 <div class='sbss'>
                     <h1 class='title'>设备设施</h1>
-                    <!-- TODO: 1 -->
                     <div class='system-btn-container'>
-                        <div class='system-btn' v-for='(item,index) in sbssList.slice(0,3)' :key='index'>
+                        <div class='system-btn' v-for='(item,index) in sbssList.slice(0,4)' :key='index'>
                             <van-button size='small' class='m-btn' :class='item.active' @click='changeSbss(item)'>{{item.text}}</van-button>
                         </div>
-                        <div v-if='!loadMore && sbssList.length>3' class='load-more' @click='loadMore= true'>加载更多</div>
+                        <div v-if='!loadMore && sbssList.length>4' class='load-more' @click='loadMore= true'>加载更多</div>
                         <div v-if='loadMore'>
-                            <div class='system-btn' v-for='(item,index) in sbssList.slice(3)' :key='index'>
+                            <div class='system-btn' v-for='(item,index) in sbssList.slice(4)' :key='index'>
                                 <van-button size='small' class='m-btn' :class='item.active' @click='changeSbss(item)'>{{item.text}}</van-button>
                             </div>
                         </div>
@@ -141,7 +140,7 @@ export default {
             keyword: '',
             page: 1,
             size: 5,
-            innerSize: 4,
+            innerSize: 10,
             list: [],
             loading: false,
             finished: false,
@@ -160,7 +159,7 @@ export default {
             system_code: '', //系统code
             sbss_code: '', //设备设施code
             sbssList: [{ text: '全部', code: '全部', active: 'active' }], //设备设施筛选条件
-            loadMore: false,
+            loadMore: false, //弹窗中加载更多
             // 弹窗中使用数据
             modalData: {
                 system: '',
@@ -207,7 +206,7 @@ export default {
                 page: this.page,
                 size: this.size,
                 subPage: 1,
-                subSize: this.innerSize,
+                subSize: 4 || this.innerSize,
                 plazaId: this.plazaId,
                 onlyMainAsset: true,
             }
@@ -218,11 +217,11 @@ export default {
             if (!this.system_code || this.system_code === '全部') {
                 delete postParams.system_code
             }
-            // TODO:  筛选后, 使用classstructureid字段
+            //  筛选后, 使用classstructureid字段
             if (this.sbss_code) {
                 data.classstructureid = this.sbss_code
             }
-            // TODO: keyword
+            // keyword
             if (this.keyword) {
                 data.keyword = `${this.keyword}:sbjc,assetnum;`
             }
@@ -240,7 +239,7 @@ export default {
                         loading: true,
                         finished: false,
                         list: [],
-                        page: 2,
+                        page: 1,
                         size: this.innerSize,
                     }
                 } else {
@@ -322,12 +321,12 @@ export default {
                     onlyMainAsset: true,
                 },
                 postParams: {
-                    system_code: this.system_code, //TODO: 专业系统
+                    system_code: this.system_code, // 专业系统
                     classstructureid: currentList.classstructureid,
                 },
             }
             if (this.keyword) {
-                queryData.data.keyword = `${this.keyword}:drawernum,outspec,control;`
+                queryData.data.keyword = `${this.keyword}:sbjc,assetnum;`
             }
             console.log(item)
             console.log(currentList)
@@ -344,7 +343,11 @@ export default {
             if (!res?.data?.data) {
                 return false
             }
-            currentList.list = [...currentList.list, ...res.data.data]
+            if (currentList.page === 1) {
+                currentList.list = [...currentList.list, ...res.data.data.slice(4)]
+            } else {
+                currentList.list = [...currentList.list, ...res.data.data]
+            }
             this.$set(this.list, index, currentList)
             console.log('====================')
             console.log(this.list)
@@ -359,12 +362,14 @@ export default {
         },
         onSearch() {
             // 初始化数据,查询列表
+            this.initData()
+            this.onLoad()
         },
         /**
          *  初始化数据,查询列表
          */
         initData() {
-            this.finished = false
+            this.noDataFlag = false
             this.page = 1
             this.count = 0
             this.list = []
@@ -374,6 +379,7 @@ export default {
          */
         changeSystem(data) {
             console.log(data)
+            this.loadMore = false
             let systemList = this.systemList
             systemList.map((item) => {
                 item.active = ''
@@ -397,7 +403,6 @@ export default {
                 }
             })
             // 弹窗选中的系统
-            // TODO: 111
             this.$set(this.modalDataBak, 'sbss', data.code)
         },
         /**
@@ -495,7 +500,6 @@ export default {
         width: 100%;
         // background-color: #fff;
         min-height: 1px;
-        // TODO:
         max-height: calc(100% - 100px);
         overflow: auto;
         font-size: 14px;

src/views/equipmentFacilities/index.vue

@@ -214,7 +214,6 @@ export default {
             try {
                 res = await querySystemCount({ getParams })
             } catch (error) {}
-            // TODO: 123123
             if (!res?.data) {
                 return false
             }
@@ -445,7 +444,6 @@ export default {
         /**
          * 土建立面图(typecode为数组,查询多种图)
          */
-        // TODO: 土建立面图
         async getTuJianImage(item) {
             let data = {
                     plazaId: this.plazaId,
@@ -476,14 +474,12 @@ export default {
             if (!item.count || item.count === '无') {
                 return false
             }
-            // TODO: 机房平面布置图
             this.$router.push({ name: 'EngineRoomPicture', params: {} })
         },
         /**
          * 配电室低压柜及出线明细
          */
         hanldeDyg() {
-            // TODO: 11111
             this.$router.push({ name: 'LowVoltageCabinet', params: {} })
         },
         /**
@@ -538,7 +534,6 @@ export default {
          * 点击更多设备卡片,跳转设备列表页面
          */
         goToMoreEquipment() {
-            // TODO: 更多设备
             this.$router.push({ name: 'MoreEquipmentList', params: {} })
         },
     },

src/views/otherMatter/AuxiliaryRoom.vue

@@ -102,7 +102,6 @@ export default {
          *  显示分布图
          */
         async showImage(data) {
-            // TODO: 如何处理 楼层
             /*   code: "F5"
             gcname: "f5"
             gcode: "5F"
@@ -112,7 +111,7 @@ export default {
             this.imgKey = `img${new Date().getTime()}`
             const floor = this.floorsArr.filter((i) => i.code === data.floor)[0].gname
             let getParams = {
-                module: '1004', //TODO: 固定1004?
+                module: '1004', // 固定1004
                 floor: floor,
                 plazaId: this.plazaId,
             }

src/views/otherMatter/ComprehensiveMatter.vue

@@ -136,8 +136,7 @@ export default {
             }
             this.createdateStartDate && (getParams.createdateStartDate = this.createdateStartDate)
             this.createdateEndDate && (getParams.createdateEndDate = this.createdateEndDate)
-            let res = await queryGlams({ getParams }) //TODO: 123
-            // TODO:
+            let res = await queryGlams({ getParams })
             if (!res?.data) {
                 if (!this.list.length) {
                     this.noData = true
@@ -148,11 +147,10 @@ export default {
             }
 
             let data = res.data
-            this.count = res.count //TODO: count
+            this.count = res.count
             this.currentCount += data.length
             data.map((item) => {
                 // item.children = []
-
                 if (item.cnt) {
                     item.count = item.cnt + '项'
                 } else {
@@ -161,7 +159,7 @@ export default {
                 }
                 if (item.otherdescription) {
                     let otherdescription = item.otherdescription.replace(/(\(无\)|\（无\）)/g, '')
-                    otherdescription && (item.department = item.department + ' ' + otherdescription)
+                    otherdescription && (item.department = item.department + '-' + otherdescription)
                 }
             })
             // if (['其他部门', '其他', '其它'].includes(data[0].department)) {

src/views/otherMatter/ComprehensiveMatterList.vue

@@ -32,7 +32,7 @@
                         <span>展开</span>
                     </div>
                     <div class='show-less' v-else @click='changeStatus(item,true)'>
-                        <!-- TODO: 收起 箭头 -->
+                        <!-- 收起 箭头 -->
                         <i class='iconfont wanda-shouqi'></i>
                         <span>收起</span>
                     </div>
@@ -77,7 +77,7 @@ export default {
             loading: false, // list加载中
             finished: true, //list组件,加载完成
             page: 1, //页码
-            size: 5, //分页条数
+            size: 100, //分页条数
             count: 0, //总条数
             title: '',
             params: {}, //跳转改页面时,路由传参
@@ -124,7 +124,7 @@ export default {
                 ...params,
                 plazaId: this.plazaId,
                 page: this.page,
-                size: 100 || this.size, //TODO: size
+                size: this.size,
                 orderBy: 'createdate,0',
             }
             let res = await queryDetailList({ getParams })

src/views/overview/UpdateRecord.vue

@@ -126,7 +126,6 @@ export default {
                 plazaId: this.plazaId,
                 page: this.page,
                 size: this.size,
-                // TODO: 一年 改一个月
                 changeDateStartDate: moment().subtract(1, 'months').format('YYYYMMDD000000'), //变更记录开始时间 格式yyyyMMddHHmiss 必填
                 changeDateEndDate: moment().format('YYYYMMDD000000'), //变更记录结束时间 格式yyyyMMddHHmiss 必填
             }
@@ -273,7 +272,6 @@ export default {
             height: 100%;
             .info {
                 width: 100%;
-                // TODO:
                 // min-height: 103%;
                 // min-height: 100px;
                 // background-color: chartreuse;

src/views/overview/UpdateRecordDetail.vue

@@ -97,13 +97,11 @@
                     <div>{{data.workyq || '--'}}</div>
                 </div>
                 <div class='rectification-matters'>
-                    <!-- TODO: 整改事项 -->
+                    <!--  整改事项 -->
                     <div class='name'>整改事项:</div>
                     <div>{{data.zgyq || '--'}}</div>
                 </div>
             </div>
-            <!-- TODO:  -->
-            <!-- <div>暂无数据</div> -->
         </div>
         <!-- 现场照片预览 -->
         <ImagePreview class='update-img-preview' :key='imgKey' :visible.sync='showImgPreview' :imgList='imgList' />

src/views/overview/index.vue

@@ -87,7 +87,7 @@
                             </li>
                         </ul>
                         <ul class='zb' v-else>
-                            <!-- TODO:  暂无数据 -->
+                            <!--  暂无数据 -->
                             <van-empty description='暂无数据' />
                         </ul>
                     </van-tab>
@@ -150,7 +150,7 @@
                             </li>-->
                         </ul>
                         <ul class='fb' v-else>
-                            <!-- TODO:  暂无数据 -->
+                            <!--   暂无数据 -->
                             <van-empty description='暂无数据' />
                         </ul>
                     </van-tab>

vue.config.js

@@ -57,8 +57,7 @@ module.exports = {
     // 配置webpack
     configureWebpack: (config) => {
         // 生成环境,删除console.log和debugger
-        // TODO: 1.
-        if (process.env.NODE_ENV === 'production' && false) {
+        if (process.env.VUE_APP_RealEnv === 'production') {
             config.optimization.minimizer[0].options.terserOptions.compress.drop_console = true //删除console
             config.optimization.minimizer[0].options.terserOptions.compress.drop_debugger = true //删除 debugger
             config.optimization.minimizer[0].options.terserOptions.compress.pure_funcs = ['console.log'] //删除