Browse Source

修改冲突

v5
超级管理员 2 years ago
parent
commit
81b90c3bbf
  1. 6
      node_modules/.package-lock.json
  2. 7
      package-lock.json
  3. 3
      src/types/components.d.ts
  4. 126
      src/views/opk/asd/news/dialog.vue
  5. 187
      src/views/opk/asd/news/yg.vue
  6. 7
      src/views/sysworkflow/flow/flowDrawingBoard.vue

6
node_modules/.package-lock.json

@ -1025,6 +1025,12 @@
"@types/node": "*" "@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": { "node_modules/@types/web-bluetooth": {
"version": "0.0.18", "version": "0.0.18",
"resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.18.tgz", "resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.18.tgz",

7
package-lock.json

@ -44,6 +44,7 @@
"@types/md5": "^2.3.2", "@types/md5": "^2.3.2",
"@types/nprogress": "^0.2.0", "@types/nprogress": "^0.2.0",
"@types/path-browserify": "^1.0.0", "@types/path-browserify": "^1.0.0",
"@types/uuid": "^9.0.7",
"@typescript-eslint/eslint-plugin": "^5.59.6", "@typescript-eslint/eslint-plugin": "^5.59.6",
"@typescript-eslint/parser": "^5.59.6", "@typescript-eslint/parser": "^5.59.6",
"autoprefixer": "^10.4.14", "autoprefixer": "^10.4.14",
@ -1415,6 +1416,12 @@
"@types/node": "*" "@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": { "node_modules/@types/web-bluetooth": {
"version": "0.0.18", "version": "0.0.18",
"resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.18.tgz", "resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.18.tgz",

3
src/types/components.d.ts

@ -18,6 +18,7 @@ declare module '@vue/runtime-core' {
CopyerDrawer: typeof import('./../components/workflow/drwer/copyerDrawer.vue')['default'] CopyerDrawer: typeof import('./../components/workflow/drwer/copyerDrawer.vue')['default']
DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default'] DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default']
DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default'] DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default']
ElAffix: typeof import('element-plus/es')['ElAffix']
ElAlert: typeof import('element-plus/es')['ElAlert'] ElAlert: typeof import('element-plus/es')['ElAlert']
ElAside: typeof import('element-plus/es')['ElAside'] ElAside: typeof import('element-plus/es')['ElAside']
ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElAvatar: typeof import('element-plus/es')['ElAvatar']
@ -65,6 +66,8 @@ declare module '@vue/runtime-core' {
ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
ElSelect: typeof import('element-plus/es')['ElSelect'] ElSelect: typeof import('element-plus/es')['ElSelect']
ElSpace: typeof import('element-plus/es')['ElSpace'] 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'] ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElSwitch: typeof import('element-plus/es')['ElSwitch']
ElTable: typeof import('element-plus/es')['ElTable'] ElTable: typeof import('element-plus/es')['ElTable']

126
src/views/opk/asd/news/dialog.vue

@ -95,131 +95,7 @@
</el-form> </el-form>
</el-dialog> </el-dialog>
</template> </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> <script lang="ts" setup>
import { reactive } from "vue"; import { reactive } from "vue";
import { import {
@ -240,7 +116,7 @@ const getSummaries = (param: any) => {
if (index === 0) { if (index === 0) {
formData.sums[index] = "合计"; formData.sums[index] = "合计";
return; return;
>>>>>>> luzhiqiang_v1
} }
const values = data.map((item) => Number(item[column.property])); const values = data.map((item) => Number(item[column.property]));
if (!values.every((value) => Number.isNaN(value))) { if (!values.every((value) => Number.isNaN(value))) {

187
src/views/opk/asd/news/yg.vue

@ -4,7 +4,7 @@
@ 备注: @ 备注:
--> -->
<template> <template>
<<<<<<< HEAD
<el-dialog :model-value="true" title="查看方案详情" style="width:70%" @close="handleClose"> <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 :data="tablea" border label-width="120px" class="demo-ruleForm" :span-method="objectSpanMethod" style="width:100%">
<el-table-column prop="dimensionname" label="考核维度"/> <el-table-column prop="dimensionname" label="考核维度"/>
@ -91,190 +91,7 @@ const props= defineProps( {
const orgTreeProps ={ const orgTreeProps ={
label: 'name', 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 = { const orgTreeProp = {
label: "title", label: "title",
children: "children", children: "children",

7
src/views/sysworkflow/flow/flowDrawingBoard.vue

@ -79,12 +79,9 @@ const getFlowVerList = ()=>{
versionList.splice(0,versionList.length) versionList.splice(0,versionList.length)
if(data){ if(data){
if(data.length>0){ if(data.length>0){
<<<<<<< HEAD
data.forEach((item:any)=>{ data.forEach((item:any)=>{
=======
// versionList = data;
data.forEach(item=>{
>>>>>>> v3
if(item.state == 1){ if(item.state == 1){
activeTabs.value = item.id activeTabs.value = item.id
enableFlow.value = item enableFlow.value = item

Loading…
Cancel
Save