| src/api/platform/contract-result.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/assets/styles/index.css | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/assets/styles/sidebar.scss | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/system/contract/contract-result/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/system/work-order/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/system/work-order/threshold/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/api/platform/contract-result.js
@@ -10,9 +10,9 @@ } // 查询考核结果详情 export function resultRecord(id) { export function resultRecord(id, contractId) { return request({ url: '/contract/result/record/list?resultId=' + id, url: '/contract/result/record/list?resultId=' + id + '&contractId=' + contractId, method: 'get' }) } src/assets/styles/index.css
@@ -168,8 +168,8 @@ left: 0; z-index: 1001; overflow: hidden; -webkit-box-shadow: 2px 0 2px rgba(0, 21, 41, 0.35); box-shadow: 2px 0 2px rgba(0, 21, 41, 0.35); -webkit-box-shadow: 0px -7px 2px rgba(0, 21, 41, 0.35); box-shadow: 0px -7px 2px rgba(0, 21, 41, 0.35); } #app .sidebar-container .horizontal-collapse-transition { src/assets/styles/sidebar.scss
@@ -24,8 +24,8 @@ left: 0; z-index: 1001; overflow: hidden; -webkit-box-shadow: 2px 0 2px rgba(0,21,41,.35); box-shadow: 2px 0 2px rgba(0,21,41,.35); -webkit-box-shadow: 0px -7px 2px rgba(0, 21, 41, 0.35); box-shadow: 0px -7px 2px rgba(0, 21, 41, 0.35); // reset element-ui css .horizontal-collapse-transition { src/views/system/contract/contract-result/index.vue
@@ -71,7 +71,7 @@ <!-- v-hasPermi="['system:checkResult:add']"--> <!-- >新增</el-button>--> <!-- </el-col>--> <el-col :span="1.5"> <!-- <el-col :span="1.5"> <el-button type="danger" plain @@ -82,8 +82,8 @@ @click="handleDelete" >删除</el-button > </el-col> <el-col :span="1.5"> </el-col> --> <!-- <el-col :span="1.5"> <el-button type="warning" plain @@ -93,11 +93,11 @@ @click="handleExport" >导出</el-button > </el-col> <right-toolbar </el-col> --> <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" ></right-toolbar> ></right-toolbar> --> </el-row> <el-row v-loading="loading"> @@ -214,14 +214,7 @@ width="300" > </el-table-column> <el-table-column label="扣减方式" align="center" prop="deductCategory" width="180px" > </el-table-column> <el-table-column prop="num" label="量值"> </el-table-column> <el-table-column prop="num" label="次数"> </el-table-column> <el-table-column prop="score" label="扣分"> </el-table-column> </el-table> </el-dialog> @@ -365,7 +358,7 @@ this.manualScoreOpen = true; }, handleDetail(row) { resultRecord(row.id).then((res) => { resultRecord(row.id, row.contractId).then((res) => { this.tableData = res.rows; }); this.detail = row; src/views/system/work-order/index.vue
@@ -45,10 +45,9 @@ </el-row> <el-row v-if="workOrderList && workOrderList.length > 0" :gutter="20" v-loading="loading"> <el-col :xl="6" :lg="8" :md="12" :sm="24" v-for="item in workOrderList" :key="item.id" style="margin-bottom: 20px;box-shadow: rgba(0, 0, 0, 0.16) 0px 1px 4px; position: relative" > <div style="margin-left: 10px; margin-top: 8px"> <el-col :xl="6" :lg="8" :md="12" :sm="24" v-for="item in workOrderList" :key="item.id"> <div class="my-col"> <div style="padding-left: 10px; padding-top: 8px"> <el-row> <el-tag style="margin-right: 5px;height:24px;overflow:auto" effect="dark" v-for="(error, index) in item.errorTypeList" :key="index" size="small" type="warning">{{ error }}</el-tag> </el-row> @@ -61,7 +60,7 @@ <svg v-if="item.overtime === 2" t="1721640480312" class="icon work-order-overtime" width="36" height="36" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="13285"><path d="M896 0a128 128 0 0 1 128 128v768a128 128 0 0 1-128 128H128a128 128 0 0 1-128-128V128a128 128 0 0 1 128-128h768zM205.568 336.192h-40.768v57.792H99.84v37.632h64.96v57.344H95.808v38.528h79.296v135.744a175.168 175.168 0 0 1-31.36-40.768c2.688-21.056 4.032-43.008 4.928-66.304l-36.288-4.48a581.376 581.376 0 0 1-30.464 171.136l30.912 27.328c8.96-24.192 16.576-49.28 22.4-76.16 17.472 23.744 37.184 40.768 59.584 51.072 29.12 12.544 101.248 19.264 215.936 19.264H485.12l7.168-42.112a1437.44 1437.44 0 0 1-90.944 2.24c-94.976 0-155.456-4.48-181.44-13.44a21.824 21.824 0 0 0-4.928-1.792V620.224h54.208v-38.528h-54.208v-54.208h51.968V488.96h-61.376v-57.344h64.064v-37.632H205.568v-57.792z m685.44 4.032h-43.456v75.264h-149.184v40.768h149.184v232.96c0 11.648-5.376 17.472-16.128 17.472-23.744 0-48.384-0.896-74.368-2.24l9.408 41.216h79.296c30.016 0 45.248-15.232 45.248-45.696V456.256h50.176v-40.768h-50.176V340.224z m-210.112 27.328H544.256v346.304h41.664v-38.528h53.76v27.776h41.216V367.552zM469.888 540.032H293.376v144.256h176.512V540.032z m-38.528 37.184v70.336H331.456V577.216H431.36z m316.736-74.368l-35.392 21.952c25.984 41.216 47.04 78.848 62.72 112l35.392-24.64c-14.336-31.36-35.392-67.648-62.72-109.312z m-108.416 35.84v97.216h-53.76V538.688h53.76z m-163.072-183.68H281.728v39.424h57.344c-4.48 21.056-11.2 38.08-19.264 51.52-10.752 16.576-26.88 31.808-47.488 45.248l27.776 34.944c24.192-17.472 43.008-37.184 55.552-59.584 9.408-17.92 17.024-42.112 22.848-72.128h57.344c-0.448 40.768-2.24 65.856-4.928 75.264-2.688 9.856-8.96 15.232-19.712 15.68-9.408-0.896-21.056-1.792-35.392-3.136l10.304 37.184c13.44 1.344 24.64 2.24 34.048 2.24 20.608 0 34.944-8.064 43.456-23.744 8.064-15.68 12.544-63.168 12.992-142.912z m163.072 51.072v92.736h-53.76V406.08h53.76z" fill="#ED2525" fill-opacity="1" opacity="1" p-id="13286"></path></svg> <svg v-else-if="item.overtime === 1 "t="1721902978015" class="icon work-order-overtime" width="36" height="36" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5608"><path d="M512.2 141.8c-203.1 0-367.8 164.7-367.8 367.8s164.7 367.8 367.8 367.8c203.1 0 367.8-164.7 367.8-367.8S715.3 141.8 512.2 141.8z m162.4 494.3c-9.1 12.1-26.5 14.6-38.6 5.5l-143.9-108c-3.6-2.7-6.4-6.2-8.3-10.1-2.3-4-3.7-8.7-3.7-13.6V295.4c0-15.2 12.4-27.6 27.6-27.6 15.2 0 27.6 12.4 27.6 27.6V497L669 597.4c12.3 9.1 14.8 26.5 5.6 38.7zM122.5 277.1l-26.9-26.9c-3.9-3.9-3.9-10.3 0-14.1l129.7-129.7c3.9-3.9 10.3-3.9 14.1 0l26.9 26.9c3.9 3.9 3.9 10.3 0 14.1L136.7 277.1c-3.9 3.9-10.3 3.9-14.2 0zM901.9 277.1l26.9-26.9c3.9-3.9 3.9-10.3 0-14.1L799.1 106.3c-3.9-3.9-10.3-3.9-14.1 0l-27 27c-3.9 3.9-3.9 10.3 0 14.1l129.7 129.7c3.9 3.9 10.3 3.9 14.2 0z" fill="#d81e06" p-id="5609"></path><path d="M201.9 919.2L175 892.3c-3.9-3.9-3.9-10.3 0-14.1l129.7-129.7c3.9-3.9 10.3-3.9 14.1 0l26.9 26.9c3.9 3.9 3.9 10.3 0 14.1L216.1 919.2c-3.9 3.9-10.3 3.9-14.2 0zM821.5 919.2l26.9-26.9c3.9-3.9 3.9-10.3 0-14.1L718.7 748.5c-3.9-3.9-10.3-3.9-14.1 0l-26.9 26.9c-3.9 3.9-3.9 10.3 0 14.1l129.7 129.7c3.8 3.9 10.2 3.9 14.1 0z" fill="#d81e06" p-id="5610"></path></svg> <el-carousel trigger="click" height="150px" :autoplay="false" indicator-position="none" style=""> <el-carousel trigger="click" height="150px" :autoplay="false" indicator-position="none"> <el-carousel-item> <div class="card"> <div class="card-left"> @@ -119,7 +118,7 @@ </el-carousel-item> <el-carousel-item> <div class="moreInfo"> <el-descriptions title="" border :column="2" size="medium"> <el-descriptions style="width: 100%" title="" border :column="2" size="medium"> <el-descriptions-item label="负责单位">{{ item.unitName }}</el-descriptions-item> <el-descriptions-item label="负责人">张一山</el-descriptions-item> <el-descriptions-item label="联系电话">15115115142</el-descriptions-item> @@ -127,6 +126,8 @@ </div> </el-carousel-item> </el-carousel> </div> </el-col> </el-row> <el-empty v-else description="暂无数据"></el-empty> @@ -786,6 +787,7 @@ <style scoped> .moreInfo { width: 100%; padding: 10px; display: flex; } @@ -840,4 +842,7 @@ margin-left: 0px !important; margin-right: 15px; } .my-col { margin-bottom: 20px; box-shadow: rgba(0, 0, 0, 0.16) 0px 1px 4px; position: relative; } </style> src/views/system/work-order/threshold/index.vue
@@ -15,7 +15,7 @@ <!-- </el-row>--> <el-row> <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8"> <el-card style="margin-bottom: 20px; height: 450px; margin-right: 20px"> <el-card style="margin-bottom: 20px; height: 450px; margin-right: 20px;color: #656565;"> <div style="display: flex; justify-content: space-between"> <div class="header—text">视频</div> <div> @@ -71,8 +71,8 @@ v-if="ifEditVideo" ></el-input> <span v-else>{{ item.value }}</span> <span v-if="item.countType=='percent'">%</span> <span v-if="item.countType=='second'">秒</span> <span class="unit" v-if="item.countType=='percent'">%</span> <span class="unit" v-if="item.countType=='second'">秒</span> </el-form-item> </el-form> </div> @@ -94,8 +94,8 @@ v-if="ifEditVideo" ></el-input> <span v-else>{{ item.valueAuto }}</span> <span v-if="item.countType=='percent'">%</span> <span v-if="item.countType=='second'">秒</span> <span class="unit" v-if="item.countType=='percent'">%</span> <span class="unit" v-if="item.countType=='second'">秒</span> </el-form-item> </el-form> </div> @@ -104,7 +104,7 @@ </el-card> </el-col> <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8"> <el-card style="margin-bottom: 20px; height: 450px; margin-right: 20px"> <el-card style="margin-bottom: 20px; height: 450px; margin-right: 20px;color: #656565;"> <div style="display: flex; justify-content: space-between"> <div class="header—text">人脸</div> <div> @@ -160,8 +160,8 @@ v-if="ifEditFace" ></el-input> <span v-else>{{ item.value }}</span> <span v-if="item.countType=='percent'">%</span> <span v-if="item.countType=='second'">秒</span> <span class="unit" v-if="item.countType=='percent'">%</span> <span class="unit" v-if="item.countType=='second'">秒</span> </el-form-item> </el-form> </div> @@ -183,8 +183,8 @@ v-if="ifEditFace" ></el-input> <span v-else>{{ item.valueAuto }}</span> <span v-if="item.countType=='percent'">%</span> <span v-if="item.countType=='second'">秒</span> <span class="unit" v-if="item.countType=='percent'">%</span> <span class="unit" v-if="item.countType=='second'">秒</span> </el-form-item > </el-form> @@ -194,7 +194,7 @@ </el-card></el-col > <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8"> <el-card style="margin-bottom: 20px; height: 450px; margin-right: 20px"> <el-card style="margin-bottom: 20px; height: 450px; margin-right: 20px;color: #656565;"> <div style="display: flex; justify-content: space-between"> <div class="header—text">车辆</div> <div> @@ -250,8 +250,8 @@ v-if="ifEditCar" ></el-input> <span v-else>{{ item.value }}</span> <span v-if="item.countType=='percent'">%</span> <span v-if="item.countType=='second'">秒</span> <span class="unit" v-if="item.countType=='percent'">%</span> <span class="unit" v-if="item.countType=='second'">秒</span> </el-form-item> </el-form> </div> @@ -273,8 +273,8 @@ v-if="ifEditCar" ></el-input> <span v-else>{{ item.valueAuto }}</span> <span v-if="item.countType=='percent'">%</span> <span v-if="item.countType=='second'">秒</span> <span class="unit" v-if="item.countType=='percent'">%</span> <span class="unit" v-if="item.countType=='second'">秒</span> </el-form-item> </el-form> </div> @@ -778,4 +778,11 @@ ::v-deep .el-form-item { margin-bottom: 0px; /* 根据需求调整这个值 */ } ::v-deep .el-form-item__label { color: #8d8d8d; } .unit { margin-left: 5px; display: inline-block; } </style>
