提交

src/view/allMedia/H5Editor.vue

@@ -410,7 +410,7 @@ provide('deleteItemComponents', value => {
   text-align: center;
   color: #333;
   padding: 8px 0;
-  font-size: 16px;
+  font-size: 14px;
 }
 
 .showList {

src/view/allMedia/H5Mall.vue

@@ -243,7 +243,7 @@ const auth = () => {
   color: #666;
   padding: 0 5px;
   margin: 5px 0;
-  font-size: 14px;
+  font-size: 12px;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;

src/view/allMedia/analysis.vue

@@ -1,7 +1,7 @@
 <template>
     <el-scrollbar ref="scrollbar" class="analysis" @scroll="scroll">
       <div class="head">
-        <div class="title">数据分析</div>
+        <div class="title">数据汇聚</div>
         <div class="searchRow">
           <div class="searchCol searchTitle">分类:</div>
           <div
@@ -237,7 +237,7 @@
   
   
   .title {
-    font-size: 18px;
+    font-size: 16px;
     font-weight: 600;
     height: 49px;
     line-height: 49px;

src/view/allMedia/analysis_detail.vue

@@ -25,7 +25,7 @@ raw.value = D || {};
 <style>
 .analysis_detail {
   padding: 2em 50px;
-  font-size: 18px;
+  font-size: 16px;
 }
 .analysis_detail * {
   line-height: 1.5em;
@@ -37,7 +37,7 @@ raw.value = D || {};
   margin: 3px auto;
 }
 .analysis_detail .title {
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 600;
   height: 60px;
   line-height: 60px;
@@ -50,7 +50,7 @@ raw.value = D || {};
   font-weight: 500;
   height: 40px;
   line-height: 40px;
-  font-size: 16px;
+  font-size: 12px;
   margin-bottom: 2em;
   text-align: center;
 }

src/view/allMedia/analysis_map.vue

@@ -317,7 +317,7 @@ const disDate = date => {
 }
 
 .title {
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 600;
   height: 49px;
   line-height: 49px;

src/view/allMedia/authorization.vue

@@ -92,7 +92,7 @@ const toClick = item => {
 .text {
   border-top: 1px solid #fdc112;
   color: #fdc112;
-  font-size: 22px;
+  font-size: 20px;
   margin: 3em 0 1em 0;
 }
 .text .textarea {

src/view/allMedia/components/H5.vue

@@ -65,7 +65,7 @@ const mouseleave = ()=> {
 
 .inShow {
   position: relative;
-  font-size: 14px
+  font-size: 12px
 }
 </style>
 

src/view/allMedia/components/analysis_hot_list.vue

@@ -11,7 +11,7 @@
       @click="() => searchHot(item.content)"
     >
       <span
-        :style="{ color: colorRanking[index] || '#999', 'font-size': '14px' }"
+        :style="{ color: colorRanking[index] || '#999', 'font-size': '12px' }"
         >{{ index + 1 }}</span
       >
       {{ item.content }}
@@ -59,7 +59,7 @@ hot();
   background-color: #fff;
 }
 .title {
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 600;
   height: 49px;
   line-height: 49px;
@@ -68,7 +68,7 @@ hot();
 }
 .hotItem {
   line-height: 1em;
-  font-size: 16px;
+  font-size: 14px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;

src/view/allMedia/components/analysis_list.vue

@@ -144,7 +144,7 @@ defineExpose({
   padding: 0.5em;
   cursor: pointer;
   line-height: 1.8em;
-  font-size: 16px;
+  font-size: 14px;
 }
 .list:hover {
   background-color: rgba(64, 158, 255, 0.1);

src/view/allMedia/components/proofread_errors.vue

@@ -173,7 +173,7 @@ function resumeText(item, index, pindex) {
   border-left: 6px solid;
   margin-bottom: 1em;
   padding: 5px 35px 5px 15px;
-  font-size: 14px;
+  font-size: 12px;
   line-height: 1.5em;
   background-color: #f9fafc;
 }

src/view/allMedia/components/reporting_list.vue

@@ -272,7 +272,7 @@ defineExpose({
   padding: 0.5em;
   cursor: pointer;
   line-height: 1.8em;
-  font-size: 16px;
+  font-size: 14px;
 }
 .list:hover {
   background-color: rgba(64, 158, 255, 0.1);

src/view/allMedia/login.vue

@@ -84,7 +84,7 @@ async function onSubmit() {
   width: 100%;
   height: 100%;
   font-weight: 500;
-  font-size: 14px;
+  font-size: 12px;
   background-image: url(../../assets/img/0.jpg);
   background-size: 100% 100%;
   background-repeat: no-repeat;

src/view/allMedia/main.vue

@@ -17,7 +17,7 @@
       >
         <span
           :class="{ menu_iconfont: true, [item.icon]: true }"
-          style="margin-right: 5px;font-size: 22px;"
+          style="margin-right: 5px;font-size: 20px;"
         >
         </span>
         {{ item.title }}
@@ -41,7 +41,7 @@ const menu = [
     path: '/main_home/proofread',
   },
   {
-    title: '数据分析',
+    title: '数据汇聚',
     icon: 'icon-RectangleCopy2',
     path: '/main_home/analysis',
   },
@@ -56,7 +56,7 @@ const menu = [
     path: '/main_home/reporting',
   },
   {
-    title: '数据汇聚',
+    title: '账号分析',
     icon: 'icon-RectangleCopy1',
     path: '/main_home/convergence',
   },
@@ -119,6 +119,7 @@ const selectMenuFunc = item => {
   height: 100%;
   overflow-y: auto;
   flex: 1;
+  font-size: 14px;
 }
 
 .menu-item {
@@ -126,7 +127,7 @@ const selectMenuFunc = item => {
   height: 3em;
   line-height: 3em;
   cursor: pointer;
-  font-size: 16px;
+  font-size: 15px;
   color: #f3f3f3;
 }
 .mainMaster .min-item {

src/view/allMedia/reporting.vue

@@ -113,7 +113,7 @@ const setTotal = total => {
 }
 
 .title {
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 600;
   height: 49px;
   line-height: 49px;

src/view/easyDiffusion/components/imageEdit.vue

@@ -151,7 +151,14 @@
           </div>
         </el-col>
         <el-col :span="12">
-          <div style=" position: relative;width: 512px;height:512px;margin: 0 auto;">
+          <div
+            style="
+              position: relative;
+              width: 512px;
+              height: 512px;
+              margin: 0 auto;
+            "
+          >
             <canvas
               class="canvasBg"
               :width="512"
@@ -159,6 +166,7 @@
               ref="canvasBg"
             ></canvas>
             <canvas
+              class="canvas"
               :width="512"
               :height="512"
               @mousedown="mousedownFunc"
@@ -332,15 +340,12 @@ const mouseover = ele => {
 
 const start = ele => {
   if (!mouseDown) return;
-  const w = canvas.value.width;
-  canvas.value.width = w;
   ctx.beginPath();
   ctx.lineCap = 'round';
   ctx.lineJoin = 'round';
   ctx.shadowBlur = select.value[4] / 4 + 1;
   ctx.shadowColor = select.value[1];
   ctx.strokeStyle = select.value[1];
-  console.log(select.value[3]);
   ctx.globalAlpha = select.value[3];
   ctx.lineWidth = select.value[2];
   ctx.moveTo(ele.offsetX, ele.offsetY);
@@ -358,13 +363,38 @@ const start = ele => {
 
 const mouseout = () => {
   // 鼠标移出
+  if(!mouseDown) return;
   ctx.closePath();
   drawBg();
 };
 
 //将线条绘制到背景canvas上
 const drawBg = () => {
-  console.log(pathList, ctxBg);
+  if (!pathList.length) return;
+  const config = pathList[pathList.length - 1];
+  ctxBg.beginPath();
+  ctxBg.lineCap = config.lineCap;
+  ctxBg.lineJoin = config.lineJoin;
+  ctxBg.shadowBlur = config.shadowBlur;
+  ctxBg.shadowColor = config.shadowColor;
+  ctxBg.strokeStyle = config.strokeStyle;
+  ctxBg.globalAlpha = config.globalAlpha;
+  ctxBg.lineWidth = config.lineWidth;
+  ctxBg.moveTo(config.path[0].x, config.path[0].y);
+  for (let i = 1; i < config.path[0].length; i++) {
+    const v = config.path[0][i];
+    ctxBg.quadraticCurveTo(
+      config.path[0][i - 1].x,
+      config.path[0][i - 1].y,
+      v.x,
+      v.y
+    );
+  }
+  ctxBg.stroke();
+  console.log("---",config,ctxBg,canvasBg)
+  ctxBg.closePath();
+  const w = canvas.value.width;
+  canvas.value.width = w;
 };
 
 onMounted(() => {
@@ -512,12 +542,11 @@ h4:first-child {
   border: 1px solid #3584e4;
 }
 
-.canvas{
+.canvas {
   position: absolute;
   top: 0;
   left: 50%;
   transform: translateX(-50%);
-  background: #ffffff;
 }
 .canvasBg {
   position: absolute;

src/view/qh/index.vue

@@ -176,7 +176,6 @@ function saveText() {
   inputText.value = '';
 
   //   index++;
-  console.log(chatlist.value);
   if (chatlist.value.length > 3) {
     chatlist.value.shift();
   }