mengff
/
jihe-hs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更改bug

wangqin
zhangzhang 1 year ago
parent
d75b6c66b5
commit
64425abbf2
2 changed files with 101 additions and 89 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 184
      ruoyi-ui/src/main.js
  2. 6
      ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue

184
ruoyi-ui/src/main.js
View File

@ -1,83 +1,91 @@
import Vue from 'vue' import Vue from "vue";
import CollapseTransition from 'element-ui/lib/transitions/collapse-transition'; import CollapseTransition from "element-ui/lib/transitions/collapse-transition";
import Cookies from 'js-cookie' import Cookies from "js-cookie";
import Element from 'element-ui' import Element from "element-ui";
import './assets/styles/element-variables.scss' import clickoutside from "element-ui/src/utils/clickoutside";
import './views/iot/css/iot.css' import "./assets/styles/element-variables.scss";
import '@/assets/styles/index.scss' // global css import "./views/iot/css/iot.css";
import '@/assets/styles/ruoyi.scss' // ruoyi css import "@/assets/styles/index.scss"; // global css
import App from './App' import "@/assets/styles/ruoyi.scss"; // ruoyi css
import store from './store' import App from "./App";
import router from './router/routerCreater' import store from "./store";
import directive from './directive' //directive import router from "./router/routerCreater";
import plugins from './plugins' // plugins import directive from "./directive"; //directive
import './assets/icon/iconfont.css' // 阿里巴巴icon import plugins from "./plugins"; // plugins
import './assets/icons' // icon import "./assets/icon/iconfont.css"; // 阿里巴巴icon
import './permission' // permission control import "./assets/icons"; // icon
import { Socket } from './utils/socket' import "./permission"; // permission control
import { Socket } from "./utils/socket";
import { getDicts } from "@/api/system/dict/data"; import { getDicts } from "@/api/system/dict/data";
import { getConfigKey } from "@/api/system/config"; import { getConfigKey } from "@/api/system/config";
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree, numberMul } from "@/utils/ruoyi"; import {
parseTime,
resetForm,
addDateRange,
selectDictLabel,
selectDictLabels,
handleTree,
numberMul,
} from "@/utils/ruoyi";
// 分页组件 // 分页组件
import Pagination from "@/components/Pagination"; import Pagination from "@/components/Pagination";
// 自定义表格工具组件 // 自定义表格工具组件
import RightToolbar from "@/components/RightToolbar" import RightToolbar from "@/components/RightToolbar";
// 富文本组件 // 富文本组件
import Editor from "@/components/Editor" import Editor from "@/components/Editor";
// 文件上传组件 // 文件上传组件
import FileUpload from "@/components/FileUpload" import FileUpload from "@/components/FileUpload";
// 图片上传组件 // 图片上传组件
import ImageUpload from "@/components/ImageUpload" import ImageUpload from "@/components/ImageUpload";
// 字典标签组件 // 字典标签组件
import DictTag from '@/components/DictTag' import DictTag from "@/components/DictTag";
// 头部标签组件 // 头部标签组件
import VueMeta from 'vue-meta' import VueMeta from "vue-meta";
// 字典数据组件 // 字典数据组件
import DictData from '@/components/DictData' import DictData from "@/components/DictData";
// 无缝滚动组件 // 无缝滚动组件
import VueSeamlessScroll from 'vue-seamless-scroll' import VueSeamlessScroll from "vue-seamless-scroll";
import VueAwesomeSwiper from 'vue-awesome-swiper' import VueAwesomeSwiper from "vue-awesome-swiper";
import 'swiper/css/swiper.css' import "swiper/css/swiper.css";
//el-table无线滚动 //el-table无线滚动
// 事件弹窗组件 // 事件弹窗组件
import eventDialog from '@/components/eventDialogTable/eventDialog.vue' import eventDialog from "@/components/eventDialogTable/eventDialog.vue";
import eventDialogTable from '@/components/eventDialogTable' import eventDialogTable from "@/components/eventDialogTable";
import evtDialogOneThing from '@/components/eventDialogTable/evtDialogOneThing.vue' import evtDialogOneThing from "@/components/eventDialogTable/evtDialogOneThing.vue";
import evtDialogVideo from '@/components/eventDialogTable/video.vue' import evtDialogVideo from "@/components/eventDialogTable/video.vue";
// 大屏适配 // 大屏适配
import dataV from '@jiaminghi/data-view' import dataV from "@jiaminghi/data-view";
// 字典标签组件 // 字典标签组件
// import reproductionImage from '@/components/reproductionImage' // import reproductionImage from '@/components/reproductionImage'
// jQuery // jQuery
import $ from 'jquery' import $ from "jquery";
import preventClick from './api/clickOnceAtime' import preventClick from "./api/clickOnceAtime";
// gisMap // gisMap
// import gisMap from 'gis-map-tunnel' // import gisMap from 'gis-map-tunnel'
// import gisMap from 'gis-map-admin' // import gisMap from 'gis-map-admin'
import config from '../public/config' import config from "../public/config";
import request from '../public/config' import request from "../public/config";
import moment from 'moment' import moment from "moment";
window.moment = moment window.moment = moment;
import dayjs from "dayjs" import dayjs from "dayjs";
//定义全局过滤器 //定义全局过滤器
Vue.filter('dateformat', function (dataStr, pattern = 'YYY-MM-DD HH:mm:ss') { Vue.filter("dateformat", function (dataStr, pattern = "YYY-MM-DD HH:mm:ss") {
if (dataStr === null || dataStr === "") { if (dataStr === null || dataStr === "") {
return ""; return "";
} }
return moment(dataStr).format(pattern) return moment(dataStr).format(pattern);
//filter两个参数 第一个是函数名，第二个是时间格式化处理的函数 //filter两个参数 第一个是函数名，第二个是时间格式化处理的函数
//(函数里面的参数 第一个是传递的数据，第二个是需要转换的时间格式) //(函数里面的参数 第一个是传递的数据，第二个是需要转换的时间格式)
}) });
window.IS_TESTING = false; window.IS_TESTING = false;
if (process.env.NODE_ENV == 'development'){ if (process.env.NODE_ENV == "development") {
window.IS_TESTING = false; window.IS_TESTING = false;
} }
@ -86,47 +94,47 @@ Vue.component("Empty", Empty);
// 全局方法挂载 // 全局方法挂载
Vue.prototype.dayjs = dayjs; Vue.prototype.dayjs = dayjs;
Vue.prototype.getDicts = getDicts Vue.prototype.getDicts = getDicts;
Vue.prototype.getConfigKey = getConfigKey Vue.prototype.getConfigKey = getConfigKey;
Vue.prototype.parseTime = parseTime Vue.prototype.parseTime = parseTime;
Vue.prototype.resetForm = resetForm Vue.prototype.resetForm = resetForm;
Vue.prototype.addDateRange = addDateRange Vue.prototype.addDateRange = addDateRange;
Vue.prototype.selectDictLabel = selectDictLabel Vue.prototype.selectDictLabel = selectDictLabel;
Vue.prototype.selectDictLabels = selectDictLabels Vue.prototype.selectDictLabels = selectDictLabels;
Vue.prototype.handleTree = handleTree Vue.prototype.handleTree = handleTree;
Vue.prototype.socket = Socket Vue.prototype.socket = Socket;
Vue.prototype.numberMul = numberMul Vue.prototype.numberMul = numberMul;
// gis // gis
Vue.prototype.$GlobalConfig = config.GlobalConfig Vue.prototype.$GlobalConfig = config.GlobalConfig;
Vue.use(preventClick) Vue.use(preventClick);
Vue.use(VueAwesomeSwiper) Vue.use(VueAwesomeSwiper);
Vue.use(dataV) Vue.use(dataV);
// 全局组件挂载 // 全局组件挂载
Vue.component('DictTag', DictTag) Vue.component("DictTag", DictTag);
Vue.component('Pagination', Pagination) Vue.component("Pagination", Pagination);
Vue.component('RightToolbar', RightToolbar) Vue.component("RightToolbar", RightToolbar);
Vue.component('Editor', Editor) Vue.component("Editor", Editor);
Vue.component('FileUpload', FileUpload) Vue.component("FileUpload", FileUpload);
Vue.component('ImageUpload', ImageUpload) Vue.component("ImageUpload", ImageUpload);
Vue.component('VueSeamlessScroll', VueSeamlessScroll) Vue.component("VueSeamlessScroll", VueSeamlessScroll);
Vue.component('eventDialog', eventDialog) Vue.component("eventDialog", eventDialog);
Vue.component('eventDialogTable', eventDialogTable) Vue.component("eventDialogTable", eventDialogTable);
Vue.component('evtDialogOneThing', evtDialogOneThing) Vue.component("evtDialogOneThing", evtDialogOneThing);
Vue.component('evtDialogVideo', evtDialogVideo) Vue.component("evtDialogVideo", evtDialogVideo);
Vue.component(CollapseTransition.name, CollapseTransition);
Vue.component(CollapseTransition.name, CollapseTransition)
// Vue.component('reproductionImage', reproductionImage) // Vue.component('reproductionImage', reproductionImage)
Vue.use(directive) Vue.directive("clickoutside", clickoutside);
Vue.use(plugins)
Vue.use(directive);
Vue.use(plugins);
// Vue.use(gisMap) // Vue.use(gisMap)
Vue.use(VueMeta) Vue.use(VueMeta);
DictData.install() DictData.install();
/** /**
* If you don't want to use mock-server * If you don't want to use mock-server
* you want to use MockJs for mock api * you want to use MockJs for mock api
@ -137,14 +145,14 @@ DictData.install()
*/ */
Vue.use(Element, { Vue.use(Element, {
size: Cookies.get('size') || 'medium' // set element-ui default size size: Cookies.get("size") || "medium", // set element-ui default size
}) });
Vue.config.productionTip = false Vue.config.productionTip = false;
new Vue({ new Vue({
el: '#app', el: "#app",
router, router,
store, store,
render: h => h(App) render: (h) => h(App),
}) });

6
ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue
View File

@ -10,6 +10,7 @@
v-model="visible" v-model="visible"
@show="handleShow" @show="handleShow"
style="width: 100%" style="width: 100%"
v-clickoutside="handlerClose"
> >
<div <div
class="InputSearch input" class="InputSearch input"
@ -136,7 +137,7 @@ export default {
this.visible = true; this.visible = true;
this.$refs.FormConfigRef?.reset(); this.$refs.FormConfigRef?.reset();
this.$refs.FormConfigRef.$refs.ElFormRef.resetFields(); this.$refs.FormConfigRef.$refs.ElFormRef.resetFields();
// this.$refs.PopoverRef.doClose(); this.$refs.PopoverRef.doClose();
this.$emit( this.$emit(
"handleSearch", "handleSearch",
@ -173,6 +174,9 @@ export default {
}); });
} }
}, },
handlerClose() {
this.visible = false;
},
}, },
}; };
</script> </script>

Write Preview
Loading…
Cancel
Save