Skip to content

H
haoban-3
Commit 92bdd9ac by 无尘
Options

fix: 修改样式

parent 58b903fc
Showing with 38 additions and 18 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.28.css><link href=./static/css/app.3fe44be43ff5fd344da6329be2721c17.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.73d0c0e0c06a71ba9981.js></script><script type=text/javascript src=./static/js/vendor.014a23eec35e9d02ede3.js></script><script type=text/javascript src=./static/js/app.22fd13a2fb10be5cf2dd.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.28.css><link href=./static/css/app.b5081da5b767e3ee10c366c5c6cb8c2c.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.10bc216ea60b6e23dde2.js></script><script type=text/javascript src=./static/js/vendor.014a23eec35e9d02ede3.js></script><script type=text/javascript src=./static/js/app.22fd13a2fb10be5cf2dd.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/manifest.73d0c0e0c06a71ba9981.js → dist/static/js/manifest.10bc216ea60b6e23dde2.js
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,d,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(c&&c(a,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var a={},f={63:0};function b(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,b),f.l=!0,f.exports}b.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,b){c=f[e]=[a,b]});c[2]=a;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+e+"."+{0:"ebfd144322bcfb4044b3",1:"06c4e42e62c1f75191f0",2:"5bcd896efc50e6c578d1",3:"83bca32cb852f7a11daf",4:"ab8174a3faedf840b70f",5:"bf21cfa1832c94ed8d4c",6:"c88b49ddd34f1077c424",7:"9983ed9c188eadf9129b",8:"a413be3215a2c04e7132",9:"523c0e27c40ad0e2a099",10:"ab4100db31976165a6a6",11:"fca55db2a20cdb939eed",12:"69a7846110e7b239cf01",13:"ebba5b82c2826c9ba6e1",14:"4093e2a3f16424fbfb07",15:"e84ba50ee99289c29c42",16:"bc276325eab50b4b86c0",17:"edf42ec3b001b6cfe65e",18:"4b0922e27b6b34b18611",19:"379162e017a8b5beee8b",20:"ba2e2bd0823422a4de6c",21:"9e35f4bb567c79f900c4",22:"4657c811baa7a2a81fa8",23:"b696c3789461b84413c4",24:"58c7c6c2d8897eb7c474",25:"9e5733792c18c643ff3a",26:"dba4d3332f3dbc9d7649",27:"8c00b479947588ae7b2c",28:"110ab7e5f64abacf9778",29:"cebf604cf1225f47e634",30:"7c1e52b5c0d36e8632c1",31:"5a37b0bffabe56fe5af9",32:"f7592089bbd49cf8ae9c",33:"6133e1e6b5fd398be401",34:"06f8f5b3621074c353c6",35:"bf9fd1d5441ee72fc26d",36:"93c91e49a2adcaf3793d",37:"8f4c7fd433e2fc86ab21",38:"0cb1610bc0b7ec39980b",39:"61c4e14a1b0ea5ffff85",40:"34f2de0ffbb2c4bd22b3",41:"be7b959a60f42ef67daa",42:"341a71ea503996b11a90",43:"f4eee7e60e1d81a3cd65",44:"f0e3e88e253d14faf973",45:"e1d0ed2694e633eca897",46:"d0d7666a8d9e3f155fb7",47:"d383bda19a279b17d388",48:"41401e6b01697e4f8c14",49:"15bc78cea887de215d32",50:"c2932bcd17cb7bb00ef7",51:"6ecd1c76f129643c28a8",52:"9fc13e0d46255e8ef544",53:"6598383a315e20061786",54:"2859fd12cca9ce86f0c3",55:"5921ccabefea7cacacc2",56:"91a0acffaeb56fc3566c",57:"1a7102c508e3c1a0a222",58:"a7fa96edb1538ed5b7ff",59:"c71bd5036dd611ea623a",60:"775007688f0115e168fb"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),a},b.m=e,b.c=a,b.d=function(e,c,a){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]); !function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,d,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(c&&c(a,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var a={},f={63:0};function b(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,b),f.l=!0,f.exports}b.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,b){c=f[e]=[a,b]});c[2]=a;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+e+"."+{0:"ebfd144322bcfb4044b3",1:"06c4e42e62c1f75191f0",2:"5bcd896efc50e6c578d1",3:"83bca32cb852f7a11daf",4:"ab8174a3faedf840b70f",5:"bf21cfa1832c94ed8d4c",6:"c88b49ddd34f1077c424",7:"839e8ea7392c12d11256",8:"a413be3215a2c04e7132",9:"523c0e27c40ad0e2a099",10:"ab4100db31976165a6a6",11:"fca55db2a20cdb939eed",12:"69a7846110e7b239cf01",13:"ebba5b82c2826c9ba6e1",14:"4093e2a3f16424fbfb07",15:"e84ba50ee99289c29c42",16:"bc276325eab50b4b86c0",17:"edf42ec3b001b6cfe65e",18:"4b0922e27b6b34b18611",19:"379162e017a8b5beee8b",20:"ba2e2bd0823422a4de6c",21:"9e35f4bb567c79f900c4",22:"4657c811baa7a2a81fa8",23:"b696c3789461b84413c4",24:"58c7c6c2d8897eb7c474",25:"9e5733792c18c643ff3a",26:"dba4d3332f3dbc9d7649",27:"8c00b479947588ae7b2c",28:"110ab7e5f64abacf9778",29:"cebf604cf1225f47e634",30:"7c1e52b5c0d36e8632c1",31:"5a37b0bffabe56fe5af9",32:"f7592089bbd49cf8ae9c",33:"6133e1e6b5fd398be401",34:"06f8f5b3621074c353c6",35:"bf9fd1d5441ee72fc26d",36:"93c91e49a2adcaf3793d",37:"8f4c7fd433e2fc86ab21",38:"0cb1610bc0b7ec39980b",39:"61c4e14a1b0ea5ffff85",40:"34f2de0ffbb2c4bd22b3",41:"be7b959a60f42ef67daa",42:"341a71ea503996b11a90",43:"f4eee7e60e1d81a3cd65",44:"f0e3e88e253d14faf973",45:"e1d0ed2694e633eca897",46:"d0d7666a8d9e3f155fb7",47:"d383bda19a279b17d388",48:"41401e6b01697e4f8c14",49:"15bc78cea887de215d32",50:"c2932bcd17cb7bb00ef7",51:"6ecd1c76f129643c28a8",52:"9fc13e0d46255e8ef544",53:"6598383a315e20061786",54:"2859fd12cca9ce86f0c3",55:"5921ccabefea7cacacc2",56:"91a0acffaeb56fc3566c",57:"1a7102c508e3c1a0a222",58:"a7fa96edb1538ed5b7ff",59:"c71bd5036dd611ea623a",60:"775007688f0115e168fb"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),a},b.m=e,b.c=a,b.d=function(e,c,a){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file \ No newline at end of file
src/components/company/fail-log.vue
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
<div class="m-t-20"> <div class="m-t-20">
<el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }"> <el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }">
<el-table-column label="分组/门店名称" show-overflow-tooltip> <el-table-column label="分组/门店名称" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.name }}</template> <template slot-scope="scope">{{ scope.row.dataName }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="分组/门店code" show-overflow-tooltip> <el-table-column prop="" label="分组/门店code" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.finishTime }} {{ scope.row.dataCode }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="所属分组" show-overflow-tooltip> <el-table-column prop="" label="所属分组" show-overflow-tooltip>
...@@ -34,11 +34,11 @@ ...@@ -34,11 +34,11 @@
</el-table-column> </el-table-column>
<el-table-column prop="" label="同步状态" show-overflow-tooltip> <el-table-column prop="" label="同步状态" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span :class="['span-dot', scope.row.auditStatus == 2 ? 'bg-f5222d' : 'bg-52c41a']"></span><span class="font-14 color-606266">{{ scope.row.status }}</span> <span :class="['span-dot', scope.row.statusFlag == 2 ? 'bg-f5222d' : 'bg-52c41a']"></span><span class="font-14 color-606266">{{ scope.row.statusFlag == 3 ? '同步失败' : scope.row.statusFlag == 1 ? '同步处理中' : '--' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="失败原因" show-overflow-tooltip> <el-table-column prop="" label="失败原因" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.storeCode | '--' }}</template> <template slot-scope="scope">{{ scope.row.reason | '--' }}</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="block common-wrap__page text-right m-t-24" v-if="tableData.length != 0"> <div class="block common-wrap__page text-right m-t-24" v-if="tableData.length != 0">
...@@ -55,7 +55,14 @@ import errMsg from '@/common/js/error'; ...@@ -55,7 +55,14 @@ import errMsg from '@/common/js/error';
// import { _debounce } from '@/common/js/public'; // import { _debounce } from '@/common/js/public';
export default { export default {
name: 'fail-log', name: 'fail-log',
props: {}, props: {
taskId: {
type: String,
default() {
return '';
}
}
},
data() { data() {
return { return {
dialogVisible: true, dialogVisible: true,
...@@ -104,15 +111,16 @@ export default { ...@@ -104,15 +111,16 @@ export default {
const that = this; const that = this;
let para = { let para = {
keyWord: that.searchInput || '', // 搜索字段 keyWord: that.searchInput || '', // 搜索字段
taskId: that.taskId,
pageNum: that.currentPage, // 当前页 pageNum: that.currentPage, // 当前页
pageSize: that.pageSize // 一页显示个数 pageSize: that.pageSize // 一页显示个数
}; };
getRequest('/haoban-manage3-web/department-recycle-list', para) getRequest('/haoban-manage3-web/sync-task-detail', para)
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
that.tableData = resData.result.list || []; that.tableData = resData.result.result || [];
that.total = resData.result.total; that.total = resData.result.totalCount;
return false; return false;
} }
errMsg.errorMsg(resData); errMsg.errorMsg(resData);
...@@ -125,10 +133,20 @@ export default { ...@@ -125,10 +133,20 @@ export default {
}); });
} }
}, },
watch: {}, watch: {
taskId(newData, oldData) {
const that = this;
if (newData) {
that.getTableList();
}
}
},
mounted() { mounted() {
const that = this; const that = this;
that.getTableList(); if (that.taskId) {
that.getTableList();
}
document.documentElement.style.backgroundColor = '#f0f2f5'; document.documentElement.style.backgroundColor = '#f0f2f5';
}, },
destroyed() { destroyed() {
......
src/views/business/syncLog.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-03-20 14:36:37 * @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-04-20 14:04:30 * @LastEditTime: 2020-04-20 14:32:19
--> -->
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="" label="状态" show-overflow-tooltip> <el-table-column prop="" label="状态" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span :class="['span-dot', scope.row.auditStatus == 2 ? 'bg-f5222d' : 'bg-52c41a']"></span><span class="font-14 color-606266">{{ scope.row.status }}</span> <span :class="['span-dot', scope.row.statusFlag == 4 ? 'bg-f5222d' : 'bg-52c41a']"></span><span class="font-14 color-606266">{{ scope.row.statusFlag == 4 ? '成功' : scope.row.statusFlag == 5 ? '完成有错误' : scope.row.statusFlag == 6 ? '有错误关闭' : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="操作" show-overflow-tooltip> <el-table-column prop="" label="操作" show-overflow-tooltip>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
</div> </div>
</div> </div>
<!-- <vue-gic-footer></vue-gic-footer> --> <!-- <vue-gic-footer></vue-gic-footer> -->
<fail-log v-if="logShow" @closeLog="closeLog"></fail-log> <fail-log v-if="logShow" :taskId="taskId" @closeLog="closeLog"></fail-log>
</div> </div>
</template> </template>
<script> <script>
...@@ -103,7 +103,7 @@ export default { ...@@ -103,7 +103,7 @@ export default {
total: 0, total: 0,
tableData: [], tableData: [],
logShow: false, logShow: false,
recoverItem: {} taskId: ''
}; };
}, },
computed: {}, computed: {},
...@@ -113,10 +113,12 @@ export default { ...@@ -113,10 +113,12 @@ export default {
*/ */
toShowLog(index, item) { toShowLog(index, item) {
const that = this; const that = this;
that.taskId = item.taskId;
that.logShow = true; that.logShow = true;
}, },
closeLog() { closeLog() {
const that = this; const that = this;
that.taskId = '';
that.logShow = false; that.logShow = false;
}, },
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment