Browse Source

代码分支残留清除

hbchen-home 1 year ago
parent
commit
5eb1546472

+ 2 - 2
src/views/classify_manage/classifylist.vue

@@ -186,12 +186,12 @@
 					prop="IsShow" v-if="aeForm.parent_id==0">
 					<el-switch v-model="aeForm.IsShow" inactive-color="#ededed"></el-switch>
 				</el-form-item>
-				<!-- <el-form-item label="PPT转报告" prop="hasTel" v-if="aeForm.parent_id!=0">
+				<el-form-item label="PPT转报告" prop="hasTel" v-if="aeForm.parent_id!=0">
 					<el-select v-model="aeForm.hasTel" placeholder="请选择" style="width:400px;">
 						<el-option label="无" :value="0"></el-option>
 						<el-option label="有" :value="1"></el-option>
 					</el-select>
-				</el-form-item> -->
+				</el-form-item>
 				<el-form-item label="关联设置" 
 					prop="relate" v-if="!['晨报','周报'].includes(aeForm.classify_name)">
 					<el-select v-model="aeForm.relate" multiple placeholder="请选择" style="width:400px;">

+ 4 - 8
src/views/dataEntry_manage/databaseList.vue

@@ -80,7 +80,7 @@
 						@node-drag-leave="dropMouseLeave"
 						@node-drag-enter="dropMouseOver"
 					>
-						<div
+						<span
 							class="custom-tree-node"
 							slot-scope="{ node, data }"
 						>
@@ -102,11 +102,7 @@
 							>
 								<span>{{ currentLang==='en' ? (data.ClassifyNameEn||data.ClassifyName) : data.ClassifyName }}</span>
 							</span>
-
-							<!-- 标识计算指标小icon -->
-							<svg v-if="data.EdbType===2&&select_node !== data.UniqueCode" t="1692078566249" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8640" width="20" height="20"><path d="M892.498502 161.874761l-730.640626 730.624253c-4.14132 4.237511-9.673313 6.299473-15.141862 6.299473-5.516644 0-11.048637-2.062985-15.205307-6.299473-8.394181-8.394181-8.394181-21.969361 0-30.347169l730.656999-730.640626c8.362458-8.394181 21.969361-8.394181 30.331819 0C900.892683 139.889027 900.892683 153.49593 892.498502 161.874761L892.498502 161.874761zM447.519941 340.089675 103.737154 340.089675c-11.864212 0-21.521153-9.625218-21.521153-21.457708 0-11.864212 9.657964-21.521153 21.521153-21.521153l343.782787 0c11.879562 0 21.505803 9.657964 21.505803 21.521153C469.025745 330.464457 459.399503 340.089675 447.519941 340.089675L447.519941 340.089675zM275.652596 512.005117c-11.879562 0-21.521153-9.641591-21.521153-21.457708L254.131443 146.653081c0-11.799744 9.641591-21.457708 21.521153-21.457708 11.83249 0 21.457708 9.657964 21.457708 21.457708l0 343.895351C297.110303 502.363526 287.484062 512.005117 275.652596 512.005117L275.652596 512.005117zM920.335501 662.46285l-343.830883 0c-11.879562 0-21.521153-9.641591-21.521153-21.521153 0-11.864212 9.641591-21.457708 21.521153-21.457708l343.830883 0c11.83249 0 21.457708 9.593496 21.457708 21.457708C941.793208 652.821259 932.166967 662.46285 920.335501 662.46285L920.335501 662.46285zM920.335501 834.378292l-343.830883 0c-11.879562 0-21.521153-9.641591-21.521153-21.521153 0-11.864212 9.641591-21.457708 21.521153-21.457708l343.830883 0c11.83249 0 21.457708 9.593496 21.457708 21.457708C941.793208 824.736701 932.166967 834.378292 920.335501 834.378292L920.335501 834.378292z" p-id="8641" fill="#999999"></path></svg>
-
-							<div
+							<span
 								style="display: flex; align-items: center"
 								v-if="select_node === data.UniqueCode"
 							>
@@ -155,8 +151,8 @@
 									style="width: 14px; height: 14px;margin-left: 8px"
 									alt=""
 								/>
-							</div>
-						</div>
+							</span>
+						</span>
 					</el-tree>
 					<div class="noDepart" @click="addLevelOneHandle" v-if="CanOpClassify">
 						<img

+ 4 - 8
src/views/predictEdb_manage/predictEdb.vue

@@ -69,7 +69,7 @@
 						@node-drag-leave="dropMouseLeave"
 						@node-drag-enter="dropMouseOver"
 					>
-						<div class="custom-tree-node" slot-scope="{ node, data }">
+						<span class="custom-tree-node" slot-scope="{ node, data }">
 							<el-input
 								ref="editVal"
 								style="width: 90px"
@@ -89,11 +89,7 @@
 							>
 								<span>{{ currentLang==='en' ? (data.ClassifyNameEn||data.ClassifyName) : data.ClassifyName }}</span>
 							</span>
-
-							<!-- 标识计算指标小icon -->
-							<svg v-if="data.EdbType===2&&select_node !== data.UniqueCode" t="1692078566249" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8640" width="20" height="20"><path d="M892.498502 161.874761l-730.640626 730.624253c-4.14132 4.237511-9.673313 6.299473-15.141862 6.299473-5.516644 0-11.048637-2.062985-15.205307-6.299473-8.394181-8.394181-8.394181-21.969361 0-30.347169l730.656999-730.640626c8.362458-8.394181 21.969361-8.394181 30.331819 0C900.892683 139.889027 900.892683 153.49593 892.498502 161.874761L892.498502 161.874761zM447.519941 340.089675 103.737154 340.089675c-11.864212 0-21.521153-9.625218-21.521153-21.457708 0-11.864212 9.657964-21.521153 21.521153-21.521153l343.782787 0c11.879562 0 21.505803 9.657964 21.505803 21.521153C469.025745 330.464457 459.399503 340.089675 447.519941 340.089675L447.519941 340.089675zM275.652596 512.005117c-11.879562 0-21.521153-9.641591-21.521153-21.457708L254.131443 146.653081c0-11.799744 9.641591-21.457708 21.521153-21.457708 11.83249 0 21.457708 9.657964 21.457708 21.457708l0 343.895351C297.110303 502.363526 287.484062 512.005117 275.652596 512.005117L275.652596 512.005117zM920.335501 662.46285l-343.830883 0c-11.879562 0-21.521153-9.641591-21.521153-21.521153 0-11.864212 9.641591-21.457708 21.521153-21.457708l343.830883 0c11.83249 0 21.457708 9.593496 21.457708 21.457708C941.793208 652.821259 932.166967 662.46285 920.335501 662.46285L920.335501 662.46285zM920.335501 834.378292l-343.830883 0c-11.879562 0-21.521153-9.641591-21.521153-21.521153 0-11.864212 9.641591-21.457708 21.521153-21.457708l343.830883 0c11.83249 0 21.457708 9.593496 21.457708 21.457708C941.793208 824.736701 932.166967 834.378292 920.335501 834.378292L920.335501 834.378292z" p-id="8641" fill="#999999"></path></svg>
-
-							<div
+							<span
 								style="display: flex; align-items: center"
 								v-if="select_node === data.UniqueCode"
 							>
@@ -140,8 +136,8 @@
 									style="width: 14px; height: 14px;margin-left: 8px"
 									alt=""
 								/>
-							</div>
-						</div>
+							</span>
+						</span>
 					</el-tree>
 					<div
 						class="noDepart"

+ 0 - 124
src/views/report_manage/editChapterReport.vue

@@ -383,130 +383,6 @@ export default {
         addType: [{ required: true, message: "请选择", trigger: "change" }],
       },
       lastEditRange: null,
-      froalaConfig: {
-        toolbarButtons: [
-          "insertImage",
-          "insertVideo",
-          "insertLink",
-          "embedly",
-          "insertFile",
-          "textColor",
-          "bold",
-          "italic",
-          "underline",
-          "strikeThrough",
-          "subscript",
-          "superscript",
-          "fontFamily",
-          "fontSize",
-          "color",
-          "inlineClass",
-          "inlineStyle",
-          "paragraphStyle",
-          "lineHeight",
-          "paragraphFormat",
-          "align",
-          "formatOL",
-          "formatUL",
-          "outdent",
-          "indent",
-          "quote",
-          "insertTable",
-          "emoticons",
-          "fontAwesome",
-          "specialCharacters",
-          "insertHR",
-          "selectAll",
-          "clearFormatting",
-          "html",
-          "undo",
-          "redo",
-        ],
-        imageDefaultWidth: false,
-        imageInsertButtons: ["imageUpload", "imageByURL"],
-        height: 800,
-        fontSizeDefaultSelection: "16",
-        fontSize: ["12", "14", "16", "18", "20", "24", "28", "32", "36", "40"],
-        fontFamily:{
-          'Arial,Helvetica,sans-serif': 'Arial',
-          'Georgia,serif': 'Georgia',
-          'Impact,Charcoal,sans-serif': 'Impact',
-          'Tahoma,Geneva,sans-serif': 'Tahoma',
-          "'Times New Roman',Times,serif": 'Times New Roman',
-          'Verdana,Geneva,sans-serif': 'Verdana',
-          '宋体': '宋体',
-          '黑体': '黑体',
-          '微软雅黑': '微软雅黑'
-        },
-        theme: "dark", //主题
-        placeholderText: "请输入内容",
-        language: "zh_cn", //国际化
-        imageUploadURL: process.env.VUE_APP_API_ROOT + "/report/uploadImg", //上传url
-        imagePaste: true,
-        imagePasteProcess: true,
-        imageResize: true,
-        videoUploadURL: process.env.VUE_APP_API_ROOT + "/report/uploadImg", //上传url
-        fileUploadURL: process.env.VUE_APP_API_ROOT + "/report/uploadImg", //上传url 更多上传介绍 请访问https://www.froala.com/wysiwyg-editor/docs/options
-        toolbarSticky: false, //操作栏是否自动吸顶
-        imageEditButtons: [
-          "imageLink",
-          "imageAlign",
-          "imageInfo",
-          "imageRemove",
-        ],
-        quickInsertButtons: ["image", "table", "ul", "ol", "hr"], //快速插入项
-        toolbarVisibleWithoutSelection: true, //是否开启 不选中模式
-        saveInterval: 0,
-        /* saveParam: 'Content',
-					saveURL: process.env.VUE_APP_API_ROOT+'/report/saveReportContent',
-					saveMethod: 'POST',
-					saveParams: {}, */
-        events: {
-          initialized: function () {
-            //this.editor 定义在vue data 中
-            that.editor = this;
-          },
-          keyup: function (e, editor) {
-            //添加事件,在每次按键按下时,都记录一下最后停留位置
-            that.lastEditRange = getSelection().getRangeAt(0) || 0;
-          },
-          click: function (e, editor) {
-            //添加事件,在每次鼠标点击时,都记录一下最后停留位置
-            if (getSelection().type === "None") return;
-            that.lastEditRange = getSelection().getRangeAt(0) || 0;
-          },
-          //内容改变事件
-          contentChanged: function () {
-            console.log("cont-change");
-            that.ischange = true;
-            if (getSelection().type !== "None") {
-              that.lastEditRange = getSelection().getRangeAt(0) || 0;
-            }
-          },
-          //粘贴图片上传事件
-          "image.beforePasteUpload": function (img) {
-            //console.log('image.beforePasteUpload',img)
-            //暂停自动保存
-            that.autoSaveFlag = false;
-          },
-          //点击toolbar上传图片事件
-          "image.beforeUpload": function (imgs) {
-            //console.log('image.beforeUpload',imgs)
-            //暂停自动保存
-            that.autoSaveFlag = false;
-          },
-          "image.inserted": function ($img, response) {
-            //console.log('img-inserted',$img)
-            //开启自动保存
-            that.autoSaveFlag = true;
-          },
-          //如果上传图片出错,重置autoSaveFlag
-          "image.error": function (error, response) {
-            that.autoSaveFlag = true;
-          },
-        },
-        charCounterCount: false,
-      },
       reportloadding: false,
       timer: null,
       ischange: false,

+ 0 - 11
src/views/report_manage/mixins/reportMixin.js

@@ -70,17 +70,6 @@ export default {
         height: 800,
         fontSize: ["12", "14", "16", "18", "20", "24", "28", "32", "36", "40"],
         fontSizeDefaultSelection: "16",
-        fontFamily:{
-          'Arial,Helvetica,sans-serif': 'Arial',
-          'Georgia,serif': 'Georgia',
-          'Impact,Charcoal,sans-serif': 'Impact',
-          'Tahoma,Geneva,sans-serif': 'Tahoma',
-          "'Times New Roman',Times,serif": 'Times New Roman',
-          'Verdana,Geneva,sans-serif': 'Verdana',
-          '宋体': '宋体',
-          '黑体': '黑体',
-          '微软雅黑': '微软雅黑'
-        },
         theme: "dark", //主题
         placeholderText: "请输入内容",
         language: "zh_cn", //国际化