diff --git a/src/views/baseData/equipment.vue b/src/views/baseData/equipment.vue
new file mode 100644
index 0000000..7ee8d24
--- /dev/null
+++ b/src/views/baseData/equipment.vue
@@ -0,0 +1,558 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
+ $router.push({
+ path: $route.path + '/detail/' + row.id,
+ });
+ }
+ "
+ @editor="
+ (row) => {
+ $refs['dialog'].setId(row.id);
+ $refs['dialog'].setType('editor');
+ $refs['dialog'].show();
+ }
+ "
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/bigScreen1/component/detailTransfer.vue b/src/views/bigScreen1/component/detailTransfer.vue
index 9e8d2a1..31eeaed 100644
--- a/src/views/bigScreen1/component/detailTransfer.vue
+++ b/src/views/bigScreen1/component/detailTransfer.vue
@@ -64,6 +64,8 @@
苏州河道处调度指令看板
- {{ $moment(time).format('YYYY-MM-DD HH:mm:ss') }}
+
+
+ {{ refresh }}秒刷新
+
+
+ {{ $moment(time).format('YYYY-MM-DD HH:mm:ss') }}
+
明日调令
@@ -22,7 +28,7 @@ export default {
components: {
tomorrow
},
- inject: ['nowTime'],
+ inject: ['nowTime','refreshTime','refreshList'],
data() {
return {
tomorrows: []
@@ -56,6 +62,12 @@ export default {
computed: {
time () {
return this.nowTime()
+ },
+ refresh () {
+ return this.refreshTime()
+ },
+ refreshTransfer () {
+ return this.refreshList
}
},
mounted() {
@@ -96,4 +108,9 @@ export default {
}
}
$title-height: 8.46rem;
+
+.refresh-icon:hover {
+ transition: all 1s;
+ transform: rotate(360deg);
+}
diff --git a/src/views/bigScreen1/index.vue b/src/views/bigScreen1/index.vue
index 2e40734..2f820b4 100644
--- a/src/views/bigScreen1/index.vue
+++ b/src/views/bigScreen1/index.vue
@@ -1,8 +1,8 @@
-
- {{ refreshTime }}
-
+
+
+
this.time,
- auths: () => this.auths_auth_mixin
+ auths: () => this.auths_auth_mixin,
+ refreshTime: () => this.refreshTime,
+ refreshList: () => this.getTransfer(true)
}
},
data() {
@@ -166,8 +168,8 @@ export default {
table_name: "transfers",
page: 1,
page_size: 9999,
- sort_name: "start_time",
- sort_type: "asc",
+ sort_name: "created_at",
+ sort_type: "desc",
filter: [
{
key: 'start_time',
@@ -309,8 +311,8 @@ export default {
position: relative;
.refresh-time {
- font-size: 12px;
- color: #fff;
+ font-size: 1.4rem;
+ color: #f00;
z-index: 3;
position: fixed;
diff --git a/src/views/order/component/adjust.vue b/src/views/order/component/adjust.vue
index 36805ee..fe9a27f 100644
--- a/src/views/order/component/adjust.vue
+++ b/src/views/order/component/adjust.vue
@@ -44,6 +44,7 @@
调整类型 :
{
- this.handleClone(JSON.parse(row.content))
+ this.handleClone(JSON.parse(row.content),true)
},
},
},
@@ -600,7 +589,8 @@ export default {
h("Select", {
props: {
value: this.data[index].leibie,
- size: "small"
+ size: "small",
+ transfer: true
},
on: {
['on-change']:e => {
@@ -623,7 +613,8 @@ export default {
h("Select", {
props: {
value: this.data[index].diaolingleixing,
- size: "small"
+ size: "small",
+ transfer: true
},
on: {
['on-change']:e => {
@@ -847,6 +838,34 @@ export default {
};
},
methods: {
+ nameInput: debounce(function (e) {
+ this.select.name = e.target.value;
+ }),
+ tableDrag (f, e) {
+ let first = parseInt(f)
+ let end = parseInt(e)
+ let tmp = this.data[first]
+ let len = 1;
+ let temps = [tmp]
+ while (tmp.equipment_id === this.data[first + len]?.equipment_id) {
+ temps.push(this.data[first + len])
+ len++;
+ }
+ if (first < end) {
+ this.data.splice(first, len)
+ this.data.splice(end-len+1, 0,...temps)
+ // for (let i = first + len; i <= end; i++) {
+ // this.data.splice(i - len, i === first + len ? len : 1, this.data[i])
+ // }
+ // this.data.splice(end, 1, ...temps)
+ }
+ if (first > end) {
+ for (let j = first; j > end; j--) {
+ this.data.splice(j, len, this.data[j - 1])
+ }
+ this.data.splice(end, 1, ...temps)
+ }
+ },
index,
async getEquipmentInfos () {
const res = await equipmentInfos({
@@ -855,8 +874,25 @@ export default {
this.equipmentInfos = res
},
- handleClone (content) {
+ handleClone (content,isTemplate=false) {
if (!content) return;
+ if (isTemplate) {
+ this.data =
+ content?.map((i) => ({
+ equipment: this.equipmentList.find((j) => j.id === i.equipment_id),
+ equipment_id: i.equipment_id,
+ start_time: i.start_time,
+ end_time: i.end_time,
+ content: i.content,
+ level: i.level,
+ kaiqishuliang: i.kaiqishuliang,
+ diaolingleixing: i.diaolingleixing,
+ leibie: i.leibie,
+ situations: this.equipmentList.find((j) => j.id === i.equipment_id)?.id_equip_situation_relations_equipment_id_relation
+ })) || [];
+
+ return
+ }
this.data =
this.equipmentList?.map((i) => ({
equipment: i,
@@ -867,7 +903,7 @@ export default {
level: 1,
kaiqishuliang: 0,
diaolingleixing: "",
- leibie: this.ability,
+ leibie: "",
situations: i.id_equip_situation_relations_equipment_id_relation
})) || [];
@@ -945,6 +981,7 @@ export default {
level: i.level,
kaiqishuliang: i.kaiqishuliang,
diaolingleixing: i.diaolingleixing,
+ leibie: i.leibie
}))
),
}).then((_) => {
@@ -981,15 +1018,17 @@ export default {
content: "",
level: 1,
kaiqishuliang: 0,
- leibie: this.ability,
+ leibie: "",
situations: i.id_equip_situation_relations_equipment_id_relation
})) || [];
- for (let key in this.$refs) {
- if (/bengzhashuliang/g.test(key)) {
- this.$refs[key].$children.forEach(i => i.currentValue = false)
+ this.$nextTick(() => {
+ for (let key in this.$refs) {
+ if (/bengzhashuliang/g.test(key)) {
+ this.$refs[key].$children.forEach(i => i.currentValue = false)
+ }
}
- }
+ })
},
async submit() {
@@ -1048,7 +1087,7 @@ export default {
delete i["_rowKey"];
i.start_time = `${this.date} ${i.start_time}`;
- i.end_time = `${this.date} ${i.end_time}`;
+ i.end_time = i.end_time ? `${this.date} ${i.end_time}` : '';
i.no = uid;
i.status = 1;
@@ -1056,7 +1095,8 @@ export default {
const res = await checkTransfer({
start_time: i.start_time,
end_time: i.end_time,
- equipment_id: i.equipment_id
+ equipment_id: i.equipment_id,
+ diaolingleixing: i.diaolingleixing
})
promiseAll.push(
save(
@@ -1197,7 +1237,12 @@ export default {
this.$bus.$emit("yinpaishui", this.abilities);
},
async getDiaolingleixing() {
- const obj = (await show({ id: 85 }, false))?.select_item;
+ const obj = {
+ "逻辑调令": "4",
+ "防汛调令": "2",
+ "水环境调令": "1",
+ "船只过闸调令": "3"
+ };
if (obj && typeof obj === "object") {
let keys = Object.keys(obj);
if (keys.length > 0) {
@@ -1244,7 +1289,7 @@ export default {
content: "",
level: 1,
kaiqishuliang: 0,
- leibie: this.ability,
+ leibie: "",
situations: i.id_equip_situation_relations_equipment_id_relation
})) || [];
this.handleClone(this.$route.params.cloneTransfer)
@@ -1281,7 +1326,7 @@ export default {
content: "",
level: 1,
kaiqishuliang: 0,
- leibie: this.ability,
+ leibie: "",
situations: i.id_equip_situation_relations_equipment_id_relation
})) || [];
} else {
@@ -1294,7 +1339,7 @@ export default {
content: "",
level: 1,
kaiqishuliang: 0,
- leibie: this.ability,
+ leibie: "",
situations: i.id_equip_situation_relations_equipment_id_relation
})) || [];
}
|