From 81b90c3bbf057ce74af7c3e5292500923774fdc4 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Sat, 25 Nov 2023 15:28:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 node_modules/.package-lock.json               |   6 +
 package-lock.json                             |   7 +
 src/types/components.d.ts                     |   3 +
 src/views/opk/asd/news/dialog.vue             | 126 +-----------
 src/views/opk/asd/news/yg.vue                 | 187 +-----------------
 .../sysworkflow/flow/flowDrawingBoard.vue     |   7 +-
 6 files changed, 21 insertions(+), 315 deletions(-)

diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
index 4d3c122d9..7c8e2b135 100644
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -1025,6 +1025,12 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/uuid": {
+      "version": "9.0.7",
+      "resolved": "https://registry.npmmirror.com/@types/uuid/-/uuid-9.0.7.tgz",
+      "integrity": "sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g==",
+      "dev": true
+    },
     "node_modules/@types/web-bluetooth": {
       "version": "0.0.18",
       "resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.18.tgz",
diff --git a/package-lock.json b/package-lock.json
index 4e4fe61cc..0ca6e4d8a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -44,6 +44,7 @@
         "@types/md5": "^2.3.2",
         "@types/nprogress": "^0.2.0",
         "@types/path-browserify": "^1.0.0",
+        "@types/uuid": "^9.0.7",
         "@typescript-eslint/eslint-plugin": "^5.59.6",
         "@typescript-eslint/parser": "^5.59.6",
         "autoprefixer": "^10.4.14",
@@ -1415,6 +1416,12 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/uuid": {
+      "version": "9.0.7",
+      "resolved": "https://registry.npmmirror.com/@types/uuid/-/uuid-9.0.7.tgz",
+      "integrity": "sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g==",
+      "dev": true
+    },
     "node_modules/@types/web-bluetooth": {
       "version": "0.0.18",
       "resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.18.tgz",
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index dc75103ca..af0b8b96c 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -18,6 +18,7 @@ declare module '@vue/runtime-core' {
     CopyerDrawer: typeof import('./../components/workflow/drwer/copyerDrawer.vue')['default']
     DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default']
     DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default']
+    ElAffix: typeof import('element-plus/es')['ElAffix']
     ElAlert: typeof import('element-plus/es')['ElAlert']
     ElAside: typeof import('element-plus/es')['ElAside']
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
@@ -65,6 +66,8 @@ declare module '@vue/runtime-core' {
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSpace: typeof import('element-plus/es')['ElSpace']
+    ElStep: typeof import('element-plus/es')['ElStep']
+    ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
diff --git a/src/views/opk/asd/news/dialog.vue b/src/views/opk/asd/news/dialog.vue
index bcf94308c..909f4c24d 100644
--- a/src/views/opk/asd/news/dialog.vue
+++ b/src/views/opk/asd/news/dialog.vue
@@ -95,131 +95,7 @@
     </el-form>
   </el-dialog>
 </template>
-<<<<<<< HEAD
-  <script lang="ts" setup>
-  import { reactive } from "vue";
-  import {tarlist,addPostCont,addtarget,getgroupuser,addposttargetcont,search_orgpost} from '@/api/opk/api'
-  import {editPostCont} from '@/api/opk/pulic/api'
-  import { ge_add } from '@/api/opk/news/api'
-  import { create_scheme } from '@/api/opk/zxy/news/api'
 
-  interface FormInfo {
-	id: string;
-	age: string;
-	name: string;
-	sex: string;
-	ccc: string;
-	ade: string;
-	sort: number;
-	title: string;
-	type: number;
-  }
-const isshow = ref(false)
-const props= defineProps( {
-	  title: {
-		type: String,
-		default: "",
-	  },
-	  addPostBox: {
-		type: Boolean,
-		default: false,
-	  },
-	  addrowInfo: {
-		type: Object as () => FormInfo,
-		default() {
-		  return {};
-		},
-	  },
-	  arrayNum: {
-		type: Number,
-		default: 0,
-	  },
-	});
-const orgTreeProps ={
-   label: 'name',
-   children:'child'
-}
-const orgTreeProp = {
-	label:'title',
-	children:'children'
-}
-const emit = defineEmits(["update:addPostBox","editRow","addRow"])
-const formData = reactive({
-	deaprtname:"",
-	value1:"",
-	asd:[] as string[],
-	lzq:"",
-})
-const tableData = ref<any>([])
-function jjjs(){
-	addPostCont("/hrapi/org/govthree","post")
-	    .then(data => {
-        	tableData.value = data.data[3].child[14].child;
-        })
-        .catch(error => {
-          console.error('Error fetching data:', error);
-        });
-}
-jjjs()
-const handle = (data:any)=>{
-	formData.deaprtname = data.id;
-	ge_adds()
-}
-//行政组织
-const tablea = ref<any>([])
-function ge_adds(){
-	const add = formData.deaprtname.toString()
-	ge_add({id:add})
-	    .then(data => {
-        	tablea.value = data.data;
-        })
-        .catch(error => {
-          console.error('Error fetching data:', error);
-        }).finally(()=>{
-			isshow.value = false
-	})
-}
-ge_adds()
-  // 关闭弹窗
- const handleClose = ()=> {
-    emit("update:addPostBox", false);
-  }
-const handleDel = (val:any) => {
-  		ElMessageBox.confirm("你确定删除这条信息吗?", "提示", {
-    		confirmButtonText: "确认",
-    		cancelButtonText: "取消",
-    		type: "warning",
-  		})
-			handleSure(val)
-			console.log(val.id)	
-};
-const handleSure = (val:any)=> {
-    const index = tableData.value.findIndex((item:any) => item.id === val.id);
-    if(index!=-1){
-		tableData.value.splice(index, 1);
-		}
-}
- const submitForm=()=> {
-	const add = formData.deaprtname.toString()
-	const ess = new Date(formData.value1).getFullYear()
-	const see = ess.toString()
-	if (props.addrowInfo.name) {
-      // 修改
-      const id = props.addrowInfo; // 假设你有一个唯一的ID来识别要修改的项
-      emit("editRow", formData);
-    } else {
-      // 新增
-      create_scheme({orgid:add,year:see,child:tablea._value})
-        .then((response:any) => {
-          if (response.code === 200) {
-            ElMessage.success("新增成功");
-            emit("addRow", formData);
-          } else {
-            ElMessage.error("新增成功");
-			handleClose()
-          }
-        })
-=======
 <script lang="ts" setup>
 import { reactive } from "vue";
 import {
@@ -240,7 +116,7 @@ const getSummaries = (param: any) => {
     if (index === 0) {
       formData.sums[index] = "合计";
       return;
->>>>>>> luzhiqiang_v1
+
     }
     const values = data.map((item) => Number(item[column.property]));
     if (!values.every((value) => Number.isNaN(value))) {
diff --git a/src/views/opk/asd/news/yg.vue b/src/views/opk/asd/news/yg.vue
index e20b7d0f4..6de657a07 100644
--- a/src/views/opk/asd/news/yg.vue
+++ b/src/views/opk/asd/news/yg.vue
@@ -4,7 +4,7 @@
 @ 备注: 
 -->
 <template>
-<<<<<<< HEAD
+
 	<el-dialog :model-value="true" title="查看方案详情" style="width:70%" @close="handleClose">
 		<el-table :data="tablea" border label-width="120px" class="demo-ruleForm" :span-method="objectSpanMethod" style="width:100%">
 			<el-table-column prop="dimensionname" label="考核维度"/>
@@ -91,190 +91,7 @@ const props= defineProps( {
 const orgTreeProps ={
    label: 'name',
 }
-=======
-  <el-dialog
-    :model-value="true"
-    title="查看方案详情"
-    style="width: 80%"
-    @close="handleClose"
-  >
-    <el-table
-      :data="tablea"
-      border
-      label-width="120px"
-      class="demo-ruleForm"
-      :span-method="objectSpanMethod"
-      style="width: 100%"
-    >
-      <el-table-column
-        prop="dimensionname"
-        label="考核维度"
-        width="90"
-        :resizable="false"
-      />
-      <el-table-column
-        prop="dimensionstandard"
-        label="维度权重"
-        width="90"
-        :resizable="false"
-        align="center"
-      />
-      <el-table-column
-        label="考核指标"
-        align="center"
-        width="130"
-        :resizable="false"
-      >
-        <template #default="scope">
-          <a
-            v-if="scope.row.attribute == 1"
-            class="hjk"
-            @click="cancelDialog(scope.row)"
-            >{{ scope.row.targetname }}</a
-          >
-          <a v-if="scope.row.attribute == 2">{{ scope.row.targetname }}</a>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="Targetstandard"
-        label="权重指标"
-        align="center"
-        width="90"
-        :resizable="false"
-      />
-      <el-table-column prop="content" label="说明" />
-      <el-table-column
-        prop="unit"
-        label="单位"
-        width="70"
-        align="center"
-        :resizable="false"
-      />
-      <el-table-column
-        prop="state"
-        label="周期"
-        width="70"
-        align="center"
-        :resizable="false"
-      >
-        <template #default="scope">
-          <span v-if="scope.row.state == 1" class="el-tag">月</span>
-          <span v-if="scope.row.state == 2" class="el-tag">季度</span>
-          <span v-if="scope.row.state == 3" class="el-tag">年</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="cycle"
-        label="指标状态"
-        width="90"
-        align="center"
-        :resizable="false"
-      >
-        <template #default="scope">
-          <el-tag v-if="scope.row.cycle == 4">使用</el-tag>
-          <el-tag v-if="scope.row.cycle == 5" type="danger">禁用</el-tag>
-          <el-tag v-if="scope.row.cycle == 6" type="warning">观察</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="cycle"
-        label="频次"
-        width="90"
-        align="center"
-        :resizable="false"
-      >
-        <template #default="scope">
-          <span v-if="scope.row.cycle == 4">每月1次</span>
-          <span v-if="scope.row.cycle == 5">每季度1次</span>
-          <span v-if="scope.row.cycle == 6">每年1次</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        fixed="right"
-        label="执行人"
-        width="90"
-        align="center"
-        :resizable="false"
-      >
-        <template #default="{ row }">
-          <el-button type="primary" link @click="handleio(row)"
-            ><el-icon><View /></el-icon>查看</el-button
-          >
-        </template>
-      </el-table-column>
-      <el-table-column
-        fixed="right"
-        label="操作"
-        width="180"
-        align="center"
-        :resizable="false"
-      >
-        <template #default="{ row }">
-          <el-button type="primary" link @click="handleErd(row)"
-            ><el-icon><EditPen /></el-icon>修改</el-button
-          >
-          <el-button type="primary" link @click="handleDel(row)"
-            ><el-icon><Delete /></el-icon>删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
-    <Xd v-if="data.xdPostBox" v-model="data.xdPostBox" :row-info="rowInfo"></Xd>
-    <Hyr
-      v-if="data.hyrPostBox"
-      v-model="data.hyrPostBox"
-      :row-info="rowInfo"
-    ></Hyr>
-    <Ycy
-      v-if="data.ycyPostBox"
-      v-model="data.ycyPostBox"
-      :row-info="rowInfo"
-    ></Ycy>
-  </el-dialog>
-</template>
-<script lang="ts" setup>
-import { reactive } from "vue";
-import {
-  tarlist,
-  addPostCont,
-  addtarget,
-  getgroupuser,
-  addposttargetcont,
-  search_orgpost,
-  organdpost,
-} from "@/api/opk/api";
-import { editPostCont } from "@/api/opk/pulic/api";
-import { ge_add } from "@/api/opk/news/api";
-import { look_scheme } from "@/api/opk/opk/api";
-import { create_scheme, ge_copy, del_scheme } from "@/api/opk/zxy/news/api";
-import Xd from "./xd.vue";
-import Hyr from "./hyr.vue";
-import Ycy from "./ycy.vue";
-const isshow = ref(false);
-const props = defineProps({
-  title: {
-    type: String,
-    default: "",
-  },
-  ygPostBox: {
-    type: Boolean,
-    default: false,
-  },
-  rowInfo: {
-    type: Object,
-    default() {
-      return {};
-    },
-  },
-  arrayNum: {
-    type: Number,
-    default: 0,
-  },
-});
-const orgTreeProps = {
-  label: "name",
-};
->>>>>>> luzhiqiang_v1
+
 const orgTreeProp = {
   label: "title",
   children: "children",
diff --git a/src/views/sysworkflow/flow/flowDrawingBoard.vue b/src/views/sysworkflow/flow/flowDrawingBoard.vue
index 6201cd3aa..98eec3771 100644
--- a/src/views/sysworkflow/flow/flowDrawingBoard.vue
+++ b/src/views/sysworkflow/flow/flowDrawingBoard.vue
@@ -79,12 +79,9 @@ const getFlowVerList = ()=>{
 			versionList.splice(0,versionList.length)
 			if(data){
 				if(data.length>0){
-<<<<<<< HEAD
+
 					data.forEach((item:any)=>{
-=======
-					// versionList = data;
-					data.forEach(item=>{
->>>>>>> v3
+
 						if(item.state == 1){
 							activeTabs.value = item.id
 							enableFlow.value = item