样式调整bug修改

src/assets/styles/element-ui.scss

@@ -155,4 +155,9 @@
   background: #fafafa!important;
   -webkit-text-fill-color:#606266!important;
   color:#606266!important;
+}
+
+.el-textarea.is-disabled .el-textarea__inner::-webkit-input-placeholder{
+  color:#999!important;
+  -webkit-text-fill-color:#999!important;
 }

src/views/dataBoard/board/customerAnalysis/index.vue

@@ -351,10 +351,10 @@ const onQuery = () => {
 const getCountryData = () => {
   proxy.post("/customizeArea/list", { parentId: "0" }).then((res) => {
     countryData.value = res;
-    queryForm.countryId = "44";
+    queryForm.countryId = "";
     let endData = new Date();
     let beginDate = new Date();
-    beginDate.setFullYear(endData.getFullYear() - 1);
+    beginDate.setMonth(0);
     queryForm.timeArr = [
       proxy.parseTime(beginDate, "{y}-{m}-{d}"),
       proxy.parseTime(endData, "{y}-{m}-{d}"),

src/views/dataBoard/board/productAnalysis/index.vue

@@ -83,7 +83,7 @@
     <el-row style="margin-top: 20px" type="flex">
       <el-col :span="12">
         <div style="margin-right: 20px; background-color: white; padding: 20px; height: 100%">
-          <TitleInfo :content="'产品类型排行'"></TitleInfo>
+          <TitleInfo :content="'产品分类排行'"></TitleInfo>
           <div style="padding-top: 20px" v-loading="loadingTwo">
             <el-table
               :data="allData.productTypeRanking"
@@ -91,6 +91,7 @@
               style="width: 100%"
               max-height="30vh"
               @sort-change="sortChangeTwo">
+              <el-table-column type="index" width="50" />
               <el-table-column label="产品类型" prop="name" min-width="140" />
               <el-table-column label="销售量" prop="contractQuantity" sortable width="120" />
               <el-table-column label="销售额" prop="contractAmount" sortable width="120" />
@@ -108,12 +109,14 @@
             <el-table
               :data="allData.productRanking"
               :default-sort="{ prop: 'contractQuantity', order: 'descending' }"
-              style="width: 100%"
+              style="width: 100%" border 
               max-height="30vh"
               @sort-change="sortChangeThree">
+              <el-table-column type="index" width="50" />
               <el-table-column label="产品名称" prop="name" min-width="140" />
               <el-table-column label="销售量" prop="contractQuantity" sortable width="120" />
               <el-table-column label="销售额" prop="contractAmount" sortable width="120" />
+              
               <el-table-column label="采购量" prop="purchaseQuantity" sortable width="120" />
               <el-table-column label="采购额" prop="purchaseAmount" sortable width="120" />
               <!-- <el-table-column label="生产总量" prop="name" sortable width="120" /> -->
@@ -157,7 +160,7 @@ const getCountryData = () => {
     countryData.value = res;
     let endData = new Date();
     let beginDate = new Date();
-    beginDate.setFullYear(endData.getFullYear() - 1);
+    beginDate.setMonth(0);
     queryForm.timeArr = [proxy.parseTime(beginDate, "{y}-{m}-{d}"), proxy.parseTime(endData, "{y}-{m}-{d}")];
     queryForm.beginTime = queryForm.timeArr[0];
     queryForm.endTime = queryForm.timeArr[1];

src/views/process/processConfig/processChart.vue

@@ -14,7 +14,7 @@
 		<div class="content">
 			<div class="commons-title">流程节点配置</div>
 			<div class="chart-warp">
-				<vueFlow :title='title'></vueFlow>
+				<vueFlow :title='title' @changeTitle="e => title = e"></vueFlow>
 			</div>
 		</div>
 	</div>

src/views/process/processConfig/vueFlow.vue

@@ -436,8 +436,8 @@ const deleteFlowDefinitionNodeObj = (id) => {
 	dialogVisible.value = false
 }
 
-const gethandleObjectList = (e) => {
-	formData.data.handleObjectId = ''
+const gethandleObjectList = (e,data) => {
+	
 	if (e === 1) {
 		proxy
 			.get(
@@ -452,7 +452,12 @@ const gethandleObjectList = (e) => {
 						value: item.userId,
 					}
 				})
+				formData.data = {
+					...data,
+				}
+				if(!data) formData.data.handleObjectId = ''
 			})
+		
 	}
 	if (e === 3 || e === 2) {
 		proxy
@@ -468,6 +473,10 @@ const gethandleObjectList = (e) => {
 						value: item.deptId,
 					}
 				})
+				formData.data = {
+					...data,
+				}
+				if(!data) formData.data.handleObjectId = ''
 			})
 	}
 	if (e === 4) {
@@ -486,6 +495,10 @@ const gethandleObjectList = (e) => {
 						value: item.roleId,
 					}
 				})
+				formData.data = {
+					...data,
+				}
+				if(!data) formData.data.handleObjectId = ''
 			})
 	}
 }
@@ -682,6 +695,7 @@ const antvInit = (data) => {
 		if (flowDefinitionNodeObj.value[cell.id]) {
 			formData.data = flowDefinitionNodeObj.value[cell.id]
 			formData.data.cell = cell
+			gethandleObjectList(flowDefinitionNodeObj.value[cell.id].handleObjectType,flowDefinitionNodeObj.value[cell.id])
 		} else {
 			formData.data = {
 				id: cell.id,
@@ -689,7 +703,7 @@ const antvInit = (data) => {
 				nodeButtonSet: [1],
 			}
 		}
-
+		
 		dialogVisible.value = true
 	})
 	// #region 初始化图形
@@ -902,8 +916,10 @@ const antvInit = (data) => {
 	
 	
 }
+const emit = defineEmits(["changeTitle"]);
 const getFlowInfo =	(()=>{
 	proxy.post('/flowDefinition/getDetails', {id:submitFormData.id}).then((res) => {
+		emit("changeTitle", res.titleTemplate);
 		if(res.lineObject) {
 			flowDefinitionNodeObj.value = JSON.parse(res.lineObject)
 			for (const key in flowDefinitionNodeObj.value) {
@@ -921,7 +937,7 @@ const getFlowInfo =	(()=>{
 		}
 		for (const key in flowDefinitionNodeObj.value) {
 			//延迟等待dom渲染完成
-			setTimeout(() => {
+			setTimeout(() => { 
 				if(flowDefinitionNodeObj.value[key].nodeName != '结束' && flowDefinitionNodeObj.value[key].cell != '开始'){
 					let htmlNode = document.querySelector("g[data-cell-id='"+ key +"']")
 					//获取htmlNode节点下的title,修改title的内容
@@ -951,32 +967,7 @@ onMounted(() => {
 	submitFormData.tenantId = router.currentRoute.value.query.tenantId
 	if(submitFormData.flowInfoId) {
 		getFlowInfo()
-		// antvInit()
-		// setTimeout(() => {
-		// 	for (let i = 0; i < dataJson.flowDefinitionNodeList.length; i++) {
-		// 		const element = dataJson.flowDefinitionNodeList[i];
-		// 		console.log(element)
-		// 		if(!element.cell) {
-		// 			continue
-		// 		}
-		// 		if( element.cell.nodeName != '开始' && element.cell.nodeName != '结束'){
-		// 			flowDefinitionNodeObj.value[element.cell.id] = element
-		// 			flowDefinitionNodeObj.value[element.cell.id].nodeButtonSet = element.nodeButtonSet.split(',')
-		// 			graph.addNode({
-		// 				shape: 'handle-btn',
-		// 				x: element.cell.position.x,
-		// 				y: element.cell.position.y,
-		// 				label: '办理',
-		// 				id:element.cell.id,
-		// 				attrs: {
-							
-		// 				},
-		// 			})
-		// 		}
-				
-		// 	}
-		// 	console.log(flowDefinitionNodeObj.value)
-		// }, 1000);
+		
 	}
 	setTimeout(() => {
 		if(window.document.getElementById('minimap').children.length > 1) {