Skip to content

H
haoban-3
Commit dc159431 by caoyanzhi
Options

Merge branch 'feature/话务任务-任务视图调整' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/app.32264b8bb32ec885c2240aebd6aa0329.css
#	dist/static/css/app.ca41cb91dc412e8fcc7b01031727ebdd.css
#	dist/static/css/app.d785e0b917414058fc30f9a24356cbfd.css
#	dist/static/js/17.1c96d1b8bfdae8c0278d.js
#	dist/static/js/app.2ef213299483d5b65728.js
#	dist/static/js/app.d0101d3938f2fa38831a.js
#	dist/static/js/app.d73f45d232d58a197cc3.js
#	dist/static/js/manifest.b1c645364983f7c05e96.js
parents fab59258 111dda77
Showing with 13 additions and 3 deletions
dist/index.html
<<<<<<< HEAD
<!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.69.css><link href=./static/css/app.d785e0b917414058fc30f9a24356cbfd.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script>(function() { <!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.69.css><link href=./static/css/app.d785e0b917414058fc30f9a24356cbfd.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script>(function() {
=======
<!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.69.css><link href=./static/css/app.ca41cb91dc412e8fcc7b01031727ebdd.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script>(function() {
>>>>>>> feature/话务任务-任务视图调整
var src = '/component/static/import-component.js?timestrap='+ new Date().getTime(); var src = '/component/static/import-component.js?timestrap='+ new Date().getTime();
var host = window.location.host; var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host; host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
document.write('<script src="//'+ host + src +'"><\/script>') document.write('<script src="//'+ host + src +'"><\/script>')
})()</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/common.1.0.3.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-data.1.0.11.js></script><script type=text/javascript src=./static/js/manifest.f0770050226217dc8975.js></script><script type=text/javascript src=./static/js/vendor.0b5094dab3f3686ca310.js></script><script type=text/javascript src=./static/js/app.2ef213299483d5b65728.js></script></body></html> <<<<<<< HEAD
\ No newline at end of file })()</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/common.1.0.3.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-data.1.0.11.js></script><script type=text/javascript src=./static/js/manifest.f0770050226217dc8975.js></script><script type=text/javascript src=./static/js/vendor.0b5094dab3f3686ca310.js></script><script type=text/javascript src=./static/js/app.2ef213299483d5b65728.js></script></body></html>
=======
})()</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/common.1.0.3.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-data.1.0.11.js></script><script type=text/javascript src=./static/js/manifest.b1c645364983f7c05e96.js></script><script type=text/javascript src=./static/js/vendor.0b5094dab3f3686ca310.js></script><script type=text/javascript src=./static/js/app.d0101d3938f2fa38831a.js></script></body></html>
>>>>>>> feature/话务任务-任务视图调整
dist/static/css/app.ca41cb91dc412e8fcc7b01031727ebdd.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.d785e0b917414058fc30f9a24356cbfd.css
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.2ef213299483d5b65728.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.d0101d3938f2fa38831a.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.b1c645364983f7c05e96.js 0 → 100644
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,d,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[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(a&&a(c,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var c={},f={100:0};function b(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,b),f.l=!0,f.exports}b.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,b){a=f[e]=[c,b]});a[2]=c;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:"5c8ebc6078132b491294",1:"80ec7107adf684998411",2:"9338b2f0a8640d9998f6",3:"8acf9e057e8cbac355cb",4:"913abea310364ccf84b5",5:"a57f151c7d945a77e28e",6:"82a48525bb0b675e214f",7:"d30382e9c49b87068873",8:"3ac5e266f7f6ad562cf0",9:"605a399cdb50c327329f",10:"7bba44730adb1c5c680b",11:"729fc09865d29041a37a",12:"46e321f86104f00d546a",13:"6e9e80c79bb3c387a19b",14:"4a8721d507866e301d30",15:"a9b2c0d37d323acbddc4",16:"689ba2c03cba557cabb6",17:"1c96d1b8bfdae8c0278d",18:"89f9b1494e9308d76bfc",19:"ecefb52584d912e08863",20:"c364426c6193a8a1016e",21:"63e7ab216f6db1bad8fa",22:"373f09ad2411fac82d01",23:"fca5991856525934e145",24:"c01a127cc9a0e198abbb",25:"fb9c519070e24154d531",26:"4432ab5363ea6b09f3b9",27:"8312a82db1df5bcef43b",28:"c485774664a2a07e1fc8",29:"9d0ba5a9a58985bb22c9",30:"7f6369738f993e8349e0",31:"d3af20212f8ec27c4fae",32:"67b69400c84d667e04c8",33:"74e6c489c2bea79419b4",34:"67247b9814ce15719ef7",35:"b450729f129c445085ed",36:"ceca396342f9d8e3e5ee",37:"0e02949e809d3716e48b",38:"938ac6671184a32e1af3",39:"584d948cf48efbb5ecfa",40:"e93d932ee086061c4654",41:"ec35a487ff5a3d46f5b5",42:"3e075910f375feae2662",43:"1004f991520b0480af84",44:"a95ec2eda8d3892e8afc",45:"7c1c8e418cbed108c646",46:"8e7029cf36d70b98915a",47:"68de6aae2a6b36c82942",48:"c4b0a71fb054acd9f967",49:"8724e88106c017fc7211",50:"bc0f61aed53904bd6ecc",51:"d11e3ed95aaf0b42299c",52:"7e2460e6eb686c63f790",53:"73eb08b150774b97127d",54:"38f3f406f6ba5206e12f",55:"f8df3b8bba6bf5727c39",56:"7bbf19c3d3c0707de9e3",57:"b58432185bea60b22850",58:"045280b5f71cdc9d5909",59:"92a7dc7c471a665085ca",60:"4c5a527a33889ead899e",61:"53f113f29db81561850e",62:"e0acd353801c964887f4",63:"049efae24a1ce59a4aae",64:"9296449a6ebb17339ca9",65:"dcbad73a9c8a62d59e53",66:"c06e3293e193be21892a",67:"1805864884ebd50371cf",68:"6ad21413a503f58882dd",69:"a226322d515fe66fddcb",70:"ed4fc3ae5f90d7e6d76e",71:"aeeb96c3c0febc9dbadb",72:"248c5cff109707f6aaf9",73:"f9145e901dc929183d3b",74:"298939f46bb284f832b5",75:"1e0fc42712d3a291c2f3",76:"b69a192e45259fc86001",77:"52218b667643f0318c20",78:"c4e5d6fbd99de1463e5c",79:"c344a9f8c13bea0521e1",80:"3f7fefab68c048c1f100",81:"f5eca779f7156827d107",82:"f6ffe76448ab5a3cd3b2",83:"905f4961cee6e7094824",84:"fdd259f23a83367a4b01",85:"81fb940d9d97739d596a",86:"9b7cba74d63e385a0b23",87:"fdff441fbe45dfa94275",88:"d9163204caf8c4b47b66",89:"036975b906088153abd8",90:"5bfa40b13362dc446712",91:"3e452dcaeb3da1ec766f",92:"acd5841d98570276f3ad",93:"a4d94e3b1fd88b27e16f",94:"4c9e1980da5926108ae8",95:"bf4d986d0f22696e4b1a",96:"b0d1f47a3e0595ec4ddb",97:"b2d28f5e481e677e1098"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),c},b.m=e,b.c=c,b.d=function(e,a,c){b.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},b.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(a,"a",a),a},b.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/app/taskView.vue
...@@ -36,7 +36,8 @@ ...@@ -36,7 +36,8 @@
</div> </div>
<el-table class="select-table" ref="multipleTable" :key="tableRefresh" v-loading="loading" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }" @selection-change="handleSelectionChange"> <el-table class="select-table" ref="multipleTable" :key="tableRefresh" v-loading="loading" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="45" :class-name="selectRadio == 1 ? 'cell-disabled' : 'font-size-zero'"> </el-table-column> <el-table-column type="selection" width="45" :class-name="selectRadio == 1 ? 'cell-disabled' : 'font-size-zero'"> </el-table-column>
<el-table-column width="25"> <!-- 时荒说因为商户数据量过大时，有导致服务挂掉的可能，所以此功能暂不开放 -->
<el-table-column width="25" v-if="false">
<template slot="header"> <template slot="header">
<el-dropdown style="line-height: 10px; padding: 0; margin-left: -15px; transform: translateY(4px); -webkit-transform: translateY(4px);" placement="bottom-start"> <el-dropdown style="line-height: 10px; padding: 0; margin-left: -15px; transform: translateY(4px); -webkit-transform: translateY(4px);" placement="bottom-start">
<span class="el-dropdown-link"><i class="iconfont icongengduo"></i> </span> <span class="el-dropdown-link"><i class="iconfont icongengduo"></i> </span>
......
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