span rel="diff-08eaf984c336bd7d1ca2cce48e33b9e2ffd01d77L52">52 71 
    jsonData: JSON.stringify(graph),
53 
    databusData: JSON.stringify(databusData[subFlowId.value]),
72 
    databusData: JSON.stringify(databusData[flowId.value]),
54 73 
    stateValue: type,
55 74 
    nodesData: getNodesData(graph)
56 75 
  };
57 76 
  await api
58 
    .updateFlowDataById(params, subFlowId.value)
77 
    .updateFlowDataById(params, flowId.value)
59 78 
    .then((res) => {
60 79 
      if (res.resultCode === '0') {
61 80 
        proxy.$message.success('流程保存成功！');

+ 6 - 0
src/views/flow/SystemDetail.vue
查看文件 

@ -83,6 +83,7 @@
83 83 
<script setup>
84 84 
import { ref, onMounted, getCurrentInstance, computed, watch } from 'vue';
85 85 
import { useRoute, useRouter } from 'vue-router';
86 
import { useStore } from 'vuex';
86 87 
import { formConfig } from './_config';
87 88 
import ApiDetailPage from './_components/ApiDetailPage.vue';
88 89 
import * as api from '../../api/flow';
 
@ -96,6 +97,7 @@ const drawerType = ref('module');
96 97 
const operateType = ref('create');
97 98 
const apiDetail = ref(null);
98 99 
const versionState = ref('');
100 
const store = useStore();
99 101
100 102 
const systemId = computed(() => route.query.id);
101 103 
const curVersionId = ref('');
 
@ -144,6 +146,10 @@ async function getSystemDetail() {
144 146 
      systemInfo.value = res.result;
145 147 
      curVersionId.value = systemInfo.value.version.id;
146 148 
      versionState.value = systemInfo.value.version.state;
149 
      store.commit('setBreadData', [
150 
        { name: '系统管理', to: { name: 'SystemList' } },
151 
        { name: systemInfo.value.name }
152 
      ]);
147 153 
    } else {
148 154 
      systemInfo.value = null;
149 155 
    }

+ 1 - 5
src/views/flow/_components/ApiDetailPage.vue
查看文件 

@ -128,11 +128,7 @@
128 128 
      </div>
129 129 
      <div class="card">
130 130 
        <h4 class="sub-title">请求参数</h4>
131 
        <!-- <ipu-input
132 
          v-model="testRequest.params"
133 
          class="result"
134 
          v-bind="attributes"
135 
        ></ipu-input> -->
131
136 132 
        <div>
137 133 
          <JsonEditorVue
138 134 
            v-model="testRequest.params"

+ 10 - 0
src/views/sub-flow/SubFlow.vue
查看文件 

@ -17,12 +17,15 @@ import { ref, getCurrentInstance, onMounted } from 'vue';
17 17
18 18 
/** x6相关end */
19 19 
import { useRoute } from 'vue-router';
20 
import { useStore } from 'vuex';
20 21 
import SubFlow from '../_components/_flow/Index.vue';
21 22 
import nodes from '../_components/_flow/nodes.js';
22 23
23 24 
import * as api from '../../api/subflow';
24 25 
import NodeDataFormate from '../_components/_flow/nodeDataFormate.js';
25 26
27 
const store = useStore();
28
26 29 
const nodeList = ref(nodes.nodes);
27 30 
nodeList.value.map((item) => {
28 31 
  if (item.nodes?.length) {
 
@ -41,6 +44,13 @@ async function getSubFlowDetailById() {
41 44 
  await api.getSubFlowDetailById(subFlowId.value).then((res) => {
42 45 
    if (res.resultCode === '0') {
43 46 
      subFlowDetail.value = res.result;
47 
      const panelGlobal = {};
48 
      panelGlobal[subFlowId.value] = JSON.parse(res.result?.databusData) || {};
49 
      localStorage.setItem('panelGlobal', JSON.stringify(panelGlobal));
50 
      store.commit('setBreadData', [
51 
        { name: '系统管理', to: { name: 'SystemList' } },
52 
        { name: subFlowDetail.value.name }
53 
      ]);
44 54 
    } else {
45 55 
      proxy.$message.error(res.resultMsg);
46 56 
    }

static - Nuosi Git Service
Etusivu Tutki Apua
Kirjaudu sisään
asiainfo
/
static
Tarkkaile 2
Äänestä 0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Commitit 2546 Julkaisut 4 Wiki

static

Branch: master
Branchit Tagit
static
/
p0-sonar
/
wm-tooltip.js

wm-tooltip.js 2.7KB
Pysyvä linkki Historia Raaka 

    /*引入util对应的js文件*/

define(["jcl","wmWebUI"], function($,WmWebUI){
	/*WmToolTip对象定义*/
	var WmToolTip = function(id){
		this.listeners = new Array(); //存储监听事件
		this.id = id;
		/*常用对象*/
		this.tip = WmWebUI.getElement(id);
		this.baseSize = parseInt($(document.getElementsByTagName("html")[0]).css("font-size"));
	}
	/*关闭按钮事件*/
	WmToolTip.prototype.setCloseAction = function(action){
		var closeAction = function(that){
			that.hide();
			if(action){
				if(typeof action =="function"){
					action();
				}else{
					new Function("return "+action)().call(window);
				}
			}
		};
		var btn = this.tip.find("span.e_button");
		$(btn[0]).tap(closeAction,this);
	};
	/*设置位置参照元素*/
	WmToolTip.prototype.setBaseElement = function(ele){
		var e;
		if(typeof ele =="object"){
			e = $(ele);
		}else if(typeof ele =="string"){
			e = $("#"+ele);
		}

		if(!e){
			return ;
		}

		var o = e.offset();
		var h = e.height();
		var w = e.width();
		var tipH = this.tip.height();
		var tipW = this.tip.width();
		var left = o.left;
		var top = o.top;
		if(this.tip.hasClass("c_toolTip-positionBottom")){
			top-=tipH;//箭头在下
		}else{
			top+=h;//箭头在上
		}
		if(this.tip.hasClass("c_toolTip-arrowLeft")){
			//箭头居左
		}else if(this.tip.hasClass("c_toolTip-arrowRight")){
			left=left+w-tipW;//箭头居右
		}else{
			left = left+w/2-tipW/2;//箭头居中
		}
		left = left/this.baseSize;
		top = top/this.baseSize;
		this.tip.css("top",top+"rem");
		this.tip.css("left",left+"rem");
	};
	/*显示*/
	WmToolTip.prototype.show = function(){
		if(!this.tip.hasClass("c_toolTip-view")){
			this.tip.addClass("c_toolTip-view");
		}
	};
	/*隐藏*/
	WmToolTip.prototype.hide = function(){
		this.tip.removeClass("c_toolTip-view");
	};
	/*移除*/
	WmToolTip.prototype.remove = function(){
		this.tip.remove();
	};
	/*设置按钮文本*/
	WmToolTip.prototype.setButtonText = function(text){
		var button = this.tip.find('span.e_button');
		if(button.length){
			$(button[0]).text(text);
		}else{
			$(this.tip.find("div.content")[0]).append('<div class="submit"><span class="e_button">'+text+'</span></div>');
		}
	};
	/*设置图标*/
	WmToolTip.prototype.setIcon = function(icon){
		var elem = this.tip.find('div.ico');
		if(elem.length){
			$(elem[0]).html('<span class="e_ico '+icon+'"></span>');
		}else{
			$(this.tip.find("div.content")[0]).prepend('<div class="ico"><span class="e_ico '+icon+'"></span></div>');
		}
	};
	/*设置提示内容*/
	WmToolTip.prototype.setContent = function(text){
		var elem = this.tip.find("div.detail");
		if(elem.length){
			$(elem[0]).text(text);
		}else{
			$(this.tip.find("div.content")[0]).prepend('<div class="detail">'+text+'</div>');
		}
	};
	/*导出WmToolTip*/
	return WmToolTip;
});
[FE]修改考勤报表页面和和设备管理页面初始化查询数据问题 · e5e3be8442 - Nuosi Git Service
Home Explore Help
Sign In
asiainfo
/
ebc
Watch 4
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 628 Releases 0 Wiki
Browse Source

[FE]修改考勤报表页面和和设备管理页面初始化查询数据问题

luoxu5 4 years ago
parent
3b46b5a167
commit
e5e3be8442
4 changed files with 54 additions and 37 deletions
Unified View Show Diff Stats
  1. 9 11
      security-protection-platform/src/modules/access/component/instrumentRecord/index.vue
  2. 23 17
      security-protection-platform/src/modules/attendance/abnormal/index.vue
  3. 21 9
      security-protection-platform/src/modules/attendance/report/index.vue
  4. 1 0
      security-protection-platform/src/modules/usermana/index.vue

+ 9 - 11
security-protection-platform/src/modules/access/component/instrumentRecord/index.vue
View File

43
43
44 
    <t-table :data="data" line @selection-change="handleSelectionChange">
 44 
    <t-table :data="data" line @selection-change="handleSelectionChange">
45 
      <t-table-column type="selection" width="34px"></t-table-column>
 45 
      <t-table-column type="selection" width="34px"></t-table-column>
46 
      <t-table-column label="姓名" prop="employeeName" width="60px">
47 
      </t-table-column>
48 
      <t-table-column label="员工编号" prop="employeeCode" width="80px">
49 
      </t-table-column>
50 
      <t-table-column label="公司" prop="companyname" width="94px">
51 
      </t-table-column>
52 
      <t-table-column label="部门" prop="organizationName" width="94px">
53 
      </t-table-column>
54 
      <t-table-column label="职务" prop="employeePositionZh" width="80px">
55 
      </t-table-column>
56 
      <t-table-column prop="simi" label="相似度" width="75px">
46 
      <t-table-column label="仪表读数" width="75px" align="center">
47 
        <template v-slot="{row}">
48 
          <span>{{ getInstrumentNumber(row) }}</span>
49 
        </template>
57 
      </t-table-column>
 50 
      </t-table-column>
58 
      <t-table-column label="进出时间" prop="taskExecuteTime" width="160px">
 51 
      <t-table-column label="进出时间" prop="taskExecuteTime" width="160px">
59 
      </t-table-column>
 52 
      </t-table-column>
198 
    this.getcompanyTypesList()
 191 
    this.getcompanyTypesList()
199 
  },
 192 
  },
200 
  methods: {
 193 
  methods: {
194 
    // 获取仪表读数
195 
    getInstrumentNumber (data) {
196 
      const res = JSON.parse(data.idenResult)[0]['val'] || ''
197 
      return res
198 
    },
201 
    // 表格中的选择数据
 199 
    // 表格中的选择数据
202 
    handleSelectionChange (val) {
 200 
    handleSelectionChange (val) {
203 
      this.selectdata = val
 201 
      this.selectdata = val

+ 23 - 17
security-protection-platform/src/modules/attendance/abnormal/index.vue
View File

97 
      tableData: [],
 97 
      tableData: [],
98 
      modalData: {},
 98 
      modalData: {},
99 
      loadDetail: false,
 99 
      loadDetail: false,
100 
      loadTable: false
100 
      loadTable: false,
101 
      isFirstCreatedDaily: true
101 
    }
 102 
    }
102 
  },
 103 
  },
103 
  methods: {
 104 
  methods: {
104 
    getDailyOrgId(id) {
105 
    getDailyOrgId (id) {
105 
      this.form.orgId = id
 106 
      this.form.orgId = id
106 
    },
 107 
    },
107 
    getDailyDepId(id) {
108 
    getDailyDepId (id) {
108 
      this.form.depId = id
 109 
      this.form.depId = id
110 
      // 第一次创建获取表格数据
111 
      if (this.isFirstCreatedDaily) {
112 
        this.isFirstCreatedDaily = false
113 
        this.getTableData()
114 
      }
109 
    },
 115 
    },
110 
    getDailyStaffId(id) {
116 
    getDailyStaffId (id) {
111 
      this.form.userid = id
 117 
      this.form.userid = id
112 
    },
 118 
    },
113 
    handleInited() {
119 
    handleInited () {
114 
      this.getTableData()
 120 
      this.getTableData()
115 
    },
 121 
    },
116 
    // 搜索
 122 
    // 搜索
124 
      this.getTableData()
 130 
      this.getTableData()
125 
    },
 131 
    },
126 
    // 获得考勤表格数据
 132 
    // 获得考勤表格数据
127 
    getTableData() {
133 
    getTableData () {
128 
      this.loadTable = true
 134 
      this.loadTable = true
129 
      atdapi.getMonthAttendance({params: this.form}).then(res => {
135 
      atdapi.getMonthAttendance({ params: this.form }).then(res => {
130 
        let data = res.data.data || []
 136 
        let data = res.data.data || []
131 
        this.tableData = []
 137 
        this.tableData = []
132 
        data.forEach(element => {
 138 
        data.forEach(element => {
138 
      })
 144 
      })
139 
    },
 145 
    },
140 
    // 弹窗打开
 146 
    // 弹窗打开
141 
    handleClick(data) {
147 
    handleClick (data) {
142 
      const { userid, beginDay, endDay } = data
 148 
      const { userid, beginDay, endDay } = data
143 
      if (beginDay == null) {
 149 
      if (beginDay == null) {
144 
        this.$Message.danger('未识别到有效的起止日期')
 150 
        this.$Message.danger('未识别到有效的起止日期')
162 
}
 168 
}
163 
</script>
 169 
</script>
164 
<style lang="scss" scoped>
 170 
<style lang="scss" scoped>
165 
.page-main{
171 
.page-main {
166 
  margin: 20px 20px 16px 20px;
 172 
  margin: 20px 20px 16px 20px;
167 
  .abnormalState{
168 
    color: #EDA30F;
173 
  .abnormalState {
174 
    color: #eda30f;
169 
    font-size: 14px;
 175 
    font-size: 14px;
170 
  }
 176 
  }
171 
  .keep-row{
177 
  .keep-row {
172 
    margin-left: 24px;
 178 
    margin-left: 24px;
173 
    display: flex;
 179 
    display: flex;
174 
    align-items: center;
 180 
    align-items: center;
175 
  }
 181 
  }
176 
  .search-btn{
182 
  .search-btn {
177 
    margin-left: auto;
 183 
    margin-left: auto;
178 
    margin-right: 15px;
 184 
    margin-right: 15px;
179 
  }
 185 
  }
180 
  .icon-txt{
186 
  .icon-txt {
181 
    margin-right: 8px;
 187 
    margin-right: 8px;
182 
  }
 188 
  }
183 
  .export-excel{
189 
  .export-excel {
184 
    margin-top: 24px;
 190 
    margin-top: 24px;
185 
    display: flex;
 191 
    display: flex;
186 
    align-items: center;
 192 
    align-items: center;
187 
  }
 193 
  }
188 
  .table-detail{
194 
  .table-detail {
189 
    margin-top: 20px;
 195 
    margin-top: 20px;
190 
  }
 196 
  }
191 
  .pager{
197 
  .pager {
192 
    margin-right: auto;
 198 
    margin-right: auto;
193 
    margin: 21px 21px 0 0;
 199 
    margin: 21px 21px 0 0;
194 
    float: right;
 200 
    float: right;

+ 21 - 9
security-protection-platform/src/modules/attendance/report/index.vue
View File

148 
        orgId: '',
 148 
        orgId: '',
149 
        current: 1,
 149 
        current: 1,
150 
        pageSize: 10
 150 
        pageSize: 10
151 
      }
151 
      },
152 
      isFirstCreatedMonth: true,
153 
      isFirstCreatedDaily: true
152 
    }
 154 
    }
153 
  },
 155 
  },
154 
  methods: {
 156 
  methods: {
155 
    getDailyOrgId(id) {
157 
    getDailyOrgId (id) {
156 
      this.dailyForm.orgId = id
 158 
      this.dailyForm.orgId = id
157 
    },
 159 
    },
158 
    getDailyDepId(id) {
160 
    getDailyDepId (id) {
159 
      this.dailyForm.depId = id
 161 
      this.dailyForm.depId = id
162 
      // 第一次创建获取日报表格数据
163 
      if (this.isFirstCreatedDaily) {
164 
        this.isFirstCreatedDaily = false
165 
        this.getDailyTable()
166 
      }
160 
    },
 167 
    },
161 
    getDailyStaffId(id) {
168 
    getDailyStaffId (id) {
162 
      this.dailyForm.userid = id
 169 
      this.dailyForm.userid = id
163 
    },
 170 
    },
164 
    getMonthOrgId(id) {
171 
    getMonthOrgId (id) {
165 
      this.monthlyForm.orgId = id
 172 
      this.monthlyForm.orgId = id
166 
    },
 173 
    },
167 
    getMonthDepId(id) {
174 
    getMonthDepId (id) {
168 
      this.monthlyForm.depId = id
 175 
      this.monthlyForm.depId = id
176 
      // 第一次创建获取月报表格数据
177 
      if (this.isFirstCreatedMonth) {
178 
        this.isFirstCreatedMonth = false
179 
        this.getMonthTable()
180 
      }
169 
    },
 181 
    },
170 
    getMonthStaffId(id) {
182 
    getMonthStaffId (id) {
171 
      this.monthlyForm.userid = id
 183 
      this.monthlyForm.userid = id
172 
    },
 184 
    },
173 
    handleDailyInited () {
 185 
    handleDailyInited () {
261 
    //   }
 273 
    //   }
262 
    // },
 274 
    // },
263 
    // 重置日报数据
 275 
    // 重置日报数据
264 
    resetDailyData() {
276 
    resetDailyData () {
265 
      this.$nextTick(() => {
 277 
      this.$nextTick(() => {
266 
        this.dailyForm = {
 278 
        this.dailyForm = {
267 
          workDay: '',
 279 
          workDay: '',
274 
      })
 286 
      })
275 
    },
 287 
    },
276 
    // 重置月报数据
 288 
    // 重置月报数据
277 
    resetMonthData() {
289 
    resetMonthData () {
278 
      this.monthlyForm = {
 290 
      this.monthlyForm = {
279 
        month: '',
 291 
        month: '',
280 
        userid: null,
 292 
        userid: null,

+ 1 - 0
security-protection-platform/src/modules/usermana/index.vue
View File

218 
        if (this.departmentTypeId === '' && this.firstCreated) {
 218 
        if (this.departmentTypeId === '' && this.firstCreated) {
219 
          this.$nextTick(() => {
 219 
          this.$nextTick(() => {
220 
            this.departmentTypeId = '10087'
 220 
            this.departmentTypeId = '10087'
221 
            this.getUserList()
221 
            this.firstCreated = false
 222 
            this.firstCreated = false
222 
          })
 223 
          })
223 
        }
 224 
        }